Merge pull request 'hide reservations if there are none; clean code' (#330) from reservations into staging

Reviewed-on: #330

src/model/boatreservation.rs

@@ -2,7 +2,6 @@ use crate::model::{boat::Boat, user::User};
 use chrono::NaiveDate;
 use chrono::NaiveDateTime;
 use rocket::serde::{Deserialize, Serialize};
-use rocket::FromForm;
 use sqlx::{FromRow, SqlitePool};
 
 use super::log::Log;

src/tera/boatreservation.rs

@@ -13,9 +13,8 @@ use tera::Context;
 use crate::{
     model::{
         boat::Boat,
-        boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
         boatreservation::{BoatReservation, BoatReservationToAdd},
-        user::{AdminUser, CoxUser, DonauLinzUser, TechUser, User, UserWithRoles},
+        user::{DonauLinzUser, User, UserWithRoles},
     },
     tera::log::KioskCookie,
 };

templates/includes/macros.html.tera

@@ -1,19 +1,21 @@
 {% 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 text-center" style="margin-bottom: 10px;">
-            <ul style=" justify-content: space-around; padding: 0; list-style: none">
-                {% for reservation in reservations %}
-                    <li>
-                        {{ reservation.boat.name }} &bullet; {{ reservation.start_date }}
-                        {% if reservation.end_date != reservation.start_date %}- {{ reservation.end_date }}{% endif %}
-                        &bullet; Uhrzeit: {{ reservation.time_desc }} &bullet; Zweck: {{ reservation.usage }}
-                    </li>
-                {% endfor %}
-            </ul>
+    {% if reservations %}
+        <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 text-center" style="margin-bottom: 10px;">
+                <ul style=" justify-content: space-around; padding: 0; list-style: none">
+                    {% for reservation in reservations %}
+                        <li>
+                            {{ reservation.boat.name }} &bullet; {{ reservation.start_date }}
+                            {% if reservation.end_date != reservation.start_date %}- {{ reservation.end_date }}{% endif %}
+                            &bullet; Uhrzeit: {{ reservation.time_desc }} &bullet; Zweck: {{ reservation.usage }}
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
         </div>
-    </div>
+    {% endif %}
 {% endmacro boatreservation %}
 {% macro header(loggedin_user) %}
     <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">