Merge pull request 'format-cal-according-to-standard' (#944) from format-cal-according-to-standard into staging
Reviewed-on: #944
This commit was merged in pull request #944.
	This commit is contained in:
		| @@ -457,10 +457,16 @@ WHERE trip_details.id=? | |||||||
|             format!("event-{}@rudernlinz.at", self.id), |             format!("event-{}@rudernlinz.at", self.id), | ||||||
|             "19900101T180000", |             "19900101T180000", | ||||||
|         ); |         ); | ||||||
|  |         let time_str = self.planned_starting_time.replace(':', ""); | ||||||
|  |         let formatted_time = if time_str.len() == 3 { | ||||||
|  |             format!("0{}", time_str) | ||||||
|  |         } else { | ||||||
|  |             time_str.clone() // TODO: remove again | ||||||
|  |         }; | ||||||
|         vevent.push(DtStart::new(format!( |         vevent.push(DtStart::new(format!( | ||||||
|             "{}T{}00", |             "{}T{}00", | ||||||
|             self.day.replace('-', ""), |             self.day.replace('-', ""), | ||||||
|             self.planned_starting_time.replace(':', "") |             formatted_time | ||||||
|         ))); |         ))); | ||||||
|  |  | ||||||
|         let original_time = NaiveTime::parse_from_str(&self.planned_starting_time, "%H:%M") |         let original_time = NaiveTime::parse_from_str(&self.planned_starting_time, "%H:%M") | ||||||
|   | |||||||
| @@ -148,10 +148,17 @@ WHERE trip_details.id=? | |||||||
|     pub(crate) async fn get_vevent(self, user: &User) -> ics::Event { |     pub(crate) async fn get_vevent(self, user: &User) -> ics::Event { | ||||||
|         let mut vevent = |         let mut vevent = | ||||||
|             ics::Event::new(format!("trip-{}@rudernlinz.at", self.id), "19900101T180000"); |             ics::Event::new(format!("trip-{}@rudernlinz.at", self.id), "19900101T180000"); | ||||||
|  |         let time_str = self.planned_starting_time.replace(':', ""); | ||||||
|  |         let formatted_time = if time_str.len() == 3 { | ||||||
|  |             format!("0{}", time_str) | ||||||
|  |         } else { | ||||||
|  |             time_str | ||||||
|  |         }; | ||||||
|  |  | ||||||
|         vevent.push(DtStart::new(format!( |         vevent.push(DtStart::new(format!( | ||||||
|             "{}T{}00", |             "{}T{}00", | ||||||
|             self.day.replace('-', ""), |             self.day.replace('-', ""), | ||||||
|             self.planned_starting_time.replace(':', "") |             formatted_time | ||||||
|         ))); |         ))); | ||||||
|  |  | ||||||
|         let original_time = NaiveTime::parse_from_str(&self.planned_starting_time, "%H:%M") |         let original_time = NaiveTime::parse_from_str(&self.planned_starting_time, "%H:%M") | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user