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

frontend/scss/components/_headlines.scss

@@ -5,3 +5,7 @@
 .h2 {
   @apply font-bold uppercase tracking-wide text-center rounded-t-md text-primary-950 dark:text-white bg-gray-200 dark:bg-primary-950 bg-opacity-80 text-lg px-3 py-3;
 }
+
+.h3 {
+  @apply text-center text-xl uppercase tracking-wide font-bold text-primary-900 dark:text-white;
+}

frontend/scss/components/_links.scss

@@ -11,6 +11,10 @@
     @apply text-white hover:text-primary-100 underline;
   }
 
+  &-black {
+    @apply text-black hover:text-primary-950 dark:text-white hover:dark:text-primary-300 underline;
+  }
+
   &-no-underline {
     @apply no-underline;
   }

src/model/activity.rs

@@ -1,6 +1,6 @@
 use std::ops::DerefMut;
 
-use super::user::User;
+use super::{role::Role, user::User};
 use chrono::NaiveDateTime;
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
@@ -21,6 +21,7 @@ pub struct ActivityBuilder {
 }
 
 impl ActivityBuilder {
+    #[must_use]
     pub fn new(text: &str) -> Self {
         Self {
             text: text.into(),
@@ -29,6 +30,7 @@ impl ActivityBuilder {
         }
     }
 
+    #[must_use]
     pub fn relevant_for_user(self, user: &User) -> Self {
         Self {
             relevant_for: format!("{}user-{};", self.relevant_for, user.id),
@@ -36,6 +38,14 @@ impl ActivityBuilder {
         }
     }
 
+    #[must_use]
+    pub fn relevant_for_role(self, role: &Role) -> Self {
+        Self {
+            relevant_for: format!("{}role-{};", self.relevant_for, role.id),
+            ..self
+        }
+    }
+
     pub async fn save(self, db: &SqlitePool) {
         Activity::create(db, &self.text, &self.relevant_for, self.keep_until).await;
     }

src/model/role.rs

@@ -1,5 +1,6 @@
 use std::{cmp::Ordering, fmt::Display, ops::DerefMut};
 
+use super::{activity::ActivityBuilder, user::AdminUser};
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
@@ -134,6 +135,30 @@ WHERE name like ?
         .ok()
     }
 
+    pub async fn update(
+        &self,
+        db: &SqlitePool,
+        updated_by: &AdminUser,
+        formatted_name: &str,
+        desc: &str,
+    ) -> Result<(), String> {
+        sqlx::query!(
+            "UPDATE role SET formatted_name=?, desc=? WHERE id=?",
+            formatted_name,
+            desc,
+            self.id
+        )
+        .execute(db)
+        .await
+        .map_err(|e| e.to_string())?;
+
+        ActivityBuilder::new(&format!(
+            "{updated_by} hat Rolle {self} von {self:#?} auf FORMATTED_NAME={formatted_name}, DESC={desc} aktualisiert."
+        )).relevant_for_role(self).save(db).await;
+
+        Ok(())
+    }
+
     pub async fn names_from_role(&self, db: &SqlitePool) -> Vec<String> {
         let query = format!(
             "SELECT u.name

src/model/user/basic.rs

@@ -414,12 +414,14 @@ impl User {
         .await
         .unwrap();
 
-        ActivityBuilder::new(&format!(
-            "{updated_by} hat die Rolle {role} von {self} entfernt."
-        ))
-        .relevant_for_user(self)
-        .save(db)
-        .await;
+        if !role.hide_in_lists && role.cluster.is_none() {
+            ActivityBuilder::new(&format!(
+                "{updated_by} hat die Rolle {role} von {self} entfernt."
+            ))
+            .relevant_for_user(self)
+            .save(db)
+            .await;
+        }
 
         Ok(())
     }
@@ -499,7 +501,7 @@ impl User {
             )
         })?;
 
-        if !role.hide_in_lists {
+        if !role.hide_in_lists && role.cluster.is_none() {
             ActivityBuilder::new(&format!(
                 "{updated_by} hat die Rolle '{role}' dem Benutzer {self} hinzugefügt."
             ))

src/model/user/foerdernd.rs

@@ -1,7 +1,8 @@
-use super::{regular::ClubMember, ManageUserUser, User};
+use super::{ManageUserUser, User, regular::ClubMember};
 use crate::{
+    NonEmptyString,
     model::{activity::ActivityBuilder, mail::Mail, notification::Notification, role::Role},
-    special_user, NonEmptyString,
+    special_user,
 };
 use chrono::NaiveDate;
 use rocket::{async_trait, fs::TempFile};

src/model/user/regular.rs

@@ -1,7 +1,8 @@
 use super::{ManageUserUser, User};
 use crate::{
+    NonEmptyString,
     model::{activity::ActivityBuilder, mail::Mail, notification::Notification, role::Role},
-    special_user, NonEmptyString,
+    special_user,
 };
 use chrono::NaiveDate;
 use rocket::{async_trait, fs::TempFile, tokio::io::AsyncReadExt};

src/model/user/scheckbuch.rs

@@ -2,12 +2,13 @@ use super::foerdernd::FoerderndUser;
 use super::regular::RegularUser;
 use super::unterstuetzend::UnterstuetzendUser;
 use super::{ManageUserUser, User};
+use crate::NonEmptyString;
 use crate::model::activity::ActivityBuilder;
 use crate::model::role::Role;
-use crate::NonEmptyString;
 use crate::{
+    SCHECKBUCH,
     model::{mail::Mail, notification::Notification},
-    special_user, SCHECKBUCH,
+    special_user,
 };
 use chrono::NaiveDate;
 use rocket::async_trait;

src/model/user/schnupperant.rs

@@ -4,9 +4,9 @@ use super::scheckbuch::ScheckbuchUser;
 use super::schnupperinterest::SchnupperInterestUser;
 use super::unterstuetzend::UnterstuetzendUser;
 use super::{ManageUserUser, User};
+use crate::NonEmptyString;
 use crate::model::activity::ActivityBuilder;
 use crate::model::role::Role;
-use crate::NonEmptyString;
 use crate::{
     model::{mail::Mail, notification::Notification},
     special_user,

src/model/user/schnupperinterest.rs

@@ -1,9 +1,9 @@
 use super::scheckbuch::ScheckbuchUser;
 use super::schnupperant::SchnupperantUser;
 use super::{ManageUserUser, User};
+use crate::NonEmptyString;
 use crate::model::activity::ActivityBuilder;
 use crate::model::role::Role;
-use crate::NonEmptyString;
 use crate::{model::notification::Notification, special_user};
 use rocket::async_trait;
 use sqlx::SqlitePool;

src/model/user/unterstuetzend.rs

@@ -1,7 +1,8 @@
-use super::{regular::ClubMember, ManageUserUser, User};
+use super::{ManageUserUser, User, regular::ClubMember};
 use crate::{
+    NonEmptyString,
     model::{activity::ActivityBuilder, mail::Mail, notification::Notification, role::Role},
-    special_user, NonEmptyString,
+    special_user,
 };
 use chrono::NaiveDate;
 use rocket::{async_trait, fs::TempFile};

src/tera/admin/mod.rs

@@ -12,6 +12,7 @@ pub mod boat;
 pub mod event;
 pub mod mail;
 pub mod notification;
+pub mod role;
 pub mod schnupper;
 pub mod user;
 
@@ -81,6 +82,7 @@ pub fn routes() -> Vec<Route> {
     ret.append(&mut notification::routes());
     ret.append(&mut mail::routes());
     ret.append(&mut event::routes());
+    ret.append(&mut role::routes());
     ret.append(&mut routes![rss, show_rss, show_list, list]);
     ret
 }

src/tera/admin/role.rs

@@ -0,0 +1,64 @@
+use crate::model::{
+    role::Role,
+    user::{AdminUser, UserWithDetails, VorstandUser},
+};
+use rocket::{
+    form::Form,
+    get, post,
+    request::FlashMessage,
+    response::{Flash, Redirect},
+    routes, FromForm, Route, State,
+};
+use rocket_dyn_templates::{tera::Context, Template};
+use sqlx::SqlitePool;
+
+#[get("/role")]
+async fn index(
+    db: &State<SqlitePool>,
+    admin: VorstandUser,
+    flash: Option<FlashMessage<'_>>,
+) -> Template {
+    let roles = Role::all(db).await;
+
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+    context.insert("roles", &roles);
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(admin.user, db).await,
+    );
+
+    Template::render("admin/role", context.into_json())
+}
+#[derive(FromForm)]
+pub struct RoleToUpdate<'r> {
+    pub formatted_name: &'r str,
+    pub desc: &'r str,
+}
+
+#[post("/role/<role_id>", data = "<data>")]
+async fn update(
+    db: &State<SqlitePool>,
+    data: Form<RoleToUpdate<'_>>,
+    role_id: i32,
+    admin: AdminUser,
+) -> Flash<Redirect> {
+    let role = Role::find_by_id(db, role_id).await;
+    let Some(role) = role else {
+        return Flash::error(Redirect::to("/admin/role"), "Role does not exist!");
+    };
+
+    match role
+        .update(db, &admin, &data.formatted_name, &data.desc)
+        .await
+    {
+        Ok(_) => Flash::success(Redirect::to("/admin/role"), "Rolle bearbeitet"),
+        Err(e) => Flash::error(Redirect::to("/admin/role"), e),
+    }
+}
+
+pub fn routes() -> Vec<Route> {
+    routes![index, update]
+}

src/tera/admin/user.rs

@@ -132,6 +132,12 @@ async fn view(
             format!("User mit ID {} gibts ned", user),
         ));
     };
+    if user.name == "Externe Steuerperson" {
+        return Err(Flash::error(
+            Redirect::to("/admin/user"),
+            "Diese besondere Person kannst du dir leider nicht anschauen, mein lieber neugieriger Ruderant!"
+        ));
+    }
 
     let member = Member::from(db, user.clone()).await;
     let fee = user.fee(db).await;

src/tera/log.rs

@@ -1,7 +1,6 @@
 use std::net::IpAddr;
 
 use rocket::{
-    Request, Route, State,
     form::Form,
     get,
     http::{Cookie, CookieJar},
@@ -10,8 +9,9 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
+    Request, Route, State,
 };
-use rocket_dyn_templates::{Template, context};
+use rocket_dyn_templates::{context, Template};
 use sqlx::SqlitePool;
 use tera::Context;
 
@@ -110,10 +110,13 @@ async fn index(
 #[get("/show", rank = 3)]
 async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     let logs = Logbook::completed(db).await;
+    let boats = Boat::all(db).await;
+    let users = User::all(db).await;
+    let logtypes = LogType::all(db).await;
 
     Template::render(
         "log.completed",
-        context!(logs, loggedin_user: &UserWithDetails::from_user(user.into_inner(), db).await),
+        context!(logs, boats, users, logtypes, loggedin_user: &UserWithDetails::from_user(user.into_inner(), db).await),
     )
 }
 
@@ -582,7 +585,7 @@ mod test {
     use sqlx::SqlitePool;
 
     use crate::model::logbook::Logbook;
-    use crate::tera::{User, log::Boat};
+    use crate::tera::{log::Boat, User};
     use crate::testdb;
 
     #[sqlx::test]

templates/admin/role.html.tera

@@ -0,0 +1,37 @@
+{% import "includes/macros" as macros %}
+{% import "includes/forms/boat" as boat %}
+{% extends "base" %}
+{% block content %}
+    <div class="max-w-screen-lg w-full dark:text-white">
+        <h1 class="h1">Rolle</h1>
+        <div class="grid ">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Rolle</h2>
+                {% for role in roles %}
+    <div data-filterable="true"
+         data-filter="{{ role.name }}"
+         class="w-full border-t">
+        <form action="/admin/role/{{ role.id }}"
+              data-filterable="true"
+              method="post"
+              class="bg-white dark:bg-primary-900 p-4 w-full">
+            <div class="w-full">
+                <input type="hidden" name="id" value="{{ role.id }}" />
+                <div class="font-bold mb-1 text-black dark:text-white">
+                    {{ role.name }}
+                    <br />
+                </div>
+                <div class="grid md:grid-cols-3 gap-3">
+                    {{ macros::input(label='Formatierter Name', name='formatted_name', type='text', value=role.formatted_name) }}
+                    {{ macros::input(label='Beschreibung', name='desc', type='text', value=role.desc) }}
+                    <input value="Ändern" type="submit" class="w-28 btn btn-primary" />
+                </div>
+            </div>
+        </form>
+    </div>
+    {% endfor %}
+            </div>
+        </div>
+    </div>
+{% endblock content %}

templates/admin/user/index.html.tera

@@ -8,52 +8,121 @@
                 <summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white">
                     Neue Person hinzufügen
                 </summary>
-                <details class="mt-5 bg-gray-200 dark:bg-primary-600 p-3 rounded-md">
-                    <summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white">Vereinsmitglied</summary>
-                    <form action="/admin/user/new/clubmember"
-                          method="post"
-                          enctype="multipart/form-data"
-                          class="grid gap-3">
-                        <div>
-                            <label for="membertype" class="text-sm text-gray-600 dark:text-gray-100">Mitgliedstyp</label>
-                            <select name="membertype" id="membertype" class="input rounded-md ">
-                                <option selected="" value="regular">Reguläres Vereinsmitglied</option>
-                                <option value="unterstuetzend">Unterstützendes Vereinsmitglied</option>
-                                <option value="foerdernd">Förderndes Vereinsmitglied</option>
-                            </select>
+
+                <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>
+                      <button type="button"
+                              onclick="document.getElementById('add-scheckbuch').showModal()"
+                              class="btn btn-dark">Scheckbuch</button>
+                      <button type="button"
+                              onclick="document.getElementById('add-schnupperkurs').showModal()"
+                              class="btn btn-dark">Schnupperkurs</button>
+
+
+                      </div>
+                      <dialog id="add-clubuser"
+                              class="max-w-screen-sm w-full dark:bg-primary-900 dark:text-white rounded-md"
+                              onclick="document.getElementById('add-clubuser').close()">
+                          <div onclick="event.stopPropagation();" class="p-3">
+                              <button type="button"
+                                      onclick="document.getElementById('add-clubuser').close()"
+                                      title="Schließen"
+                                      class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3">
+                                  <svg class="inline h-5 w-5"
+                                        width="16"
+                                        height="16"
+                                        fill="currentColor"
+                                        viewBox="0 0 16 16">
+                                      <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                  </svg>
+                              </button>
+                              <div class="mt-8">
+                              <h2 class="h3 mb-3">Neues Vereinsmitglied</h2>
+                              <form action="/admin/user/new/clubmember"
+                                    method="post"
+                                    enctype="multipart/form-data"
+                                    class="grid gap-3">
+                                <div>
+                                    <label for="membertype" class="text-sm text-gray-600 dark:text-gray-100">Mitgliedstyp</label>
+                                    <select name="membertype" id="membertype" class="input rounded-md ">
+                                        <option selected="" value="regular">Reguläres Vereinsmitglied</option>
+                                        <option value="unterstuetzend">Unterstützendes Vereinsmitglied</option>
+                                        <option value="foerdernd">Förderndes Vereinsmitglied</option>
+                                    </select>
+                                </div>
+                                {{ macros::input(label='Name', name='name', type="text", required=true) }}
+                                {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }}
+                                {{ macros::select(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung") }}
+                                {{ macros::input(label='Mitglied seit', name='member_since', type="date", value=now() | date(), required=true) }}
+                                {{ macros::input(label='Geburtsdatum', name='birthdate', type="date", required=true) }}
+                                {{ macros::input(label='Telefonnummer', name='phone', type="text", required=true) }}
+                                {{ macros::input(label='Adresse', name='address', type="text", required=true) }}
+                                {{ macros::input(label='Beitrittserklärung', name='membership_pdf', type="file", accept='application/pdf', required=true) }}
+                                <input value="Neues Vereinsmitglied anlegen"
+                                      type="submit"
+                                      class="btn btn-primary" />
+                            </form>
                         </div>
-                        {{ macros::input(label='Name', name='name', type="text", required=true) }}
-                        {{ macros::input(label='Mailadresse', name='mail', type="email", required=true) }}
-                        {{ macros::select(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung") }}
-                        {{ macros::input(label='Mitglied seit', name='member_since', type="date", value=now() | date(), required=true) }}
-                        {{ macros::input(label='Geburtsdatum', name='birthdate', type="date", required=true) }}
-                        {{ macros::input(label='Telefonnummer', name='phone', type="text", required=true) }}
-                        {{ macros::input(label='Adresse', name='address', type="text", required=true) }}
-                        {{ macros::input(label='Beitrittserklärung', name='membership_pdf', type="file", accept='application/pdf', required=true) }}
-                        <input value="Neues Vereinsmitglied anlegen"
-                               type="submit"
-                               class="btn btn-primary" />
-                    </form>
-                </details>
-                <details class="mt-5 bg-gray-200 dark:bg-primary-600 p-3 rounded-md">
-                    <summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white">Scheckbuch</summary>
-                    <form action="/admin/user/new/scheckbuch"
-                          method="post"
-                          enctype="multipart/form-data"
-                          class="grid gap-3">
-                        {{ macros::input(label='Name', name='name', type="text", required=true) }}
-                        {{ macros::input(label='Mailadresse', name='mail', type="email", required=true) }}
-                        <input value="Neues Scheckbuch anlegen"
-                               type="submit"
-                               class="btn btn-primary" />
-                    </form>
-                </details>
-                <details class="mt-5 bg-gray-200 dark:bg-primary-600 p-3 rounded-md">
-                    <summary class="px-3 cursor-pointer text-md font-bold text-primary-950 dark:text-white">Schnupperkurs</summary>
-                    <form action="/admin/user/new/schnupper"
+                        </div>
+                      </dialog>   
+ 
+                      <dialog id="add-scheckbuch"
+                              class="max-w-screen-sm w-full dark:bg-primary-900 dark:text-white rounded-md"
+                              onclick="document.getElementById('add-scheckbuch').close()">
+                          <div onclick="event.stopPropagation();" class="p-3">
+                              <button type="button"
+                                      onclick="document.getElementById('add-scheckbuch').close()"
+                                      title="Schließen"
+                                      class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3">
+                                  <svg class="inline h-5 w-5"
+                                        width="16"
+                                        height="16"
+                                        fill="currentColor"
+                                        viewBox="0 0 16 16">
+                                      <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                  </svg>
+                              </button>
+                              <div class="mt-8">
+                                <h2 class="h3 mb-3">Neues Scheckbuch</h2>
+                                <form action="/admin/user/new/scheckbuch"
+                                      method="post"
+                                      enctype="multipart/form-data"
+                                      class="grid gap-3">
+                                    {{ macros::input(label='Name', name='name', type="text", required=true) }}
+                                    {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }}
+                                    <input value="Neues Scheckbuch anlegen"
+                                          type="submit"
+                                          class="btn btn-primary" />
+                                </form>
+                              </div>
+                            </div>
+                      </dialog>
+
+                      <dialog id="add-schnupperkurs"
+                              class="max-w-screen-sm w-full dark:bg-primary-900 dark:text-white rounded-md"
+                              onclick="document.getElementById('add-schnupperkurs').close()">
+                        <div onclick="event.stopPropagation();" class="p-3">
+                            <button type="button"
+                                    onclick="document.getElementById('add-schnupperkurs').close()"
+                                    title="Schließen"
+                                    class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3">
+                                <svg class="inline h-5 w-5"
+                                      width="16"
+                                      height="16"
+                                      fill="currentColor"
+                                      viewBox="0 0 16 16">
+                                    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                </svg>
+                            </button>
+                            <div class="mt-8">
+                              <form action="/admin/user/new/schnupper"
                           method="post"
                           enctype="multipart/form-data"
                           class="grid gap-3">
+                          <h2 class="h3 mb-3">Neuer Schnupperant</h2>
+
                         <div>
                             <label for="schnupper_type" class="text-sm text-gray-600 dark:text-gray-100">Typ</label>
                             <select name="schnupper_type" id="schnupper_type" class="input rounded-md ">
@@ -62,11 +131,13 @@
                             </select>
                         </div>
                         {{ macros::input(label='Name', name='name', type="text", required=true) }}
-                        {{ macros::input(label='Mailadresse', name='mail', type="email", required=true) }}
+                        {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }}
                         {{ macros::select(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung") }}
                         <input value="Hinzufügen" type="submit" class="btn btn-primary" />
                     </form>
-                </details>
+                            </div>
+                          </div>
+                    </dialog>
             </details>
         {% endif %}
         <!-- START filterBar -->

templates/admin/user/view.html.tera

@@ -7,8 +7,8 @@
             <a href="/admin/user" class="link link-primary link-no-underline">&larr; Userverwaltung</a>
         {% endif %}
         <h1 class="h1">{{ user.name }}</h1>
-        <div class="grid sm:grid-cols-2 gap-3">
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+        <div class="grid sm:grid-cols-2 gap-8 my-8">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">
                     Grunddaten
                     <br />
@@ -53,7 +53,7 @@
                     </div>
                 </div>
             </div>
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">
                     Mitgliedschaft
                     <br />
@@ -285,7 +285,7 @@
                 </div>
             </div>
             {% if is_clubmember %}
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                     <h2 class="h2">Rollen</h2>
                     <div>
                         <ul class="divide-y divide-gray-200 dark:divide-primary-60 w-full">
@@ -363,7 +363,7 @@
                 </div>
             {% endif %}
             {% if supposed_to_pay %}
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                     <h2 class="h2">💸-Beitrag</h2>
                     <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
                         <div class="py-3">
@@ -400,7 +400,7 @@
                     </div>
                 </div>
             {% endif %}
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <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 divide-y divide-gray-200 dark:divide-primary-600">
                     <div class="py-3">
@@ -414,13 +414,13 @@
                     </div>
                 </div>
             </div>
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">Ergo-Challenge</h2>
-                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
-                    <div class="py-3">
-                        {{ macros::input(label='DOB', name='dob', type="text", value=user.dob, readonly=allowed_to_edit == false) }}
-                        {{ macros::input(label='Weight (kg)', name='weight', type="text", value=user.weight, readonly=allowed_to_edit == false) }}
-                        {{ macros::input(label='Sex', name='sex', type="text", value=user.sex, readonly=allowed_to_edit == false) }}
+                <div class="mx-3">
+                    <div class="grid gap-3 pb-3 mt-3">
+                        {{ macros::inputgroup(label='DOB', name='dob', type="text", value=user.dob, readonly=allowed_to_edit == false) }}
+                        {{ macros::inputgroup(label='Weight (kg)', name='weight', type="text", value=user.weight, readonly=allowed_to_edit == false) }}
+                        {{ macros::inputgroup(label='Sex', name='sex', type="text", value=user.sex, readonly=allowed_to_edit == false) }}
                     </div>
                 </div>
             </div>

templates/includes/forms/log.html.tera

@@ -183,8 +183,6 @@
     <div class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative"
          data-filterable="true"
          data-filter="{{ log.boat.name }} {% for rower in log.rowers %}{{ rower.name }}{% endfor %}">
-        <details>
-            <summary style="list-style: none;">
                 {% if log.logtype and not hide_type %}
                     <div class="absolute top-0 right-0 bg-primary-100 rounded-bl-md text-primary-950 text-xs w-32 px-2 py-1 text-center font-bold">
                         {% if log.logtype == 1 %}
@@ -199,7 +197,15 @@
                     </div>
                 {% endif %}
                 <div {% if log.logtype %}class="mt-4 sm:mt-0"{% endif %}>
-                    <strong class="text-black dark:text-white">{{ log.boat.name }}</strong>
+                     {% if allowed_to_edit %}
+                        <a href="#"
+                              onclick="document.getElementById('change-{{ log.id }}').showModal()"
+                              class="link link-black font-bold">{{ log.boat.name }}</a>
+                     {% else %}
+                        <strong class="text-black dark:text-white">
+                              {{ log.boat.name }}
+                        </strong>
+                     {% endif %}
                     <small class="text-gray-600 dark:text-gray-100">({{ log.shipmaster_user.name -}}
                         {% if log.shipmaster_only_steering %}
                             - handgesteuert
@@ -252,35 +258,65 @@
                             {% endif %}
                         {% endif %}
                     </div>
-                </summary>
-                {% if allowed_to_edit %}
-                    <form action="/log/update" method="post">
+            {% if allowed_to_edit %}
+                      <dialog id="change-{{ log.id }}"
+                              class="max-w-screen-sm w-full dark:bg-primary-900 dark:text-white rounded-md"
+                              onclick="document.getElementById('change-{{ log.id }}').close()">
+                          <div onclick="event.stopPropagation();" class="p-3">
+                              <button type="button"
+                                      onclick="document.getElementById('change-{{ log.id }}').close()"
+                                      title="Schließen"
+                                      class="sidebar-close border-0 bg-primary-100 focus:bg-primary-50 text-black flex items-center justify-center transform rotate-45 absolute right-0 mr-3">
+                                  <svg class="inline h-5 w-5"
+                                        width="16"
+                                        height="16"
+                                        fill="currentColor"
+                                        viewBox="0 0 16 16">
+                                      <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                  </svg>
+                              </button>
+                              <div class="mt-8">
+                              <h2 class="h3">Eintrag '{{ log.boat.name }}' ändern </h2>
+                              <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 }}" />
-                        Handgesteuert:
-                        <input type="checkbox"
-                               name="shipmaster_only_steering"
-                               {% if log.shipmaster_only_steering %}checked="checked"{% endif %} />
-                        <input type="datetime-local" name="departure" value="{{ log.departure }}" />
-                        <input type="datetime-local" name="arrival" value="{{ log.arrival }}" />
+                        {{ 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) }}
+                        <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 }}" />
                         <input type="hidden" name="logtype" value="{{ log.logtype }}" />
-                        <input type="submit" value="Updaten" />
+                        <input type="submit" class="btn btn-primary" value="Updaten" />
                     </form>
                     <a href="/log/{{ log.id }}/delete"
-                       class="w-28 btn btn-alert"
+                       class="w-28 btn btn-alert mt-3"
                        onclick="return confirm('Willst du diesen Logbucheintrag wirklich löschen?');">
                         {% include "includes/delete-icon" %}
                         Löschen
                     </a>
-                {% endif %}
-            </details>
+                        </div>
+                        </div>
+                      </dialog>
+            {% endif %}
         </div>
     {% endmacro show_old %}
     {% macro home(log) %}

templates/includes/macros.html.tera

@@ -156,7 +156,7 @@ function setChoiceByLabel(choicesInstance, label) {
     </header>
     <div class="h-8"></div>
 {% endmacro header %}
-{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
+{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='', placeholder='') %}
     <div class="{{ wrapper_class }}">
         <label for="{{ name }}"
                class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
@@ -169,7 +169,7 @@ function setChoiceByLabel(choicesInstance, label) {
                {% if required %}required{% endif %}
                value="{{ value }}"
                class="input {{ class }}"
-               placeholder="{% if hide_label %}{{ label }}{% endif %}"
+               placeholder="{% if hide_label %}{{ label }}{% endif %}{% if placeholder %}{{ placeholder }}{% endif %}"
                {% if min is defined %}min="{{ min }}"{% endif %}
                {% if autofocus %}autofocus{% endif %}
                {% if accept %}accept="{{ accept }}"{% endif %}

templates/index.html.tera

@@ -431,6 +431,9 @@
                         <li class="py-1">
                             <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
                         </li>
+                        <li class="py-1">
+                            <a href="/admin/role" class="block w-100 py-2 hover:text-primary-600">Rollen</a>
+                        </li>
                         <li class="py-1">
                             <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
                         </li>