src/model/logbook.rs

@@ -118,7 +118,7 @@ pub enum LogbookCreateError {
     BoatLocked,
     BoatNotFound,
     TooManyRowers(usize, usize),
-    RowerAlreadyOnWater(Box<User>),
+    RowerAlreadyOnWater(User),
     RowerCreateError(i64, String),
     ArrivalNotAfterDeparture,
     SteeringPersonNotInRowers,
@@ -386,7 +386,7 @@ ORDER BY departure DESC
             let user = User::find_by_id(db, *rower as i32).await.unwrap();
 
             if user.on_water(db).await {
-                return Err(LogbookCreateError::RowerAlreadyOnWater(Box::new(user)));
+                return Err(LogbookCreateError::RowerAlreadyOnWater(user));
             }
         }
 

src/model/notification.rs

@@ -152,27 +152,12 @@ ORDER BY read_at DESC, created_at DESC;
                     }
                 }
             }
-            // Cox read notification about cancelled event
-            let re = Regex::new(r"^remove_trip_by_planned_event:(\d+)$").unwrap();
-            if let Some(caps) = re.captures(action) {
-                if let Some(matched) = caps.get(1) {
-                    if let Ok(number) = matched.as_str().parse::<i32>() {
-                        let _ = sqlx::query!(
-                            "DELETE FROM trip WHERE cox_id = ? AND planned_event_id = ?",
-                            self.user_id,
-                            number
-                        )
-                        .execute(db)
-                        .await
-                        .unwrap();
-                    }
-                }
-            }
         }
     }
