From 855962369ac584ee41b8aac72a1042c067c084d8 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Mon, 30 Oct 2023 13:49:49 +0100
Subject: [PATCH] use proper names for new form fields

---
 templates/includes/forms/log.html.tera | 50 +++++++++++++-------------
 templates/log.html.tera                | 43 +++++++++++-----------
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index e95a6d0..8c8e8e4 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -74,27 +74,27 @@
 {% endmacro boat_select %}
 
 {% macro rower_select(id, selected, amount_seats='', class='', init='false', cox_on_boat='', steering_person_id='') %}
-	{% if not amount_seats or amount_seats > 1 %}
-		<div class="{{ class }}">
-			<label for="{{id}}" class="text-sm text-gray-600 ">Ruderer</label>
-			<select style="width: 100%;" multiple name="rowers[]" id="{{id}}" class="w-full" data-seats="{{amount_seats}}" data-init={{init}}>
-				{% for user in users %}
-					{% set_global sel = false %}
-					{% for rower in selected %}
-						{% if rower.id == user.id %}
-							{% set_global sel = true %}
-						{% endif %}
-					{% endfor %}
-					<option value="{{ user.id }}" {% if sel %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %} data-custom-properties='{"is_cox": {{ user.is_cox }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat}}}'>
-						{{user.name}}
-						{% if user.on_water %}
-							(am Wasser)
-						{% endif %}
-					</option>
+	{#{% if not amount_seats or amount_seats > 1 %}#}
+	<div class="{{ class }}">
+		<label for="{{id}}" class="text-sm text-gray-600 ">Ruderer</label>
+		<select style="width: 100%;" multiple name="rowers[]" id="{{id}}" class="w-full" data-seats="{{amount_seats}}" data-init={{init}}>
+			{% for user in users %}
+				{% set_global sel = false %}
+				{% for rower in selected %}
+					{% if rower.id == user.id %}
+						{% set_global sel = true %}
+					{% endif %}
 				{% endfor %}
-			</select>
-		</div>
-	{% endif %}
+				<option value="{{ user.id }}" {% if sel %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %} data-custom-properties='{"is_cox": {{ user.is_cox }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat}}}'>
+					{{user.name}}
+					{% if user.on_water %}
+						(am Wasser)
+					{% endif %}
+				</option>
+			{% endfor %}
+		</select>
+	</div>
+	{#{% endif %}#}
 {% endmacro rower_select %}
 
 {% macro show(log, state, allowed_to_close=false, only_ones) %}
@@ -213,13 +213,11 @@
 {% endmacro show_old %}
 
 {% macro home(log, only_ones) %}
-	{# @MB: Maaaarieeee, please fix col-span-2 craziness #}
+	{# @MB: Maaaarieeee, please fix col-span-2 madness #}
 	<form class="grid grid-cols-1 gap-3" action="/log/{{log.id}}" method="post">
-		{% if not only_ones %}
-			{{ log::rower_select(id="rowers"~log.id, selected=log.rowers, amount_seats=log.boat.amount_seats, class="col-span-2", steering_person_id=log.steering_user.id, cox_on_boat=log.shipmaster_user.id) }}
-			{{ macros::select(label="Schiffsführer", data=[], name='shipmaster', id="shipmaster-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.shipmaster_user.id, required=true) }}
-			{{ macros::select(label="Steuerperson", data=[], name='steering_person', id="steering_person-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.steering_user.id, required=true) }}
-		{% endif %}
+		{{ log::rower_select(id="rowers"~log.id, selected=log.rowers, amount_seats=log.boat.amount_seats, class="col-span-2", steering_person_id=log.steering_user.id, cox_on_boat=log.shipmaster_user.id) }}
+		{{ macros::select(label="Schiffsführer", data=[], name='shipmaster', id="shipmaster-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.shipmaster_user.id, required=true) }}
+		{{ macros::select(label="Steuerperson", data=[], name='steering_person', id="steering_person-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.steering_user.id, required=true) }}
 
 		<div class="col-span-2">
 			{{ macros::checkbox(label="Handgesteuert", name="shipmaster_only_steering", id="shipmaster_only_steering" ~ log.id , checked=log.shipmaster_only_steering,class="rounded-md change-id-js") }}
diff --git a/templates/log.html.tera b/templates/log.html.tera
index d762149..6126e50 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -4,20 +4,19 @@
 {% extends "base" %}
 
 {% block content %}
-	
 	<div class="w-full">
 		<h1 class="h1">Logbuch</h1>
-
-    {% if flash %}
-      <div class="w-full">
-        {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
-      </div>
-	  {% endif %}
-
+	
+		{% if flash %}
+			<div class="w-full">
+				{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
+			</div>
+		{% endif %}
+	
 		<div class="w-full grid md:grid-cols-5 gap-3 mt-5">
 			<div class="bg-white rounded-md hidden md:block shadow">
 				<h2 class="h2">Boote</h2>
-
+	
 				<div>
 					{{ log::show_boats(only_ones=false) }}
 				</div>
@@ -30,21 +29,21 @@
 			</div>
 			<div class="bg-white rounded-md shadow">
 				<h2 class="h2">Am Wasser</h2>
-
-        {% if on_water | length > 0 %}
-          {% for log in on_water %}
-            {% if log.shipmaster == loggedin_user.id %}
-              {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=loggedin_user.is_cox==false) }}
-            {% else %}
-              {{ log::show(log=log, state="on_water", only_ones=true) }}
-            {% endif %}
-          {% endfor %}
-        {% else %}
-          <p class="p-3 text-center">Kein Boot am Wasser</p>
-        {% endif %}
+	
+				{% if on_water | length > 0 %}
+					{% for log in on_water %}
+						{% if log.shipmaster == loggedin_user.id %}
+							{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=loggedin_user.is_cox==false) }}
+						{% else %}
+							{{ log::show(log=log, state="on_water", only_ones=true) }}
+						{% endif %}
+					{% endfor %}
+				{% else %}
+					<p class="p-3 text-center">Kein Boot am Wasser</p>
+				{% endif %}
 			</div>
 		</div>
 	</div>
-
+	
 	<script src="/public/logbook.js"></script>
 {% endblock content%}