Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

cleaner cal #578

Merged
philipp merged 3 commits from cleaner-cal into main 2024-06-06 17:22:16 +02:00
Conversation 0 Commits 3 Files Changed 1 +9 -7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fca19745f8 - Show all commits

16
src/model/event.rs
View File

@ -360,21 +360,23 @@ WHERE trip_details.id=?
event.day.replace('-', ""), event.day.replace('-', ""),
event.planned_starting_time.replace(':', "") event.planned_starting_time.replace(':', "")
))); )));
let tripdetails = event.trip_details(db).await;
let mut name = String::new(); let mut name = String::new();
if event.is_cancelled() { if event.is_cancelled() {
name.push_str("ABGESAGT! :-( "); name.push_str("ABGESAGT");
if let Some(notes) = &tripdetails.notes {
if !notes.is_empty() {
name.push_str(&format!(" (Grund: {notes})"))
}
}
name.push_str("! :-( ");
} }
name.push_str(&format!("{} ", event.name)); name.push_str(&format!("{} ", event.name));
let tripdetails = event.trip_details(db).await;
if let Some(triptype) = tripdetails.triptype(db).await { if let Some(triptype) = tripdetails.triptype(db).await {
name.push_str(&format!("• {} ", triptype.name)) name.push_str(&format!("• {} ", triptype.name))
} }
if let Some(notes) = tripdetails.notes {
if !notes.is_empty() && event.is_cancelled() {
name.push_str(&format!("({notes}) "))
}
}
vevent.push(Summary::new(name)); vevent.push(Summary::new(name));
calendar.add_event(vevent); calendar.add_event(vevent);
} }