From 9c1bcbc5f59a8e28df43dc0b6a28b8195fbe7b9b Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 08:58:51 +0100
Subject: [PATCH 1/3] don't count 'externe steuerkilometer' as guest kms

---
 src/model/stat.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/model/stat.rs b/src/model/stat.rs
index c53c267..165c455 100644
--- a/src/model/stat.rs
+++ b/src/model/stat.rs
@@ -73,7 +73,8 @@ WHERE u.id NOT IN (
     WHERE ro.name = 'Donau Linz'
 )
 AND l.distance_in_km IS NOT NULL
-AND l.arrival LIKE '{year}-%';
+AND l.arrival LIKE '{year}-%'
+AND u.name != 'Externe Steuerperson';
 "
         ))
         .fetch_one(db)
-- 
2.45.2


From c9eecf0a29f89e8395b2d82d20795af097eeec06 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 09:14:26 +0100
Subject: [PATCH 2/3] create temporary boat reservation feature

---
 templates/includes/macros.html.tera | 14 ++++++++++++++
 templates/kiosk.html.tera           |  1 +
 templates/log.html.tera             |  1 +
 3 files changed, 16 insertions(+)

diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index b54df4d..28f568c 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -1,3 +1,17 @@
+{% macro boatreservation() %}
+    <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3"
+         style="margin-top: 10px">
+        <h2 class="h2">Bootsreservierungen</h2>
+        <div class="p2" style="margin-bottom: 10px;">
+            <ul style="display: flex;
+                       justify-content: space-around;
+                       padding: 0;
+                       list-style: none">
+                <li style="display: inline-block;">22.04. | Christian Gusenbauer | Boot: Linz</li>
+            </ul>
+        </div>
+    </div>
+{% endmacro boatreservation %}
 {% macro header(loggedin_user) %}
     <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">
         <div class="max-w-screen-xl w-full flex justify-between items-center">
diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index 149d157..e03a452 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -9,6 +9,7 @@
                 {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
             </div>
         {% endif %}
+        {{ macros::boatreservation() }}
         <div class="w-full grid md:grid-cols-5 gap-3 mt-5">
             <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
                 <h2 class="h2">Boote</h2>
diff --git a/templates/log.html.tera b/templates/log.html.tera
index d6e2144..c47f12f 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -4,6 +4,7 @@
 {% block content %}
     <div class="w-full">
         <h1 class="h1">Logbuch</h1>
+        {{ macros::boatreservation() }}
         <div class="w-full grid md:grid-cols-5 gap-3 mt-5">
             <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
                 <h2 class="h2">Boote</h2>
-- 
2.45.2


From a17a08d01836fda75c3c9a2bb7ebe007104d4fa9 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Wed, 20 Mar 2024 09:15:58 +0100
Subject: [PATCH 3/3] create temporary boat reservation feature

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

diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index 28f568c..b958f4f 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -7,7 +7,7 @@
                        justify-content: space-around;
                        padding: 0;
                        list-style: none">
-                <li style="display: inline-block;">22.04. | Christian Gusenbauer | Boot: Linz</li>
+                <li style="display: inline-block;">22.04. | Christian Gusenbauer | Boot: Linz + kleiner Hänger</li>
             </ul>
         </div>
     </div>
-- 
2.45.2