From 213e9faad4bef9038fcb6fa9b8358954696063d5 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 2 Jan 2025 11:22:41 +0100 Subject: [PATCH 1/2] [TASK] idea reservation styling in planned events view --- templates/planned.html.tera | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/templates/planned.html.tera b/templates/planned.html.tera index f4747e6..70897c3 100644 --- a/templates/planned.html.tera +++ b/templates/planned.html.tera @@ -92,26 +92,25 @@ {% if day.events | length > 0 or day.trips | length > 0 or day.boat_reservations | length > 0 %}
{# --- START Boatreservations--- #} - - {% for _, reservations_for_event in day.boat_reservations %} - {% set reservation = reservations_for_event[0] %} -
-
-
- - Reservierung - {% for reservation in reservations_for_event -%} - {{ reservation.boat.name }} - {%- if not loop.last %} + {% endif -%} - {% endfor -%} - : {{ reservation.time_desc }} - - (von {{ reservation.user_applicant.name }}, Grund: {{ reservation.usage}}) -
-
+ {% for _, reservations_for_event in day.boat_reservations %} + {% set reservation = reservations_for_event[0] %} +
+
+
+ + 📅 {{ reservation.time_desc }} ({{ reservation.user_applicant.name }})
+ + {% for reservation in reservations_for_event -%} + {{ reservation.boat.name }} + {%- if not loop.last %} + {% endif -%} + {% endfor -%} + +
+ ({{ reservation.usage}})
- {% endfor %} +
+ {% endfor %} {# --- END Boatreservations--- #} {# --- START Events --- #} {% if day.events | length > 0 %} From 1a850535edd9d2bad55424eea98e1d9af6b6eb66 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Wed, 8 Jan 2025 14:46:11 +0100 Subject: [PATCH 2/2] switch from date to time icon + add 'Reservierung' --- templates/planned.html.tera | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/planned.html.tera b/templates/planned.html.tera index 70897c3..4310925 100644 --- a/templates/planned.html.tera +++ b/templates/planned.html.tera @@ -98,7 +98,7 @@
- 📅 {{ reservation.time_desc }} ({{ reservation.user_applicant.name }})
+ ⏳ {{ reservation.time_desc }} ({{ reservation.user_applicant.name }})
{% for reservation in reservations_for_event -%} {{ reservation.boat.name }} @@ -106,7 +106,7 @@ {% endfor -%}
- ({{ reservation.usage}}) + (Reservierung - {{ reservation.usage}})