[TASK] try to include boat and shipmaster in update popup

frontend/tests/log.spec.ts

@@ -115,7 +115,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
   await page.getByPlaceholder("Passwort").press("Enter");
 
   await page.goto("/log/show");
-  await page.getByRole('link', { name: 'Joe' }).nth(1).click();
+  await page.getByText('(cox2)').click();
   page.once("dialog", (dialog) => {
     dialog.accept().catch(() => {});
   });
@@ -208,6 +208,7 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
 
   await page.getByRole('link', { name: 'Logbuch' }).click();
   await expect(page.locator('body')).toContainText('Joe');
+  await expect(page.locator('body')).toContainText('(cox2)');
   await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
   await expect(page.locator('body')).toContainText('Ruderer: cox2, rower2');
   
@@ -285,6 +286,7 @@ test("Cox can start and finish trip with cox steering only", async ({ page }, te
 
   await page.goto('/log/show');
   await expect(page.locator('body')).toContainText('cox_only_steering_boat');
+  await expect(page.locator('body')).toContainText('(cox2 - handgesteuert)');
   await expect(page.locator('body')).toContainText('Ottensheim (25 km)');
   
 

templates/includes/forms/log.html.tera

@@ -277,17 +277,30 @@
                               </button>
                               <div class="mt-8">
                               <h2 class="h3">Eintrag '{{ log.boat.name }}' ändern </h2>
-                              <p class="text-center mb-3">{{ log.id }}</p>
+                              <p class="text-center mb-3">ID: {{ log.id }}</p>
                                <form action="/log/update" method="post" class="grid gap-3">
                         <input type="hidden" name="id" value="{{ log.id }}" />
-                        <input type="hidden" name="boat_id" value="{{ log.boat_id }}" />
-                        <input type="hidden" name="shipmaster" value="{{ log.shipmaster }}" />
                         <input type="hidden"
                                name="steering_person"
                                value="{{ log.steering_person }}" />
+                        {{ macros::select(label="Boot", data=boats, name="boat_id", id="boat_id{{ log.id }}", selected_id=log.boat.id ,display=["name", " (","amount_seats", " x)"]) }}
+                        {{ macros::select(label="Schiffsführer", data=log.rowers, name="shipmaster", id="shipmaster{{ log.id }}", selected_id=log.shipmaster_user.id) }}
+
+
                         {{ macros::checkbox(label='Handgesteuert', name='shipmaster_only_steering', id=log.shipmaster_only_steering,checked=log.shipmaster_only_steering) }}
-                        <input type="datetime-local" class="input rounded-md" name="departure" value="{{ log.departure }}" />
-                        <input type="datetime-local" class="input rounded-md" name="arrival" value="{{ log.arrival }}" />
+                        <div>
+                            <label for="departure" class=" text-sm text-gray-600 dark:text-white ">
+                                Abfahrt
+                            </label>
+                            <input type="datetime-local" class="input rounded-md" name="departure" value="{{ log.departure }}" />
+                        </div>
+                        <div>
+                            <label for="arrival" class=" text-sm text-gray-600 dark:text-white ">
+                                Ankunft
+                            </label>
+                            <input type="datetime-local" class="input rounded-md" name="arrival" value="{{ log.arrival }}" />
+                        </div>
+                  
                         <input type="hidden" name="destination" value="{{ log.destination }}" />
                         <input type="hidden" name="distance_in_km" value="{{ log.distance_in_km }}" />
                         <input type="hidden" name="comments" value="{{ log.comments }}" />

templates/log.completed.html.tera

@@ -26,7 +26,7 @@
             {% for log in logs %}
                 {% set_global allowed_to_edit = false %}
                 {% if loggedin_user %}
-                    {% if "Vorstand" in loggedin_user.roles or "admin" in loggedin_user.roles %}
+                    {% if "Vorstand" in loggedin_user.roles %}
                         {% set_global allowed_to_edit = true %}
                     {% endif %}
                 {% endif %}