From cecf15320d34bd2195a3b7b88e9f461302fc81cc Mon Sep 17 00:00:00 2001
From: Philipp <philipp.hofer@protonmail.com>
Date: Fri, 28 Apr 2023 20:22:46 +0200
Subject: [PATCH 1/3] show status of trip by adding icon and text

---
 templates/index.html.tera | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/index.html.tera b/templates/index.html.tera
index f5f281d..497ef3c 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -43,7 +43,7 @@
                 class="text-gray-600">({{ planned_event.name }})</small><br />
                 
               <a href="#" data-sidebar="true" data-trigger="sidebar" 
-                data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }}){% if planned_event.notes %}<small class='block'>{{ planned_event.notes }}</small>{% endif %}"
+                data-header="<strong>{{ planned_event.planned_starting_time }} Uhr </strong> ({{ planned_event.name }}){% if planned_event.notes %}<small class='block'>{{ planned_event.notes }}</small>{% endif %}"
                 data-body="#event{{ planned_event.trip_details_id }}"
                 class="inline-block link-primary mr-3">
                 Details
@@ -139,10 +139,15 @@
         <div class="pt-2 reset-js" data-coxneeded="false">
           <div class="flex justify-between items-center">
             <div>
-              <strong class="text-primary-900">{{ trip.planned_starting_time }} Uhr</strong> <small
-                class="text-gray-600">({{ trip.cox_name }})</small><br />
+              <strong class="text-primary-900">{% if trip.max_people == 0 %}<span class="text-[#f43f5e]">&#9888; </span>{% endif %}{{ trip.planned_starting_time }} Uhr</strong> 
+                {% if trip.max_people == 0 %}
+                  <small class="text-[#f43f5e]">(Absage {{ trip.cox_name }})</small>
+                {% else %}
+                 <small class="text-gray-600">({{ trip.cox_name }})</small>
+                {% endif %}
+                <br />
               <a href="#" data-sidebar="true" data-trigger="sidebar" 
-                data-header="<strong>{{ trip.planned_starting_time }} Uhr</strong> ({{ trip.cox_name }}){% if trip.notes %}<small class='block'>{{ trip.notes }}</small>{% endif %}"
+                data-header="<strong>{% if trip.max_people == 0 %}&#9888; {% endif %}{{ trip.planned_starting_time }} Uhr</strong> ({{ trip.cox_name }}){% if trip.notes and trip.max_people > 0 %}<small class='block'>{{ trip.notes }}</small>{% endif %}{% if trip.max_people == 0 %}<small class='block'>Ausfahrt abgesagt!</small>{% endif %}"
                 data-body="#trip{{ trip.trip_details_id }}"
                 class="inline-block link-primary mr-3">
                 Details

From d6b0ce1603ec505e7898c9c2b0eb38b132567984 Mon Sep 17 00:00:00 2001
From: Philipp <philipp.hofer@protonmail.com>
Date: Fri, 28 Apr 2023 20:46:46 +0200
Subject: [PATCH 2/3] show cancelation in sidebar

---
 README.md                           |  1 -
 templates/includes/macros.html.tera |  2 +-
 templates/index.html.tera           | 12 +++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b079d5b..c13acbd 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@
 - Wanderfahrt: &#9969;
 
 # Notes / Bugfixes
-- [] max_people = 0 -> Rot hervorheben, dass Ausfahrt abgesagt wurde?
 - [] my trips for cox
 - [] add `trip_type` (id, name, desc, question, icon) with a FK to `trip_details`
 - [] add `always_show` to `planned_trips` (e.g. for wanderfahrten)
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index d3757b5..fbf28df 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -41,7 +41,7 @@
 </div>
 {% endmacro alert %}
 
-{% macro box(participants, empty_seats, header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white') %}
+{% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white') %}
 <div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">{{ header }} {{ empty_seats }}</div>
 <div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
   {% if participants | length > 0 %}
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 497ef3c..5f61704 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -176,9 +176,15 @@
         {# --- START Sidebar Content --- #}
         <div class="hidden">
             <div id="trip{{ trip.trip_details_id }}">
-              {% set amount_cur_rower = trip.rower | length %}
-              {{ macros::box(participants=trip.rower, empty_seats=trip.max_people - amount_cur_rower, bg='primary-100', color='black') }}
-            {# --- START Edit Form --- #}
+              {% if trip.max_people == 0 %}
+                {# --- border-[#f43f5e] bg-[#f43f5e] --- #}
+                {{ macros::box(participants=trip.rower,bg='[#f43f5e]',header='Absage') }}
+              {% else %}
+                {% set amount_cur_rower = trip.rower | length %}
+                {{ macros::box(participants=trip.rower, empty_seats=trip.max_people - amount_cur_rower, bg='primary-100', color='black') }}
+              {% endif %}
+
+                 {# --- START Edit Form --- #}
             {% if trip.cox_id == loggedin_user.id %}
             <div class="bg-gray-100 p-3 mt-4 rounded-md">
               <h3 class="text-primary-950 font-bold uppercase tracking-wide mb-2">Ausfahrt bearbeiten</h3>

From 29234e08afe430466428f43be56f8001c15ff844 Mon Sep 17 00:00:00 2001
From: PhilippHofer <philipp@hofer.link>
Date: Fri, 28 Apr 2023 19:42:12 +0000
Subject: [PATCH 3/3] Update index.html.tera

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

diff --git a/templates/index.html.tera b/templates/index.html.tera
index 5f61704..36cb1d5 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -43,7 +43,7 @@
                 class="text-gray-600">({{ planned_event.name }})</small><br />
                 
               <a href="#" data-sidebar="true" data-trigger="sidebar" 
-                data-header="<strong>{{ planned_event.planned_starting_time }} Uhr </strong> ({{ planned_event.name }}){% if planned_event.notes %}<small class='block'>{{ planned_event.notes }}</small>{% endif %}"
+                data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }}){% if planned_event.notes %}<small class='block'>{{ planned_event.notes }}</small>{% endif %}"
                 data-body="#event{{ planned_event.trip_details_id }}"
                 class="inline-block link-primary mr-3">
                 Details