src/model/event.rs

@@ -343,6 +343,10 @@ WHERE trip_details.id=?
         Ok(())
     }
 
+    pub fn is_cancelled(&self) -> bool {
+        self.max_people == 0
+    }
+
     pub async fn get_ics_feed(db: &SqlitePool) -> String {
         let mut calendar = ICalendar::new("2.0", "ics-rs");
 
@@ -355,7 +359,20 @@ WHERE trip_details.id=?
                 event.day.replace('-', ""),
                 event.planned_starting_time.replace(':', "")
             )));
-            vevent.push(Summary::new(event.name));
+            let mut name = String::new();
+            if event.is_cancelled() {
+                name.push_str("ABGESAGT :-( ");
+            }
+            name.push_str(&format!("{} ", event.name));
+
+            let tripdetails = event.trip_details(db).await;
+            if let Some(triptype) = tripdetails.triptype(db).await {
+                name.push_str(&format!("• {} ", triptype.name))
+            }
+            if let Some(notes) = tripdetails.notes {
+                name.push_str(&format!("({notes}) "))
+            }
+            vevent.push(Summary::new(name));
             calendar.add_event(vevent);
         }
         let mut buf = Vec::new();

src/model/tripdetails.rs

@@ -7,6 +7,7 @@ use sqlx::{FromRow, SqlitePool};
 use super::{
     notification::Notification,
     trip::{Trip, TripWithUserAndType},
+    triptype::TripType,
 };
 
 #[derive(FromRow, Debug, Serialize, Deserialize)]
@@ -51,6 +52,13 @@ WHERE id like ?
         .ok()
     }
 
+    pub async fn triptype(&self, db: &SqlitePool) -> Option<TripType> {
+        match self.trip_type_id {
+            None => None,
+            Some(id) => TripType::find_by_id(db, id).await,
+        }
+    }
+
     pub async fn find_by_startingdatetime(
         db: &SqlitePool,
         day: String,

src/model/triptype.rs

@@ -4,7 +4,7 @@ use sqlx::{FromRow, SqlitePool};
 #[derive(FromRow, Debug, Serialize, Deserialize, Clone)]
 pub struct TripType {
     pub id: i64,
-    name: String,
+    pub name: String,
     desc: String,
     question: String,
     icon: String,