diff --git a/web/src/endpoints/availability/mod.rs b/web/src/endpoints/availability/mod.rs index 155ee7d6..eaf28a42 100644 --- a/web/src/endpoints/availability/mod.rs +++ b/web/src/endpoints/availability/mod.rs @@ -4,7 +4,7 @@ use serde::Deserialize; use crate::filters; use crate::models::{Availability, AvailabilityChangeset, Role, User}; -use crate::utils::DateTimeFormat::{DayMonth, DayMonthYear, DayMonthYearHourMinute}; +use crate::utils::DateTimeFormat::{DayMonth, DayMonthYear, DayMonthYearHourMinute, HourMinute}; pub mod delete; pub mod get_new; diff --git a/web/src/filters.rs b/web/src/filters.rs index c573273a..15b60b0b 100644 --- a/web/src/filters.rs +++ b/web/src/filters.rs @@ -2,6 +2,7 @@ use std::fmt::Display; use chrono::{NaiveDate, NaiveDateTime, NaiveTime}; use maud::html; +use tracing::trace; use crate::{models::UserFunction, utils::DateTimeFormat}; @@ -74,13 +75,22 @@ pub fn show_tree(f: &UserFunction) -> askama::Result { } pub fn fmt_date(v: &NaiveDate, format: DateTimeFormat) -> askama::Result { - Ok(v.format(format.into()).to_string()) + let format_string = format.into(); + trace!(format=format_string, "formatting naivedate into string with format"); + + Ok(v.format(format_string).to_string()) } pub fn fmt_datetime(v: &NaiveDateTime, format: DateTimeFormat) -> askama::Result { - Ok(v.format(format.into()).to_string()) + let format_string = format.into(); + trace!(format=format_string, "formatting naivedatetime into string with format"); + + Ok(v.format(format_string).to_string()) } pub fn fmt_time(v: &NaiveTime, format: DateTimeFormat) -> askama::Result { - Ok(v.format(format.into()).to_string()) + let format_string = format.into(); + trace!(format=format_string, "formatting naivetime into string with format"); + + Ok(v.format(format_string).to_string()) } diff --git a/web/templates/availability/new_or_edit.html b/web/templates/availability/new_or_edit.html index 90cdea46..bf687ce6 100644 --- a/web/templates/availability/new_or_edit.html +++ b/web/templates/availability/new_or_edit.html @@ -81,9 +81,9 @@ {% let start_time = start.unwrap_or(NaiveTime::from_hms_opt(10, 0, 0).unwrap()) %} {% let end_time = start.unwrap_or(NaiveTime::from_hms_opt(20, 0, 0).unwrap()) %} - verfügbar von {{ date|fmt_date(DayMonth) }} {{ start_time|fmt_time(DayMonth) }} Uhr + verfügbar von {{ date|fmt_date(DayMonth) }} {{ start_time|fmt_time(HourMinute) }} Uhr bis {{ enddate.as_ref().unwrap_or(date)|fmt_date(DayMonth) }} - {{ end_time|fmt_time(DayMonth) }} Uhr + {{ end_time|fmt_time(HourMinute) }} Uhr