Merge pull request 'updates-meeting' (#1084) from updates-meeting into staging

Reviewed-on: #1084

src/model/user/basic.rs

@@ -342,33 +342,12 @@ impl User {
                         None,
                     )
                     .await;
-                    ActivityBuilder::new(&format!("{updated_by} hat {self} zum normalen Mitglied gemacht (keine Steuerperson/Bootsführer mehr)"))
+                    ActivityBuilder::new(&format!("{updated_by} hat {self} zum normalen Mitglied gemacht (keine Steuerperson/Schiffsführer mehr)"))
                     .user(self)
                     .save(db)
                     .await;
                 }
             }
-            (old, new) if old == Some(bootsfuehrer.clone()) && new == Some(cox.clone()) => {
-                self.remove_role(db, updated_by, &bootsfuehrer).await?;
-                self.add_role(db, updated_by, &cox).await?;
-                Notification::create_for_role(
-                    db,
-                    &member,
-                    &format!(
-                        "Lieber Vorstand, {self} ist ab sofort kein Bootsführer:in mehr, sondern 'nur' mehr eine Steuerperson."
-                    ),
-                    "Bootsführer--",
-                    None,
-                    None,
-                )
-                .await;
-                ActivityBuilder::new(&format!(
-                    "{updated_by} hat {self} zur Steuerperson gemacht (kein Bootsführer mehr)"
-                ))
-                .user(self)
-                .save(db)
-                .await;
-            }
             (old, new) => return Err(format!("Not allowed to change from {old:?} to {new:?}")),
         };
 
@@ -529,13 +508,6 @@ impl User {
     }
 
     pub(crate) async fn remove_membership_pdf(&self, db: &SqlitePool, updated_by: &ManageUserUser) {
-        ActivityBuilder::new(&format!(
-            "{updated_by} hat die Beitrittserklärung vom Beutzer gelöscht."
-        ))
-        .user(self)
-        .save(db)
-        .await;
-
         sqlx::query!(
             "UPDATE user SET membership_pdf = null where id = ?",
             self.id

src/model/user/mod.rs

@@ -102,13 +102,6 @@ impl UserWithDetails {
             user,
         }
     }
-
-    pub fn allowed_to_row(&self) -> bool {
-        self.roles.contains(&"Donau Linz".into())
-            || self.roles.contains(&"Förderndes Mitglied".into())
-            || self.roles.contains(&"scheckbuch".into())
-            || self.user.name == "Externe Steuerperson"
-    }
 }
 
 #[derive(Debug)]

src/tera/board/boathouse.rs

