many updates :-(

src/model/mod.rs

@@ -1,8 +1,10 @@
-use chrono::NaiveDate;
+use chrono::{Local, NaiveDate};
 use serde::Serialize;
 use sqlx::SqlitePool;
 use waterlevel::WaterlevelDay;
 
+use crate::AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD;
+
 use self::{
     event::{Event, EventWithUserAndTriptype},
     trip::{Trip, TripWithUserAndType},
@@ -42,18 +44,23 @@ pub struct Day {
     events: Vec<EventWithUserAndTriptype>,
     trips: Vec<TripWithUserAndType>,
     is_pinned: bool,
+    regular_sees_this_day: bool,
     max_waterlevel: Option<WaterlevelDay>,
     weather: Option<Weather>,
 }
 
 impl Day {
     pub async fn new(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {
+        let today = Local::now().date_naive();
+        let day_diff = (day - today).num_days() + 1;
+        let regular_sees_this_day = day_diff <= AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD;
         if is_pinned {
             Self {
                 day,
                 events: Event::get_pinned_for_day(db, day).await,
                 trips: Trip::get_pinned_for_day(db, day).await,
                 is_pinned,
+                regular_sees_this_day,
                 max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
                 weather: Weather::find_by_day(db, day).await,
             }
@@ -63,6 +70,7 @@ impl Day {
                 events: Event::get_for_day(db, day).await,
                 trips: Trip::get_for_day(db, day).await,
                 is_pinned,
+                regular_sees_this_day,
                 max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
                 weather: Weather::find_by_day(db, day).await,
             }

src/model/trip.rs

@@ -4,6 +4,7 @@ use sqlx::SqlitePool;
 
 use super::{
     event::{Event, Registration},
+    log::Log,
     notification::Notification,
     tripdetails::TripDetails,
     triptype::TripType,
@@ -329,18 +330,16 @@ WHERE day=?
             return Err(TripDeleteError::SomebodyAlreadyRegistered);
         }
 
-        if !self.is_trip_from_user(user.id) {
+        if !self.is_trip_from_user(user.id) && !user.has_role(db, "admin").await {
             return Err(TripDeleteError::NotYourTrip);
         }
 
-        sqlx::query!(
-            "DELETE FROM trip WHERE cox_id = ? AND id = ?",
-            user.id,
-            self.id
-        )
-        .execute(db)
-        .await
-        .unwrap(); //TODO: fixme
+        Log::create(db, format!("{} deleted trip: {:#?}", user.user.name, self)).await;
+
+        sqlx::query!("DELETE FROM trip WHERE id = ?", self.id)
+            .execute(db)
+            .await
+            .unwrap(); //TODO: fixme
 
         Ok(())
     }

src/model/user.rs

@@ -18,18 +18,11 @@ use super::{
     family::Family, log::Log, mail::Mail, notification::Notification, role::Role, stat::Stat,
     tripdetails::TripDetails, Day,
 };
-use crate::tera::admin::user::UserEditForm;
-
-const RENNRUDERBEITRAG: i32 = 11000;
-const BOAT_STORAGE: i32 = 4500;
-const FAMILY_TWO: i32 = 30000;
-const FAMILY_THREE_OR_MORE: i32 = 35000;
-const STUDENT_OR_PUPIL: i32 = 8000;
-const REGULAR: i32 = 22000;
-const UNTERSTUETZEND: i32 = 2500;
-const FOERDERND: i32 = 8500;
-pub const SCHECKBUCH: i32 = 3000;
-const EINSCHREIBGEBUEHR: i32 = 3000;
+use crate::{
+    tera::admin::user::UserEditForm, AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD, BOAT_STORAGE,
+    EINSCHREIBGEBUEHR, FAMILY_THREE_OR_MORE, FAMILY_TWO, FOERDERND, REGULAR, RENNRUDERBEITRAG,
+    SCHECKBUCH, STUDENT_OR_PUPIL, UNTERSTUETZEND,
+};
 
 #[derive(FromRow, Serialize, Deserialize, Clone, Debug, Eq, Hash, PartialEq)]
 pub struct User {
@@ -910,7 +903,7 @@ ORDER BY last_access DESC
                 days_left_in_year
             }
         } else {
-            10
+            AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD
         }
     }