board members can delete trips, proper notification + succ message is created

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;
 
@@ -108,26 +108,50 @@ async fn index(
 }
 
 #[get("/show", rank = 3)]
-async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
+async fn show(
+    db: &State<SqlitePool>,
+    flash: Option<FlashMessage<'_>>,
+    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, boats, users, logtypes, loggedin_user: &UserWithDetails::from_user(user.into_inner(), db).await),
-    )
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+    context.insert("logs", &logs);
+    context.insert("boats", &boats);
+    context.insert("users", &users);
+    context.insert("logtypes", &logtypes);
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(user.into_inner(), db).await,
+    );
+    Template::render("log.completed", context.into_json())
 }
 
 #[get("/show?<year>", rank = 2)]
-async fn show_for_year(db: &State<SqlitePool>, user: VorstandUser, year: i32) -> Template {
+async fn show_for_year(
+    db: &State<SqlitePool>,
+    flash: Option<FlashMessage<'_>>,
+    user: VorstandUser,
+    year: i32,
+) -> Template {
     let logs = Logbook::completed_in_year(db, year).await;
 
-    Template::render(
-        "log.completed",
-        context!(logs, loggedin_user: &UserWithDetails::from_user(user.user, db).await),
-    )
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+    context.insert("logs", &logs);
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(user.into_inner(), db).await,
+    );
+    Template::render("log.completed", context.into_json())
 }
 
 #[get("/show")]
@@ -513,10 +537,7 @@ async fn delete(db: &State<SqlitePool>, logbook_id: i64, user: DonauLinzUser) ->
         )
         .await;
         match logbook.delete(db, &user).await {
-            Ok(_) => Flash::success(
-                Redirect::to(redirect),
-                format!("Eintrag {} von {} gelöscht!", logbook_id, user.name),
-            ),
+            Ok(_) => Flash::success(Redirect::to(redirect), "Erfolgreich gelöscht"),
             Err(LogbookDeleteError::NotYourEntry) => Flash::error(
                 Redirect::to(redirect),
                 "Du hast nicht die Berechtigung, den Eintrag zu löschen!",
@@ -585,7 +606,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]