Merge pull request 'don't count 'externe steuerkilometer' as guest kms' (#278) from staging into main

Reviewed-on: #278

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)

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 + kleiner Hänger</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">

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>

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>