From 4d634ce3138f3abbeb8b4828b20402869a2acc65 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Sat, 16 Mar 2024 10:56:37 +0100
Subject: [PATCH 1/2] spacing again

---
 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 521ec8c..d39f4d2 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -109,9 +109,9 @@
                                                     Uhr
                                                 </strong>
                                                 <small class="text-gray-600 dark:text-gray-100">({{ planned_event.name }}
-                                                    {% if planned_event.trip_type %}
+                                                    {%- if planned_event.trip_type %}
                                                         - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
-                                                    {% endif %}
+                                                    {%- endif -%}
                                                 )</small>
                                                 <br />
                                                 <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }})
-- 
2.45.2


From d1fa3e033696de9214b7ab36d6272e5892c7d7ae Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Sat, 16 Mar 2024 19:47:04 +0100
Subject: [PATCH 2/2] board members can open and close trips for others

---
 src/model/logbook.rs                   | 7 +++++--
 templates/includes/forms/log.html.tera | 8 +++++---
 templates/log.html.tera                | 2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/model/logbook.rs b/src/model/logbook.rs
index a9a70ce..d3c6e92 100644
--- a/src/model/logbook.rs
+++ b/src/model/logbook.rs
@@ -472,7 +472,7 @@ ORDER BY departure DESC
         mut log: LogToFinalize,
     ) -> Result<(), LogbookUpdateError> {
         //TODO: extract common tests with `create()`
-        if user.id != self.shipmaster {
+        if !user.has_role_tx(db, "Vorstand").await && user.id != self.shipmaster {
             return Err(LogbookUpdateError::NotYourEntry);
         }
 
@@ -549,7 +549,10 @@ ORDER BY departure DESC
     pub async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), LogbookDeleteError> {
         Log::create(db, format!("{user:?} deleted trip: {self:?}")).await;
 
-        if user.has_role(db, "admin").await || user.id == self.shipmaster {
+        if user.has_role(db, "admin").await
+            || user.has_role(db, "Vorstand").await
+            || user.id == self.shipmaster
+        {
             sqlx::query!("DELETE FROM logbook WHERE id=?", self.id)
                 .execute(db)
                 .await
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index dda33c0..f8f0145 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -137,9 +137,11 @@
                                 {{ rower.name }}
                                 {% if rower.id == log.shipmaster or rower.id == log.steering_person %}
                                     <small class="text-gray-600 dark:text-primary-100">(
-                                        {%- if rower.id == log.shipmaster %}Schiffsführer{% endif -%}
-                                        {% if rower.id == log.shipmaster and rower.id == log.steering_person %} / {% endif %}
-                                        {%- if rower.id == log.steering_person %}Steuerperson{% endif -%}
+                                        {%- if rower.id == log.shipmaster %}Schiffsführer
+                                        {% endif -%}
+                                        {% if rower.id == log.shipmaster and rower.id == log.steering_person %}/{% endif %}
+                                        {%- if rower.id == log.steering_person %}Steuerperson
+                                        {% endif -%}
                                     )</small>
                                 {% endif %}
                             </p>
diff --git a/templates/log.html.tera b/templates/log.html.tera
index b37f3e5..d6e2144 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -19,6 +19,8 @@
                     {% for log in on_water %}
                         {% if log.shipmaster == loggedin_user.id %}
                             {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
+                        {% elif "Vorstand" in loggedin_user.roles %}
+                            {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
                         {% else %}
                             {{ log::show(log=log, state="on_water", only_ones=true) }}
                         {% endif %}
-- 
2.45.2