Merge pull request 'fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd1)…' (#101) from fix-cox-join into main

Reviewed-on: #101

src/model/mod.rs

@@ -22,7 +22,7 @@ pub mod triptype;
 pub mod user;
 pub mod usertrip;
 
-#[derive(Serialize)]
+#[derive(Serialize, Debug)]
 pub struct Day {
     day: NaiveDate,
     planned_events: Vec<PlannedEventWithUserAndTriptype>,

src/model/planned_event.rs

@@ -144,7 +144,7 @@ WHERE day=?",
 
         let mut ret = Vec::new();
         for event in events {
-            let cox = Registration::all_cox(db, event.trip_details_id).await;
+            let cox = Registration::all_cox(db, event.id).await;
             let mut trip_type = None;
             if let Some(trip_type_id) = event.trip_type_id {
                 trip_type = TripType::find_by_id(db, trip_type_id).await;

src/model/trip.rs

@@ -25,7 +25,7 @@ pub struct Trip {
     is_locked: bool,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Debug)]
 pub struct TripWithUserAndType {
     #[serde(flatten)]
     pub trip: Trip,

src/tera/mod.rs

@@ -57,7 +57,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
-    println!("{user:#?}");
+
     context.insert("loggedin_user", &user);
     context.insert("days", &days);
     Template::render("index", context.into_json())