@@ -40,7 +40,7 @@ async fn index(
     let allowed_to_edit = AllowedToUpdateBoathouse::new(db, &admin.user)
         .await
         .is_some();
-    context.insert("allowed_to_edit", &allowed_to_edit);
+    context.insert("allowed_to_edit", &boathouse);
 
     context.insert(
         "loggedin_user",

src/tera/log.rs

@@ -47,44 +47,12 @@ impl<'r> FromRequest<'r> for KioskCookie {
 }
 
 #[get("/", rank = 2)]
-async fn index_loggedin(
+async fn index(
     db: &State<SqlitePool>,
     flash: Option<FlashMessage<'_>>,
     user: DonauLinzUser,
 ) -> Template {
-    let mut context = Context::new();
-
     let boats = Boat::for_user(db, &user).await;
-    context.insert("boats", &boats);
-
-    context.insert(
-        "loggedin_user",
-        &UserWithDetails::from_user(user.into_inner(), db).await,
-    );
-
-    index(db, flash, context).await
-}
-
-#[get("/")]
-async fn index_kiosk(
-    db: &State<SqlitePool>,
-    flash: Option<FlashMessage<'_>>,
-    _kiosk: KioskCookie,
-) -> Template {
-    let mut context = Context::new();
-
-    let boats = Boat::all(db).await;
-    context.insert("boats", &boats);
-
-    context.insert("show_kiosk_header", &true);
-
-    index(db, flash, context).await
-}
-
-async fn index(db: &SqlitePool, flash: Option<FlashMessage<'_>>, mut context: Context) -> Template {
-    if let Some(msg) = flash {
-        context.insert("flash", &msg.into_inner());
-    }
 
     let mut coxes: Vec<UserWithDetails> = futures::future::join_all(
         User::cox(db)
@@ -93,7 +61,9 @@ async fn index(db: &SqlitePool, flash: Option<FlashMessage<'_>>, mut context: Co
             .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
-    coxes.retain(|u| u.roles.contains(&"Donau Linz".into()));
+    coxes.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
 
     let mut users: Vec<UserWithDetails> = futures::future::join_all(
         User::all(db)
@@ -102,13 +72,23 @@ async fn index(db: &SqlitePool, flash: Option<FlashMessage<'_>>, mut context: Co
             .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
-    users.retain(|u| u.allowed_to_row());
+    users.retain(|u| {
+        u.roles.contains(&"Donau Linz".into())
+            || u.roles.contains(&"scheckbuch".into())
+            || u.user.name == "Externe Steuerperson"
+    });
 
     let logtypes = LogType::all(db).await;
     let distances = Distance::all(db).await;
 
     let on_water = Logbook::on_water(db).await;
 
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+
+    context.insert("boats", &boats);
     context.insert("planned_trips", &Trip::get_for_today(db).await);
     context.insert(
         "reservations",
@@ -117,10 +97,14 @@ async fn index(db: &SqlitePool, flash: Option<FlashMessage<'_>>, mut context: Co
     context.insert("coxes", &coxes);
     context.insert("users", &users);
     context.insert("logtypes", &logtypes);
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(user.into_inner(), db).await,
+    );
     context.insert("on_water", &on_water);
     context.insert("distances", &distances);
 
-    Template::render("kiosk", context.into_json())
+    Template::render("log", context.into_json())
 }
 
 #[get("/show", rank = 3)]
@@ -195,6 +179,63 @@ async fn new_kiosk(
     Redirect::to("/log")
 }
 
+#[get("/")]
+async fn kiosk(
+    db: &State<SqlitePool>,
+    flash: Option<FlashMessage<'_>>,
+    _kiosk: KioskCookie,
+) -> Template {
+    let boats = Boat::all(db).await;
+    let mut coxes: Vec<UserWithDetails> = futures::future::join_all(
+        User::cox(db)
+            .await
+            .into_iter()
+            .map(|user| UserWithDetails::from_user(user, db)),
+    )
+    .await;
+
+    coxes.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
+
+    let mut users: Vec<UserWithDetails> = futures::future::join_all(
+        User::all(db)
+            .await
+            .into_iter()
+            .map(|user| UserWithDetails::from_user(user, db)),
+    )
+    .await;
+
+    users.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
+
+    let logtypes = LogType::all(db).await;
+    let distances = Distance::all(db).await;
+
+    let on_water = Logbook::on_water(db).await;
+
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+
+    context.insert("planned_trips", &Trip::get_for_today(db).await);
+    context.insert("boats", &boats);
+    context.insert(
+        "reservations",
+        &BoatReservation::all_future_with_groups(db).await,
+    );
+    context.insert("coxes", &coxes);
+    context.insert("users", &users);
+    context.insert("logtypes", &logtypes);
+    context.insert("on_water", &on_water);
+    context.insert("distances", &distances);
+    context.insert("show_kiosk_header", &true);
+
+    Template::render("kiosk", context.into_json())
+}
+
 async fn create_logbook(
     db: &SqlitePool,
     data: Form<LogToAdd>,
@@ -527,11 +568,11 @@ async fn delete_kiosk(
 
 pub fn routes() -> Vec<Route> {
     routes![
-        index_loggedin,
+        index,
-        index_kiosk,
         create,
         create_kiosk,
         home,
+        kiosk,
         home_kiosk,
         new_kiosk,
         show,