From 4d1ffa206c6375d617da8c8df6bfe05b8ec2ed42 Mon Sep 17 00:00:00 2001 From: Max Hohlfeld Date: Sun, 24 Aug 2025 18:04:24 +0200 Subject: [PATCH] fix: minor ui issues --- ...ts__inner_produces_template_when_user_is_admin.snap | 2 +- web/src/mail/notify_planned.rs | 2 +- ...il__notify_planned__tests__build_mail_snapshot.snap | 10 +++++----- web/templates/availability/new_or_edit.html | 2 +- web/templates/calendar.html | 2 ++ web/templates/emails/notify_planned.html | 4 ++-- web/templates/emails/notify_planned.txt | 4 ++-- web/templates/location/overview.html | 2 ++ 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap b/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap index 1d02c00a..45161b36 100644 --- a/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap +++ b/web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap @@ -8,7 +8,7 @@ snapshot_kind: text
-

Neue Vefügbarkeit für Mittwoch, 01.01.2025

+

Neue Verfügbarkeit für Mittwoch, 01.01.2025

diff --git a/web/src/mail/notify_planned.rs b/web/src/mail/notify_planned.rs index ca461913..a93f3bf4 100644 --- a/web/src/mail/notify_planned.rs +++ b/web/src/mail/notify_planned.rs @@ -10,7 +10,7 @@ use crate::{ mail::Mailer, utils::{ ApplicationError, - DateTimeFormat::{DayMonthYear, WeekdayDayMonthYear}, + DateTimeFormat::{DayMonthYear, HourMinute, WeekdayDayMonthYear}, }, }; diff --git a/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap b/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap index 23107874..c094ff46 100644 --- a/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap +++ b/web/src/mail/snapshots/brass_web__mail__notify_planned__tests__build_mail_snapshot.snap @@ -24,8 +24,8 @@ du wurdest soeben f=C3=BCr die Veranstaltung Wave Gotik Treffen am Sonntag,= Hier die Infos zur Veranstaltung: - Name: Wave Gotik Treffen - Ort: agra Messe Leipzig - - Beginn: 2025-06-01 18:30:00 - - Ende: 2025-06-02 04:00:00 + - Beginn: 18:30 Uhr + - Ende: 04:00 Uhr - Kleidungsordnung: komplette PSA - Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz... @@ -45,9 +45,9 @@ ag, 01.06.2025 als Posten eingeteilt.

diff --git a/web/templates/availability/new_or_edit.html b/web/templates/availability/new_or_edit.html index 86d77d5c..90bf12d6 100644 --- a/web/templates/availability/new_or_edit.html +++ b/web/templates/availability/new_or_edit.html @@ -6,7 +6,7 @@ {% let is_edit = id.is_some() %} -

{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Vefügbarkeit für {{ +

{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Verfügbarkeit für {{ date|fmt_date(WeekdayDayMonthYear) }}

diff --git a/web/templates/calendar.html b/web/templates/calendar.html index 08ddeaba..b24607eb 100644 --- a/web/templates/calendar.html +++ b/web/templates/calendar.html @@ -274,12 +274,14 @@ {% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
+ {% if user.role == Role::Admin || user.role == Role::AreaManager %} Neue Verfügbarkeit für anderen Nutzer + {% endif %} {% let btn_disabled = !user_can_create_availability %} diff --git a/web/templates/emails/notify_planned.html b/web/templates/emails/notify_planned.html index e71684a9..9941ee3c 100644 --- a/web/templates/emails/notify_planned.html +++ b/web/templates/emails/notify_planned.html @@ -7,8 +7,8 @@
  • Name: {{ event.name }}
  • Ort: {{ event.location.as_ref().unwrap().name }}
    • -
  • Beginn: {{ event.start }}
    • -
  • Ende: {{ event.end }}
    • +
  • Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr
    • +
  • Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr
  • Kleidungsordnung: {{ event.clothing.name }}
    • {% if let Some(note) = event.note %}
  • Anmerkungen: {{ note }}
    • {% endif %}
diff --git a/web/templates/emails/notify_planned.txt b/web/templates/emails/notify_planned.txt index 3d873f2e..6a65f67b 100644 --- a/web/templates/emails/notify_planned.txt +++ b/web/templates/emails/notify_planned.txt @@ -5,8 +5,8 @@ du wurdest soeben für die Veranstaltung {{ event.name }} am {{ event.start|fmt_ Hier die Infos zur Veranstaltung: - Name: {{ event.name }} - Ort: {{ event.location.as_ref().unwrap().name }} - - Beginn: {{ event.start }} - - Ende: {{ event.end }} + - Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr + - Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr - Kleidungsordnung: {{ event.clothing.name }} {% if let Some(note) = event.note %}- Anmerkungen: {{ note }}{% endif %} diff --git a/web/templates/location/overview.html b/web/templates/location/overview.html index 06fbc580..a901b14d 100644 --- a/web/templates/location/overview.html +++ b/web/templates/location/overview.html @@ -40,6 +40,7 @@
Bereich {{ gl.0.name }}
+ {% if user.role == Role::Admin %}
@@ -53,6 +54,7 @@
+ {% endif %}