From b1d48a51541e47f2d365d18caece19f09366656c Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 23 Apr 2024 22:35:52 +0200
Subject: [PATCH 1/6] [TASK] improve sidebar css

---
 frontend/scss/components/_sidebar.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/scss/components/_sidebar.scss b/frontend/scss/components/_sidebar.scss
index 619753f..26aba05 100644
--- a/frontend/scss/components/_sidebar.scss
+++ b/frontend/scss/components/_sidebar.scss
@@ -10,6 +10,7 @@
 
   &.open {
       display: block;
+      height: 100dvh;
       height: 100vh;
       right: 0;
       top: 0;
-- 
2.45.2


From 23a623bdc9607977369ae93de67dd187ffab8782 Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 23 Apr 2024 22:36:51 +0200
Subject: [PATCH 2/6] [TASK] add etsch edge case js

---
 frontend/main.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/main.ts b/frontend/main.ts
index a7497fd..8a71157 100644
--- a/frontend/main.ts
+++ b/frontend/main.ts
@@ -154,8 +154,15 @@ function selectBoatChange() {
 
         if (event.detail.customProperties.owner) {
           choiceObjects["newrower"].setChoiceByValue(
-            event.detail.customProperties.owner + "",
+            event.detail.customProperties.owner.toString(),
           );
+
+          if(event.detail.value === '36') {
+              /** custom code for Etsch */
+              choiceObjects["newrower"].setChoiceByValue(
+                "81",
+              );
+          }
         }
 
         const inputElement = document.getElementById(
-- 
2.45.2


From e556b1375d866f3310b556c4f74d2678f6d4d700 Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 23 Apr 2024 22:39:59 +0200
Subject: [PATCH 3/6] [TASK] improve styling boat list

---
 templates/includes/forms/log.html.tera | 44 +++++++++++++++++---------
 templates/kiosk.html.tera              | 25 +++++++++++++--
 templates/log.html.tera                | 10 +++---
 3 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index fc5e78c..ca71edd 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -4,24 +4,38 @@
  #}
 {% macro show_boats() %}
     {% for amount_seats, grouped_boats in boats | group_by(attribute="amount_seats") %}
-        <div class="pb-2">
-            <div class="bg-gray-100 dark:bg-primary-600 text-primary-950 dark:text-white text-center text-sm mb-2">
-                <strong>{{ amount_seats }}x</strong>
+        <details>
+            <summary class="font-bold cursor-pointer text-primary-900 dark:text-white border-t p-3 hover:bg-gray-100 dark:hover:bg-primary-950">
+                <span>
+                    {% if grouped_boats[0].amount_seats < 9 or grouped_boats[0].amount_seats == 24 %}
+                        {{ amount_seats }}x
+                    {% elif grouped_boats[0].amount_seats == 9 %}
+                        {{ grouped_boats[0].amount_seats - 1 }}+
+                    {% else %}
+                        Vereinsfremde Boote
+                    {% endif %}
+                  </span>
+                  <small class="text-gray-500 dark:text-gray-100">
+                    ({{ grouped_boats | length }}) 
+                  </small>
+            </summary>
+            <div class="pb-3">
+              {% for boat in grouped_boats | sort(attribute="name") %}
+                  <div id="boat-{{ boat.id }}"
+                      class="py-3 mx-3 boats-js text-black dark:text-white border-t {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-primary-950 {% endif %}"
+                      {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
+                      data-id="{{ boat.id }}">
+                      <span class="status-damage status-damage-{{ boat.damage }}"></span>
+                      <span {% if boat.damage == 'locked' or boat.on_water %}class="opacity-50"{% endif %}>{{ boat.name }}
+                          {% if boat.owner %}<span class="opacity-50">(privat)</span>{% endif %}
+                      </span>
+                  </div>
+              {% endfor %}
             </div>
-            {% for boat in grouped_boats | sort(attribute="name") %}
-                <div id="boat-{{ boat.id }}"
-                     class="px-3 boats-js text-black dark:text-white {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 {% endif %}"
-                     {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
-                     data-id="{{ boat.id }}">
-                    <span class="status-damage status-damage-{{ boat.damage }}"></span>
-                    <span {% if boat.damage == 'locked' or boat.on_water %}class="opacity-50"{% endif %}>{{ boat.name }}
-                        {% if boat.owner %}<span class="opacity-50">(privat)</span>{% endif %}
-                    </span>
-                </div>
-            {% endfor %}
-        </div>
+          </details>
     {% endfor %}
 {% endmacro show_boats %}
+
 {# Shows the form for creating a new logbook entry. #}
 {% macro new(shipmaster) %}
     <form action="/log"
diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index 06b7842..48e770b 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -15,10 +15,29 @@
                     <h2 class="h2">Boote</h2>
                     <div>{{ log::show_boats(only_ones=false) }}</div>
                 </div>
+                <div class="bg-white dark:bg-primary-900 rounded-md hidden lg:block shadow mt-3">
+                    <h2 class="h2">Schnellauswahl</h2>
+                    <div>
+                      {% for boat in boats %}
+                        {% if boat.id in [42, 36] %}
+                          <div class="p-3 boats-js text-black dark:text-white border-t {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-primary-950 {% endif %}"
+                            {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
+                            data-id="{{ boat.id }}">
+                              <span class="status-damage status-damage-{{ boat.damage }}"></span>
+                              <span {% if boat.damage == 'locked' or boat.on_water %}class="opacity-50"{% endif %}>{{ boat.name }}
+                                  {% if boat.owner %}<span class="opacity-50">(privat)</span>{% endif %}
+                              </span>
+                          </div>
+                        {% endif %}
+                      {% endfor %}
+                    </div>
+                </div>
             </div>
-            <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
-                <h2 class="h2">Neue Ausfahrt</h2>
-                <div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div>
+            <div class="lg:col-span-3">
+                <div class="bg-white dark:bg-primary-900 rounded-md shadow">
+                  <h2 class="h2">Neue Ausfahrt</h2>
+                  <div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div>
+                </div>
             </div>
             <div>
                 <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
diff --git a/templates/log.html.tera b/templates/log.html.tera
index 11fac2d..741186c 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -6,14 +6,16 @@
         <h1 class="h1">Logbuch</h1>
         <div class="w-full grid lg:grid-cols-5 gap-3 mt-5">
             <div>
-                <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
+                <div class="bg-white dark:bg-primary-900 rounded-md hidden lg:block shadow">
                     <h2 class="h2">Boote</h2>
                     <div>{{ log::show_boats(only_ones=false) }}</div>
                 </div>
             </div>
-            <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
-                <h2 class="h2">Neue Ausfahrt</h2>
-                <div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div>
+            <div class="lg:col-span-3">
+              <div class="bg-white dark:bg-primary-900 rounded-md shadow">
+                  <h2 class="h2">Neue Ausfahrt</h2>
+                  <div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div>
+              </div>
             </div>
             <div>
                 <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
-- 
2.45.2


From 6c2e0669d5e503eb57d672b523bdb0fc459dbabd Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 23 Apr 2024 22:46:05 +0200
Subject: [PATCH 4/6] [TASK] improve sorting boats in schnellauswahl

---
 templates/kiosk.html.tera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index 48e770b..4969f73 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -18,7 +18,7 @@
                 <div class="bg-white dark:bg-primary-900 rounded-md hidden lg:block shadow mt-3">
                     <h2 class="h2">Schnellauswahl</h2>
                     <div>
-                      {% for boat in boats %}
+                      {% for boat in boats | reverse %}
                         {% if boat.id in [42, 36] %}
                           <div class="p-3 boats-js text-black dark:text-white border-t {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-primary-950 {% endif %}"
                             {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
-- 
2.45.2


From 349a9f843c160f12d58b6d1ad5712864f031625c Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 24 Apr 2024 07:39:44 +0200
Subject: [PATCH 5/6] fix ci

---
 frontend/tests/log.spec.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/tests/log.spec.ts b/frontend/tests/log.spec.ts
index 7692ed1..9aa84f8 100644
--- a/frontend/tests/log.spec.ts
+++ b/frontend/tests/log.spec.ts
@@ -15,6 +15,7 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
     await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x').click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
@@ -31,6 +32,7 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
   await expect(page.locator("body")).toContainText(
     "Ausfahrt erfolgreich hinzugefügt",
   );
+  await page.getByText('2x').click();
   await expect(page.locator("body")).toContainText("Joe");
 
   await page.getByRole("link", { name: "Joe" }).click();
@@ -55,6 +57,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
     await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x').click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
@@ -106,6 +109,7 @@ test("Kiosk can start and cancel trip", async ({ page }, testInfo) => {
     await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x').click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
@@ -139,6 +143,7 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
     await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x').click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
-- 
2.45.2


From d4218289f002e036ca2f0d59892938c9f0b9d060 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 24 Apr 2024 08:27:54 +0200
Subject: [PATCH 6/6] fix ci

---
 frontend/tests/log.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/tests/log.spec.ts b/frontend/tests/log.spec.ts
index 9aa84f8..64d2c09 100644
--- a/frontend/tests/log.spec.ts
+++ b/frontend/tests/log.spec.ts
@@ -32,7 +32,6 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
   await expect(page.locator("body")).toContainText(
     "Ausfahrt erfolgreich hinzugefügt",
   );
-  await page.getByText('2x').click();
   await expect(page.locator("body")).toContainText("Joe");
 
   await page.getByRole("link", { name: "Joe" }).click();
-- 
2.45.2