[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)');
   
 

src/model/user/mod.rs

@@ -577,6 +577,10 @@ ASKÖ Ruderverein Donau Linz", self.name),
         .execute(db)
         .await
         .unwrap(); //Okay, because we can only create a User of a valid id
+        ActivityBuilder::new(&format!("User {self} hat sich eingeloggt."))
+            .relevant_for_user(self)
+            .save(db)
+            .await;
     }
 
     pub async fn delete(&self, db: &SqlitePool, deleted_by: &ManageUserUser) {

src/tera/auth.rs

@@ -1,4 +1,5 @@
 use rocket::{
+    FromForm, Request, Route, State,
     form::Form,
     get,
     http::{Cookie, CookieJar},
@@ -8,13 +9,11 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
-    FromForm, Request, Route, State,
 };
-use rocket_dyn_templates::{context, tera, Template};
+use rocket_dyn_templates::{Template, context, tera};
 use sqlx::SqlitePool;
 
 use crate::model::{
-    activity::ActivityBuilder,
     log::Log,
     user::{LoginError, User},
 };
@@ -83,12 +82,13 @@ async fn login(
 
     cookies.add_private(Cookie::new("loggedin_user", format!("{}", user.id)));
 
-    ActivityBuilder::new(&format!(
+    Log::create(
-        "{user} hat sich eingeloggt (User-Agent: {})",
+        db,
-        agent.0
+        format!(
-    ))
+            "Succ login of {} with this useragent: {}",
-    .relevant_for_user(&user)
+            login.name, agent.0
-    .save(db)
+        ),
+    )
     .await;
 
     // Check for redirect_url cookie and redirect accordingly

templates/admin/user/index.html.tera

@@ -12,13 +12,13 @@
                 <div class="grid sm:grid-cols-3 gap-3 mt-3">
                       <button type="button"
                               onclick="document.getElementById('add-clubuser').showModal()"
-                              class="btn btn-primary">🥳 Vereinsmitglied</button>
+                              class="btn btn-primary">Vereinsmitglied</button>
                       <button type="button"
                               onclick="document.getElementById('add-scheckbuch').showModal()"
-                              class="btn btn-dark">🧑‍🏫 Scheckbuch</button>
+                              class="btn btn-dark">Scheckbuch</button>
                       <button type="button"
                               onclick="document.getElementById('add-schnupperkurs').showModal()"
-                              class="btn btn-dark">👨‍🎓 Schnupperkurs</button>
+                              class="btn btn-dark">Schnupperkurs</button>
 
 
                       </div>

templates/admin/user/view.html.tera

@@ -402,11 +402,11 @@
             {% endif %}
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">Aktivitäten</h2>
-                <div class="mx-3 max-h-60 overflow-y-scroll">
+                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
                     <div class="py-3">
                         <ul class="list-disc ms-4">
                             {% for activity in activities %}
-                                <li><strong>{{ activity.created_at | date(format="%d. %m. %Y") }}:</strong> <small>{{ activity.text }}</small></li>
+                                <li>{{ activity.created_at | date(format="%d. %m. %Y") }}: {{ activity.text }}</li>
                             {% else %}
                                 <li>Noch keine Aktivität... Stay tuned 😆</li>
                             {% endfor %}

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 }}" />
+                        <div>
-                        <input type="datetime-local" class="input rounded-md" name="arrival" value="{{ log.arrival }}" />
+                            <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 %}