+
     pub(crate) async fn delete_by_action(db: &sqlx::Pool<Sqlite>, action: &str) {
         sqlx::query!(
-            "DELETE FROM notification WHERE action_after_reading=? and read_at is null",
+            "DELETE FROM notification WHERE action_after_reading=? and read_at = null",
             action
         )
         .execute(db)

src/model/planned_event.rs

@@ -8,7 +8,7 @@ use ics::{
 use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
-use super::{notification::Notification, tripdetails::TripDetails, triptype::TripType, user::User};
+use super::{tripdetails::TripDetails, triptype::TripType, user::User};
 
 #[derive(Serialize, Clone, FromRow, Debug, PartialEq)]
 pub struct PlannedEvent {
@@ -17,7 +17,7 @@ pub struct PlannedEvent {
     planned_amount_cox: i64,
     trip_details_id: i64,
     pub planned_starting_time: String,
-    pub(crate) max_people: i64,
+    max_people: i64,
     pub day: String,
     pub notes: Option<String>,
     pub allow_guests: bool,
@@ -98,15 +98,6 @@ FROM trip WHERE planned_event_id = ?
     }
 }
 
-pub struct EventUpdate<'a> {
-    pub name: &'a str,
-    pub planned_amount_cox: i32,
-    pub max_people: i32,
-    pub notes: Option<&'a str>,
-    pub always_show: bool,
-    pub is_locked: bool,
-}
-
 impl PlannedEvent {
     pub async fn find_by_id(db: &SqlitePool, id: i64) -> Option<Self> {
         sqlx::query_as!(
@@ -216,109 +207,50 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
     }
 
     //TODO: create unit test
-    pub async fn update(&self, db: &SqlitePool, update: &EventUpdate<'_>) {
+    pub async fn update(
+        &self,
+        db: &SqlitePool,
+        name: &str,
+        planned_amount_cox: i32,
+        max_people: i32,
+        notes: Option<&str>,
+        always_show: bool,
+        is_locked: bool,
+    ) {
         sqlx::query!(
             "UPDATE planned_event SET name = ?, planned_amount_cox = ? WHERE id = ?",
-            update.name,
+            name,
-            update.planned_amount_cox,
+            planned_amount_cox,
             self.id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
 
-        let tripdetails = self.trip_details(db).await;
-        let was_already_cancelled = tripdetails.max_people == 0;
-
         sqlx::query!(
             "UPDATE trip_details SET max_people = ?, notes = ?, always_show = ?, is_locked = ? WHERE id = ?",
-            update.max_people,
+            max_people,
-            update.notes,
+            notes,
-            update.always_show,
+            always_show,
-            update.is_locked,
+            is_locked,
             self.trip_details_id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
-
-        if max_people == 0 && !was_already_cancelled {
-            let coxes = Registration::all_cox(db, self.id).await;
-            for user in coxes {
-                if let Some(user) = User::find_by_name(db, &user.name).await {
-                    let notes = match notes {
-                        Some(n) if !n.is_empty() => n,
-                        _ => ".",
-                    };
-
-                    Notification::create(
-                        db,
-                        &user,
-                        &format!(
-                            "Die Ausfahrt {} am {} um {} wurde abgesagt{}",
-                            self.name, self.day, self.planned_starting_time, notes
-                        ),
-                        "Absage Ausfahrt",
-                        None,
-                        Some(&format!("remove_trip_by_planned_event:{}", self.id)),
-                    )
-                    .await;
-                }
-            }
-
-            let rower = Registration::all_rower(db, self.trip_details_id).await;
-            for user in rower {
-                if let Some(user) = User::find_by_name(db, &user.name).await {
-                    let notes = match notes {
-                        Some(n) if !n.is_empty() => n,
-                        _ => ".",
-                    };
-
-                    Notification::create(
-                        db,
-                        &user,
-                        &format!(
-                            "Die Ausfahrt {} am {} um {} wurde abgesagt{}",
-                            self.name, self.day, self.planned_starting_time, notes
-                        ),
-                        "Absage Ausfahrt",
-                        None,
-                        Some(&format!(
-                            "remove_user_trip_with_trip_details_id:{}",
-                            tripdetails.id
-                        )),
-                    )
-                    .await;
-                }
-            }
-        }
-        if max_people > 0 && was_already_cancelled {
-            Notification::delete_by_action(
-                db,
-                &format!("remove_user_trip_with_trip_details_id:{}", tripdetails.id),
-            )
-            .await;
-            Notification::delete_by_action(
-                db,
-                &format!("remove_trip_by_planned_event:{}", self.id),
-            )
-            .await;
-        }
     }
 
     pub async fn delete(&self, db: &SqlitePool) -> Result<(), String> {
-        if !Registration::all_rower(db, self.trip_details_id)
+        if Registration::all_rower(db, self.trip_details_id)
             .await
-            .is_empty()
+            .len()
+            > 0
         {
             return Err(
                 "Event kann nicht gelöscht werden, weil mind. 1 Ruderer angemeldet ist.".into(),
             );
         }
-        if !Registration::all_cox(db, self.trip_details_id)
+        if Registration::all_cox(db, self.trip_details_id).await.len() > 0 {
-            .await
-            .is_empty()
-        {
             return Err(
                 "Event kann nicht gelöscht werden, weil mind. 1 Steuerperson angemeldet ist."
                     .into(),
@@ -394,7 +326,7 @@ mod test {
         let pool = testdb!();
         let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
 
-        planned_event.delete(&pool).await.unwrap();
+        planned_event.delete(&pool).await;
 
         let res =
             PlannedEvent::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;

src/model/trip.rs

@@ -34,16 +34,6 @@ pub struct TripWithUserAndType {
     trip_type: Option<TripType>,
 }
 
-pub struct TripUpdate<'a> {
-    pub cox: &'a CoxUser,
-    pub trip: &'a Trip,
-    pub max_people: i32,
-    pub notes: Option<&'a str>,
-    pub trip_type: Option<i64>, //TODO: Move to `TripType`
-    pub always_show: bool,
-    pub is_locked: bool,
-}
-
 impl TripWithUserAndType {
     pub async fn from(db: &SqlitePool, trip: Trip) -> Self {
         let mut trip_type = None;
@@ -147,10 +137,6 @@ WHERE trip.id=?
             return Err(CoxHelpError::DetailsLocked);
         }
 
-        if planned_event.max_people == 0 {
-            return Err(CoxHelpError::CanceledEvent);
-        }
-
         match sqlx::query!(
             "INSERT INTO trip (cox_id, planned_event_id) VALUES(?, ?)",
             cox.id,
@@ -191,39 +177,40 @@ WHERE day=?
     /// Cox decides to update own trip.
     pub async fn update_own(
         db: &SqlitePool,
-        update: &TripUpdate<'_>,
+        cox: &CoxUser,
+        trip: &Trip,
+        max_people: i32,
+        notes: Option<&str>,
+        trip_type: Option<i64>, //TODO: Move to `TripType`
+        always_show: bool,
+        is_locked: bool,
     ) -> Result<(), TripUpdateError> {
-        if !update.trip.is_trip_from_user(update.cox.id) {
+        if !trip.is_trip_from_user(cox.id) {
             return Err(TripUpdateError::NotYourTrip);
         }
 
-        let Some(trip_details_id) = update.trip.trip_details_id else {
+        let Some(trip_details_id) = trip.trip_details_id else {
             return Err(TripUpdateError::TripDetailsDoesNotExist); //TODO: Remove?
         };
 
-        let tripdetails = TripDetails::find_by_id(db, trip_details_id).await.unwrap();
-        let was_already_cancelled = tripdetails.max_people == 0;
-
         sqlx::query!(
             "UPDATE trip_details SET max_people = ?, notes = ?, trip_type_id = ?, always_show = ?, is_locked = ? WHERE id = ?",
-            update.max_people,
+            max_people,
-            update.notes,
+            notes,
-            update.trip_type,
+            trip_type,
-            update.always_show,
+            always_show,
-            update.is_locked,
+            is_locked,
             trip_details_id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as trip_details can only be created with proper DB backing
 
-        if update.max_people == 0 && !was_already_cancelled {
+        if max_people == 0 {
-            let rowers = TripWithUserAndType::from(db, update.trip.clone())
+            let rowers = TripWithUserAndType::from(db, trip.clone()).await.rower;
-                .await
-                .rower;
             for user in rowers {
                 if let Some(user) = User::find_by_name(db, &user.name).await {
-                    let notes = match update.notes {
+                    let notes = match notes {
                         Some(n) if !n.is_empty() => n,
                         _ => ".",
                     };
@@ -233,10 +220,7 @@ WHERE day=?
                         &user,
                         &format!(
                             "Die Ausfahrt von {} am {} um {} wurde abgesagt{}",
-                            update.cox.user.name,
+                            cox.user.name, trip.day, trip.planned_starting_time, notes
-                            update.trip.day,
-                            update.trip.planned_starting_time,
-                            notes
                         ),
                         "Absage Ausfahrt",
                         None,
@@ -256,14 +240,6 @@ WHERE day=?
             .await;
         }
 
-        if update.max_people > 0 && was_already_cancelled {
-            Notification::delete_by_action(
-                db,
-                &format!("remove_user_trip_with_trip_details_id:{}", trip_details_id),
-            )
-            .await;
-        }
-
         let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap();
         trip_details.check_free_spaces(db).await;
 
@@ -348,7 +324,6 @@ pub enum CoxHelpError {
     AlreadyRegisteredAsRower,
     AlreadyRegisteredAsCox,
     DetailsLocked,
-    CanceledEvent,
 }
 
 #[derive(Debug, PartialEq)]
@@ -374,7 +349,7 @@ mod test {
     use crate::{
         model::{
             planned_event::PlannedEvent,
-            trip::{self, TripDeleteError},
+            trip::TripDeleteError,
             tripdetails::TripDetails,
             user::{CoxUser, User},
             usertrip::UserTrip,
@@ -459,17 +434,11 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        let update = trip::TripUpdate {
+        assert!(
-            cox: &cox,
+            Trip::update_own(&pool, &cox, &trip, 10, None, None, false, false)
-            trip: &trip,
+                .await
-            max_people: 10,
+                .is_ok()
-            notes: None,
+        );
-            trip_type: None,
-            always_show: false,
-            is_locked: false,
-        };
-
-        assert!(Trip::update_own(&pool, &update).await.is_ok());
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
         assert_eq!(trip.max_people, 10);
@@ -488,16 +457,11 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        let update = trip::TripUpdate {
+        assert!(
-            cox: &cox,
+            Trip::update_own(&pool, &cox, &trip, 10, None, Some(1), false, false)
-            trip: &trip,
+                .await
-            max_people: 10,
+                .is_ok()
-            notes: None,
+        );
-            trip_type: Some(1),
-            always_show: false,
-            is_locked: false,
-        };
-        assert!(Trip::update_own(&pool, &update).await.is_ok());
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
         assert_eq!(trip.max_people, 10);
@@ -517,16 +481,11 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        let update = trip::TripUpdate {
+        assert!(
-            cox: &cox,
+            Trip::update_own(&pool, &cox, &trip, 10, None, None, false, false)
-            trip: &trip,
+                .await
-            max_people: 10,
+                .is_err()
-            notes: None,
+        );
-            trip_type: None,
-            always_show: false,
-            is_locked: false,
-        };
-        assert!(Trip::update_own(&pool, &update).await.is_err());
         assert_eq!(trip.max_people, 1);
     }
 

src/model/user.rs

@@ -80,7 +80,7 @@ pub enum LoginError {
     NotACox,
     NotATech,
     GuestNotAllowed,
-    NoPasswordSet(Box<User>),
+    NoPasswordSet(User),
     DeserializationError,
 }
 
@@ -435,7 +435,7 @@ WHERE id like ?
             "
 SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id 
 FROM user 
-WHERE name=?
+WHERE name like ?
         ",
             name
         )
@@ -706,7 +706,7 @@ ORDER BY last_access DESC
             Err(LoginError::InvalidAuthenticationCombo)
         } else {
             info!("User {name} has no PW set");
-            Err(LoginError::NoPasswordSet(Box::new(user)))
+            Err(LoginError::NoPasswordSet(user))
         }
     }
 

src/model/waterlevel.rs

@@ -17,17 +17,6 @@ pub struct Waterlevel {
     pub tumittel: i64,
 }
 
-pub struct Create {
-    pub day: NaiveDate,
-    pub time: String,
-    pub max: i64,
-    pub min: i64,
-    pub mittel: i64,
-    pub tumax: i64,
-    pub tumin: i64,
-    pub tumittel: i64,
-}
-
 impl Waterlevel {
     pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
         sqlx::query_as!(Self, "SELECT * FROM waterlevel WHERE id like ?", id)
@@ -42,10 +31,20 @@ impl Waterlevel {
             .ok()
     }
 
-    pub async fn create(db: &mut Transaction<'_, Sqlite>, create: &Create) -> Result<(), String> {
+    pub async fn create(
+        db: &mut Transaction<'_, Sqlite>,
+        day: NaiveDate,
+        time: String,
+        max: i64,
+        min: i64,
+        mittel: i64,
+        tumax: i64,
+        tumin: i64,
+        tumittel: i64,
+    ) -> Result<(), String> {
         sqlx::query!(
             "INSERT INTO waterlevel(day, time, max, min, mittel, tumax, tumin, tumittel) VALUES (?,?,?,?,?,?,?,?)",
-            create.day, create.time, create.max, create.min, create.mittel, create.tumax, create.tumin, create.tumittel
+            day, time, max, min, mittel, tumax, tumin, tumittel
         )
         .execute(db.deref_mut())
         .await

src/scheduled/waterlevel.rs

@@ -2,7 +2,7 @@ use chrono::{DateTime, FixedOffset, NaiveDate, NaiveTime};
 use serde::{Deserialize, Serialize};
 use sqlx::SqlitePool;
 
-use crate::model::waterlevel::{self, Waterlevel};
+use crate::model::waterlevel::Waterlevel;
 
 pub async fn update(db: &SqlitePool) -> Result<(), String> {
     let mut tx = db.begin().await.unwrap();
@@ -29,18 +29,10 @@ pub async fn update(db: &SqlitePool) -> Result<(), String> {
         let time: NaiveTime = datetime.naive_utc().time();
         let time_str = time.format("%H:%M").to_string();
 
-        let create = waterlevel::Create {
+        Waterlevel::create(
-            day: date,
+            &mut tx, date, time_str, max, min, mittel, tumax, tumin, tumittel,
-            time: time_str,
+        )
-            max,
+        .await?
-            min,
-            mittel,
-            tumax,
-            tumin,
-            tumittel,
-        };
-
-        Waterlevel::create(&mut tx, &create).await?
     }
 
     // 3. Save in DB
@@ -85,23 +77,25 @@ fn fetch() -> Result<Station, String> {
 
             if let Ok(data) = forecast {
                 if data.len() == 1 {
-                    Ok(data[0].clone())
+                    return Ok(data[0].clone());
                 } else {
-                    Err(format!(
+                    return Err(format!(
                         "Expected 1 station (Linz); got {} while fetching from {url}. Maybe the hydro data format changed?",
                         data.len()
-                    ))
+                    ));
                 }
             } else {
-                Err(format!(
+                return Err(format!(
                     "Failed to parse the json received by {url}: {}",
                     forecast.err().unwrap()
-                ))
+                ));
             }
         }
-        Err(_) => Err(format!(
+        Err(_) => {
-            "Could not fetch {url}, do you have internet? Maybe their server is down?"
+            return Err(format!(
-        )),
+                "Could not fetch {url}, do you have internet? Maybe their server is down?"
+            ));
+        }
     }
 }
 

src/scheduled/weather.rs

@@ -103,16 +103,18 @@ fn fetch(api_key: &str) -> Result<Data, String> {
             let data: Result<Data, _> = response.into_json();
 
             if let Ok(data) = data {
-                Ok(data)
+                return Ok(data);
             } else {
-                Err(format!(
+                return Err(format!(
                     "Failed to parse the json received by {url}: {}",
                     data.err().unwrap()
-                ))
+                ));
             }
         }
-        Err(_) => Err(format!(
+        Err(_) => {
-            "Could not fetch {url}, do you have internet? Maybe their server is down?"
+            return Err(format!(
-        )),
+                "Could not fetch {url}, do you have internet? Maybe their server is down?"
+            ));
+        }
     }
 }

src/tera/admin/planned_event.rs

@@ -8,7 +8,7 @@ use serde::Serialize;
 use sqlx::SqlitePool;
 
 use crate::model::{
-    planned_event::{self, PlannedEvent},
+    planned_event::PlannedEvent,
     tripdetails::{TripDetails, TripDetailsToAdd},
     user::PlannedEventUser,
 };
@@ -57,17 +57,19 @@ async fn update(
     data: Form<UpdatePlannedEventForm<'_>>,
     _admin: PlannedEventUser,
 ) -> Flash<Redirect> {
-    let update = planned_event::EventUpdate {
-        name: data.name,
-        planned_amount_cox: data.planned_amount_cox,
-        max_people: data.max_people,
-        notes: data.notes,
-        always_show: data.always_show,
-        is_locked: data.is_locked,
-    };
     match PlannedEvent::find_by_id(db, data.id).await {
         Some(planned_event) => {
-            planned_event.update(db, &update).await;
+            planned_event
+                .update(
+                    db,
+                    data.name,
+                    data.planned_amount_cox,
+                    data.max_people,
+                    data.notes,
+                    data.always_show,
+                    data.is_locked,
+                )
+                .await;
             Flash::success(Redirect::to("/planned"), "Event erfolgreich bearbeitet")
         }
         None => Flash::error(Redirect::to("/planned"), "Planned event id not found"),

src/tera/auth.rs

@@ -39,6 +39,7 @@ struct LoginForm<'r> {
     password: &'r str,
 }
 
+#[derive(Debug)]
 pub struct UserAgent(String);
 
 #[rocket::async_trait]
@@ -82,8 +83,8 @@ async fn login(
     Log::create(
         db,
         format!(
-            "Succ login of {} with this useragent: {}",
+            "Succ login of {} with this useragent: {:?}",
-            login.name, agent.0
+            login.name, agent
         ),
     )
     .await;

src/tera/cox.rs

@@ -9,7 +9,7 @@ use sqlx::SqlitePool;
 use crate::model::{
     log::Log,
     planned_event::PlannedEvent,
-    trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
+    trip::{CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
     tripdetails::{TripDetails, TripDetailsToAdd},
     user::CoxUser,
 };
@@ -54,16 +54,18 @@ async fn update(
     cox: CoxUser,
 ) -> Flash<Redirect> {
     if let Some(trip) = Trip::find_by_id(db, trip_id).await {
-        let update = trip::TripUpdate {
+        match Trip::update_own(
-            cox: &cox,
+            db,
-            trip: &trip,
+            &cox,
-            max_people: data.max_people,
+            &trip,
-            notes: data.notes,
+            data.max_people,
-            trip_type: data.trip_type,
+            data.notes,
-            always_show: data.always_show,
+            data.trip_type,
-            is_locked: data.is_locked,
+            data.always_show,
-        };
+            data.is_locked,
-        match Trip::update_own(db, &update).await {
+        )
+        .await
+        {
             Ok(_) => Flash::success(
                 Redirect::to("/planned"),
                 "Ausfahrt erfolgreich aktualisiert.",
@@ -95,9 +97,6 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
                 .await;
                 Flash::success(Redirect::to("/planned"), "Danke für's helfen!")
             }
-            Err(CoxHelpError::CanceledEvent) => {
-                Flash::error(Redirect::to("/planned"), "Die Ausfahrt wurde leider abgesagt...")
-            }
             Err(CoxHelpError::AlreadyRegisteredAsCox) => {
                 Flash::error(Redirect::to("/planned"), "Du hilfst bereits aus!")
             }

src/tera/log.rs

@@ -27,7 +27,7 @@ use crate::model::{
     user::{AdminUser, DonauLinzUser, User, UserWithDetails},
 };
 
-pub struct KioskCookie(());
+pub struct KioskCookie(String);
 
 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for KioskCookie {
@@ -35,7 +35,7 @@ impl<'r> FromRequest<'r> for KioskCookie {
 
     async fn from_request(request: &'r Request<'_>) -> request::Outcome<KioskCookie, Self::Error> {
         match request.cookies().get_private("kiosk") {
-            Some(_) => request::Outcome::Success(KioskCookie(())),
+            Some(cookie) => request::Outcome::Success(KioskCookie(cookie.value().to_string())),
             None => request::Outcome::Forward(rocket::http::Status::SeeOther),
         }
     }

templates/admin/notification.html.tera

@@ -8,9 +8,7 @@
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
                 <h2 class="h2">Gruppe</h2>
-                <form action="/admin/notification/group"
+                <form action="/admin/notification/group" method="post" class="grid gap-3 p-3">
-                      method="post"
-                      class="grid gap-3 p-3">
                     {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
                     {{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
                     {{ macros::input(label="Nachricht", name="message", type="text", required=true) }}
@@ -20,9 +18,7 @@
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
                 <h2 class="h2">Person</h2>
-                <form action="/admin/notification/user"
+                <form action="/admin/notification/user" method="post" class="grid gap-3 p-3">
-                      method="post"
-                      class="grid gap-3 p-3">
                     {{ macros::select(label="Person", data=users, name="user_id") }}
                     {{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
                     {{ macros::input(label="Nachricht", name="message", type="text", required=true) }}

templates/impressum.html.tera

@@ -46,42 +46,20 @@
                     <div class="p-3">
                         Folgende personenbezogenen haben wir von dir gespeichert:
                         <ul>
-                            <li>
+                            <li><strong>Name:</strong> {{ loggedin_user.name }}</li>
-                                <strong>Name:</strong> {{ loggedin_user.name }}
+                            <li><strong>Passwort:</strong> (verschlüsselt als argon Hash)</li>
-                            </li>
+                            <li><strong>Letzter Zugriff:</strong> {{ loggedin_user.last_access }}</li>
-                            <li>
+                            <li><strong>Mitglied seit:</strong> {{ loggedin_user.member_since_date }}</li>
-                                <strong>Passwort:</strong> (verschlüsselt als argon Hash)
+                            <li><strong>Geburtsdatum:</strong> {{ loggedin_user.birthdate }}</li>
-                            </li>
+                            <li><strong>Mail:</strong> {{ loggedin_user.mail }}</li>
-                            <li>
+                            {% if loggedin_user.nickname %}<li><strong>Spitzname:</strong> {{ loggedin_user.nickname }}</li>{% endif %}
-                                <strong>Letzter Zugriff:</strong> {{ loggedin_user.last_access }}
+                            <li><strong>Telefonnummer:</strong> {{ loggedin_user.phone }}</li>
-                            </li>
+                            <li><strong>Adresse:</strong> {{ loggedin_user.address }}</li>
-                            <li>
-                                <strong>Mitglied seit:</strong> {{ loggedin_user.member_since_date }}
-                            </li>
-                            <li>
-                                <strong>Geburtsdatum:</strong> {{ loggedin_user.birthdate }}
-                            </li>
-                            <li>
-                                <strong>Mail:</strong> {{ loggedin_user.mail }}
-                            </li>
-                            {% if loggedin_user.nickname %}
-                                <li>
-                                    <strong>Spitzname:</strong> {{ loggedin_user.nickname }}
-                                </li>
-                            {% endif %}
-                            <li>
-                                <strong>Telefonnummer:</strong> {{ loggedin_user.phone }}
-                            </li>
-                            <li>
-                                <strong>Adresse:</strong> {{ loggedin_user.address }}
-                            </li>
                             <li>(Beitrittserklärung)</li>
                             {% if loggedin_user.family_id %}
                                 <li>Verbindung zu Familienmitglied (gespeichert um Familientarif anstatt Vollmitglied zu haben)</li>
                             {% endif %}
-                            <li>
+                            <li><strong>Rollen:</strong> {{ loggedin_user.roles }} (werden für verschiedene Funktionen im Ruderassistenten verwendet)</li>
-                                <strong>Rollen:</strong> {{ loggedin_user.roles }} (werden für verschiedene Funktionen im Ruderassistenten verwendet)
-                            </li>
                             <li>Anmeldungen zu Ausfahrten</li>
                             <li>Anmeldungen zu Events (zB Fetzenfahrt, Anrudern, USI-Rudern, ...)</li>
                             <li>Logbucheinträge</li>

templates/includes/footer.html.tera

@@ -1,39 +1,38 @@
 <footer class="bg-primary-950 dark:bg-primary-900 text-white w-full flex justify-center p-3">
     <div class="max-w-screen-xl">
         <div class="w-full flex justify-between items-center">
-            <div>
+        <div>
-                <span class="text-[#ff0000]">&hearts;</span>
+            <span class="text-[#ff0000]">&hearts;</span>
-                Erstellt vom ASKÖ Ruderverein Donau Linz <a class="underline"
+            Erstellt vom ASKÖ Ruderverein Donau Linz <a class="underline" onclick="alert('Wir suchen kreative und motivierte Köpfe, die diesen Ruderassistenten mitgestalten möchten. Das Backend ist in Rust (Rocket), das Frontend in TypeScript und Teraform, wobei wir mit dem Gedanken spielen, zu Svelte(Kit) zu wechseln.\n\nWenn du Lust hast, deine Skills in ein Projekt zu stecken, das Wellen schlagen wird, dann komm an Bord! Wir sind offen für frische Ideen, haben jedoch auch selber noch genügend; langweilig wird uns bestimmt nicht.\n\nWirf den Anker bei uns ausi und melde dich bei Marie oder Philipp oder it@rudernlinz.at – für eine Zukunft ohne optische Kenterung in Form von hässlichen Alerts ;)');">... und dir?</a>
-    onclick="alert('Wir suchen kreative und motivierte Köpfe, die diesen Ruderassistenten mitgestalten möchten. Das Backend ist in Rust (Rocket), das Frontend in TypeScript und Teraform, wobei wir mit dem Gedanken spielen, zu Svelte(Kit) zu wechseln.\n\nWenn du Lust hast, deine Skills in ein Projekt zu stecken, das Wellen schlagen wird, dann komm an Bord! Wir sind offen für frische Ideen, haben jedoch auch selber noch genügend; langweilig wird uns bestimmt nicht.\n\nWirf den Anker bei uns ausi und melde dich bei Marie oder Philipp oder it@rudernlinz.at – für eine Zukunft ohne optische Kenterung in Form von hässlichen Alerts ;)');">... und dir?</a>
+        </div>
-            </div>
+        <div>
-            <div>
+            <button id="theme-toggle-js"
-                <button id="theme-toggle-js"
+                    type="button"
-                        type="button"
+                    data-theme="light"
-                        data-theme="light"
+                    class="btn btn-primary">
-                        class="btn btn-primary">
+                <span class="hidden dark:inline">
-                    <span class="hidden dark:inline">
+                    <svg xmlns="http://www.w3.org/2000/svg"
-                        <svg xmlns="http://www.w3.org/2000/svg"
+                         width="16"
-                             width="16"
+                         height="16"
-                             height="16"
+                         fill="currentColor"
-                             fill="currentColor"
+                         viewBox="0 0 16 16">
-                             viewBox="0 0 16 16">
+                        <path d="M8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0 1a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
-                            <path d="M8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0 1a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
+                    </svg>
-                        </svg>
+                </span>
-                    </span>
+                <span class="inline dark:hidden">
-                    <span class="inline dark:hidden">
+                    <svg xmlns="http://www.w3.org/2000/svg"
-                        <svg xmlns="http://www.w3.org/2000/svg"
+                         width="16"
-                             width="16"
+                         height="16"
-                             height="16"
+                         fill="currentColor"
-                             fill="currentColor"
+                         viewBox="0 0 16 16">
-                             viewBox="0 0 16 16">
+                        <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278zM4.858 1.311A7.269 7.269 0 0 0 1.025 7.71c0 4.02 3.279 7.276 7.319 7.276a7.316 7.316 0 0 0 5.205-2.162c-.337.042-.68.063-1.029.063-4.61 0-8.343-3.714-8.343-8.29 0-1.167.242-2.278.681-3.286z" />
-                            <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278zM4.858 1.311A7.269 7.269 0 0 0 1.025 7.71c0 4.02 3.279 7.276 7.319 7.276a7.316 7.316 0 0 0 5.205-2.162c-.337.042-.68.063-1.029.063-4.61 0-8.343-3.714-8.343-8.29 0-1.167.242-2.278.681-3.286z" />
+                    </svg>
-                        </svg>
+                </span>
-                    </span>
+            </button>
-                </button>
+        </div>
-            </div>
         </div>
         <div class="mt-3">
-            <a class="underline" href="/impressum">Impressum</a>
+                    <a class="underline" href="/impressum">Impressum</a>
         </div>
     </div>
 </footer>

templates/planned.html.tera

@@ -99,27 +99,15 @@
                                          style="order: {{ planned_event.planned_starting_time | replace(from=":", to="") }}">
                                         <div class="flex justify-between items-center">
                                             <div class="mr-1">
-                                                {% if planned_event.max_people == 0 %}
+                                                <strong class="text-primary-900 dark:text-white">
-                                                    <strong class="text-[#f43f5e]">&#9888; Absage
+                                                    {{ planned_event.planned_starting_time }}
-                                                        {{ planned_event.planned_starting_time }}
+                                                    Uhr
-                                                        Uhr
+                                                </strong>
-                                                    </strong>
+                                                <small class="text-gray-600 dark:text-gray-100">({{ planned_event.name }}
-                                                    <small class="text-[#f43f5e]">({{ planned_event.name }}
+                                                    {%- if planned_event.trip_type %}
-                                                        {%- if planned_event.trip_type %}
+                                                        - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
-                                                            - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
+                                                    {%- endif -%}
-                                                        {%- endif -%}
+                                                )</small>
-                                                    )</small>
-                                                {% else %}
-                                                    <strong class="text-primary-900 dark:text-white">
-                                                        {{ planned_event.planned_starting_time }}
-                                                        Uhr
-                                                    </strong>
-                                                    <small class="text-gray-600 dark:text-gray-100">({{ planned_event.name }}
-                                                        {%- if planned_event.trip_type %}
-                                                            - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
-                                                        {%- endif -%}
-                                                    )</small>
-                                                {% endif %}
                                                 <br />
                                                 <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }})
                                                     {% if planned_event.trip_type %}<small class='block'>{{ planned_event.trip_type.desc }}</small>{% endif %}
@@ -177,22 +165,16 @@
                                             <div id="event{{ planned_event.trip_details_id }}">
                                                 {# --- START List Coxes --- #}
                                                 {% if planned_event.planned_amount_cox > 0 %}
-                                                    {% if planned_event.max_people == 0 %}
+                                                    {% if amount_cox_missing > 0 %}
-                                                        {{ macros::box(participants=planned_event.cox, empty_seats="", header='Absage', bg='[#f43f5e]') }}
+                                                        {{ macros::box(participants=planned_event.cox, empty_seats=planned_event.planned_amount_cox - amount_cur_cox, header='Noch benötigte Steuerleute:', text='Keine Steuerleute angemeldet') }}
                                                     {% else %}
-                                                        {% if amount_cox_missing > 0 %}
+                                                        {{ macros::box(participants=planned_event.cox, empty_seats="", header='Genügend Steuerleute haben sich angemeldet :-)', text='Keine Steuerleute angemeldet') }}
-                                                            {{ macros::box(participants=planned_event.cox, empty_seats=planned_event.planned_amount_cox - amount_cur_cox, header='Noch benötigte Steuerleute:', text='Keine Steuerleute angemeldet') }}
-                                                        {% else %}
-                                                            {{ macros::box(participants=planned_event.cox, empty_seats="", header='Genügend Steuerleute haben sich angemeldet :-)', text='Keine Steuerleute angemeldet') }}
-                                                        {% endif %}
                                                     {% endif %}
                                                 {% endif %}
                                                 {# --- END List Coxes --- #}
                                                 {# --- START List Rowers --- #}
-                                                {% set amount_cur_rower = planned_event.rower | length %}
+                                                {% if planned_event.max_people > 0 %}
-                                                {% if planned_event.max_people == 0 %}
+                                                    {% set amount_cur_rower = planned_event.rower | length %}
-                                                    {{ macros::box(header='Absage', bg='[#f43f5e]', participants=planned_event.rower, trip_details_id=planned_event.trip_details_id, allow_removing="planned_event" in loggedin_user.roles) }}
-                                                {% else %}
                                                     {{ macros::box(participants=planned_event.rower, empty_seats=planned_event.max_people - amount_cur_rower, bg='primary-100', color='black', trip_details_id=planned_event.trip_details_id, allow_removing="planned_event" in loggedin_user.roles) }}
                                                 {% endif %}
                                                 {# --- END List Rowers --- #}
@@ -226,35 +208,13 @@
                                                 </div>
                                                 {# --- END Edit Form --- #}
                                                 {# --- START Delete Btn --- #}
-                                                {% if planned_event.rower | length == 0 and amount_cur_cox == 0 %}
+                                                <div class="text-right">
-                                                    <div class="text-right mt-6">
+                                                    <a href="/admin/planned-event/{{ planned_event.id }}/delete"
-                                                        <a href="/admin/planned-event/{{ planned_event.id }}/delete"
+                                                       class="inline-block btn btn-alert">
-                                                           class="inline-block btn btn-alert">
+                                                        {% include "includes/delete-icon" %}
-                                                            {% include "includes/delete-icon" %}
+                                                        Termin löschen
-                                                            Termin löschen
+                                                    </a>
-                                                        </a>
+                                                </div>
-                                                    </div>
-                                                {% else %}
-                                                    {% if planned_event.max_people == 0 %}
-                                                        Wenn du deine Absage absagen (:^)) willst, einfach entsprechende Anzahl an Ruderer oben eintragen.
-                                                    {% else %}
-                                                        <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
-                                                            <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Event absagen</h3>
-                                                            <form action="/admin/planned-event" method="post" class="grid">
-                                                                <input type="hidden" name="_method" value="put" />
-                                                                <input type="hidden" name="id" value="{{ planned_event.id }}" />
-                                                                {{ macros::input(label='', name='max_people', type='hidden', value=0) }}
-                                                                {{ macros::input(label='', name='name', type='hidden', value=planned_event.name) }}
-                                                                {{ macros::input(label='', name='max_people', type='hidden', value=planned_event.max_people) }}
-                                                                {{ macros::input(label='', name='planned_amount_cox', type='hidden', value=planned_event.planned_amount_cox) }}
-                                                                {{ macros::input(label='', name='notes', type='hidden', value=planned_event.notes) }}
-                                                                {{ macros::input(label='', name='always_show', type='hidden', value=planned_event.always_show) }}
-                                                                {{ macros::input(label='', name='is_locked', type='hidden', value=planned_event.is_locked) }}
-                                                                <input value="Ausfahrt absagen" class="btn btn-alert" type="submit" />
-                                                            </form>
-                                                        </div>
-                                                    {% endif %}
-                                                {% endif %}
                                             {% endif %}
                                             {# --- END Delete Btn --- #}
                                         </div>