add planned mod

src/tera/admin/event.rs

@@ -9,8 +9,10 @@ use serde::Serialize;
 use sqlx::SqlitePool;
 
 use crate::model::{
-    event::{self, Event},
-    tripdetails::{TripDetails, TripDetailsToAdd},
+    planned::{
+        event::{self, Event},
+        tripdetails::{TripDetails, TripDetailsToAdd},
+    },
     user::EventUser,
 };
 

src/tera/cox.rs

@@ -1,16 +1,19 @@
 use rocket::{
+    FromForm, Route, State,
     form::Form,
     get, post,
     response::{Flash, Redirect},
-    routes, FromForm, Route, State,
+    routes,
 };
 use sqlx::SqlitePool;
 
 use crate::model::{
-    event::Event,
     log::Log,
-    trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
-    tripdetails::{TripDetails, TripDetailsToAdd},
+    planned::{
+        event::Event,
+        trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
+        tripdetails::{TripDetails, TripDetailsToAdd},
+    },
     user::{AllowedToUpdateTripToAlwaysBeShownUser, ErgoUser, SteeringUser, User},
 };
 
@@ -22,7 +25,7 @@ async fn create_ergo(
 ) -> Flash<Redirect> {
     let trip_details_id = TripDetails::create(db, data.into_inner()).await;
     let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap(); //Okay, bc just
-                                                                                    //created
+    //created
     Trip::new_own_ergo(db, &cox, trip_details).await; //TODO: fix
 
     Flash::success(Redirect::to("/planned"), "Ausfahrt erfolgreich erstellt.")
@@ -37,7 +40,7 @@ async fn create(
 ) -> Flash<Redirect> {
     let trip_details_id = TripDetails::create(db, data.into_inner()).await;
     let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap(); //Okay, bc just
-                                                                                    //created
+    //created
     Trip::new_own(db, &cox, trip_details).await; //TODO: fix
 
     Flash::success(Redirect::to("/planned"), "Ausfahrt erfolgreich erstellt.")
@@ -216,7 +219,7 @@ mod test {
     };
     use sqlx::SqlitePool;
 
-    use crate::{model::trip::Trip, testdb};
+    use crate::{model::planned::trip::Trip, testdb};
 
     #[sqlx::test]
     fn test_trip_create() {

src/tera/log.rs

@@ -1,6 +1,7 @@
 use std::net::IpAddr;
 
 use rocket::{
+    Request, Route, State,
     form::Form,
     get,
     http::{Cookie, CookieJar},
@@ -9,9 +10,8 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
-    Request, Route, State,
 };
-use rocket_dyn_templates::{context, Template};
+use rocket_dyn_templates::{Template, context};
 use sqlx::SqlitePool;
 use tera::Context;
 
@@ -26,7 +26,7 @@ use crate::{
             LogbookCreateError, LogbookDeleteError, LogbookUpdateError,
         },
         logtype::LogType,
-        trip::Trip,
+        planned::trip::Trip,
         user::{DonauLinzUser, User, UserWithDetails, VorstandUser},
     },
     tera::Config,
@@ -606,7 +606,7 @@ mod test {
     use sqlx::SqlitePool;
 
     use crate::model::logbook::Logbook;
-    use crate::tera::{log::Boat, User};
+    use crate::tera::{User, log::Boat};
     use crate::testdb;
 
     #[sqlx::test]

src/tera/misc.rs

@@ -1,7 +1,7 @@
 use rocket::{Route, State, get, http::ContentType, routes};
 use sqlx::SqlitePool;
 
-use crate::model::{event::Event, personal::cal::get_personal_cal, user::User};
+use crate::model::{personal::cal::get_personal_cal, planned::event::Event, user::User};
 
 #[get("/cal")]
 async fn cal(db: &State<SqlitePool>) -> (ContentType, String) {

src/tera/planned.rs

@@ -12,10 +12,12 @@ use crate::{
     AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD,
     model::{
         log::Log,
-        tripdetails::TripDetails,
-        triptype::TripType,
+        planned::{
+            tripdetails::TripDetails,
+            triptype::TripType,
+            usertrip::{UserTrip, UserTripDeleteError, UserTripError},
+        },
         user::{AllowedForPlannedTripsUser, User, UserWithDetails},
-        usertrip::{UserTrip, UserTripDeleteError, UserTripError},
     },
 };