feat: show event for areamanager of cross areal planned user

db/sql/event/read_all_by_date_range_and_assigned_user_in_other_area.sql

@@ -19,6 +19,8 @@ FROM
     assignment
 JOIN availability ON
     assignment.availabilityid = availability.id
+JOIN user_ ON
+    availability.userId = user_.id
 JOIN event ON
     assignment.eventid = "event".id
 JOIN location ON
@@ -26,9 +28,9 @@ JOIN location ON
 JOIN clothing ON
     event.clothing = clothing.id
 WHERE
-    userid = $1
+    (userid = $1 OR user_.areaId = $2)
-    AND event.starttimestamp::date >= $2
+    AND event.starttimestamp::date >= $3
-    AND event.starttimestamp::date <= $3
+    AND event.starttimestamp::date <= $4
-    AND location.areaId != $4
+    AND location.areaId != $5
 ORDER BY
     event.starttimestamp;

db/sql/event_for_calendar/read_all_by_date_and_area_and_user.sql

@@ -49,9 +49,12 @@ LEFT JOIN ASSIGNMENT ON
     event.id = assignment.eventid
 LEFT JOIN availability ON
     assignment.availabilityid = availability.id
+LEFT JOIN user_ ON
+    availability.userId = user_.id
 WHERE
     event.starttimestamp::date = $1
     AND (
         location.areaId = $2
         OR availability.userId = $3
+        OR user_.areaId = $4
 	)

db/sql/user/read_by_availability_id.sql

@@ -0,0 +1,20 @@
+SELECT
+    user_.id,
+    name,
+    email,
+    password,
+    salt,
+    role AS "role: Role",
+    function AS "function: UserFunction",
+    areaId,
+    locked,
+    lastLogin,
+    receiveNotifications
+FROM
+    user_,
+    availability
+WHERE
+    availability.id = $1
+    AND availability.userId = user_.id
+ORDER BY
+    id;

db/src/models/event.rs

@@ -168,10 +168,12 @@ impl Event {
         date_range: (&NaiveDate, &NaiveDate),
         user_id: i32,
         area_to_ignore: i32,
+        area_for_which_user_is_manager: Option<i32>,
     ) -> Result<Vec<Event>> {
         let records = query_file!(
             "sql/event/read_all_by_date_range_and_assigned_user_in_other_area.sql",
             user_id,
+            area_for_which_user_is_manager,
             date_range.0,
             date_range.1,
             area_to_ignore

db/src/models/event_for_calendar.rs

@@ -15,12 +15,14 @@ impl EventForCalendar {
         date: &NaiveDate,
         area: i32,
         user: i32,
+        area_for_which_user_is_manager: Option<i32>,
     ) -> Result<Vec<EventForCalendar>> {
         let records = query_file!(
             "sql/event_for_calendar/read_all_by_date_and_area_and_user.sql",
             date,
             area,
-            user
+            user,
+            area_for_which_user_is_manager
         )
         .fetch_all(pool)
         .await?;

db/src/models/user.rs

@@ -1,5 +1,5 @@
 use chrono::{DateTime, Utc};
-use sqlx::PgPool;
+use sqlx::{PgPool, query_file};
 
 use super::{Area, Function, Result, Role, UserChangeset, UserFunction};
 
@@ -290,6 +290,32 @@ impl User {
         Ok(result)
     }
 
+    pub async fn read_by_availability_id(
+        pool: &PgPool,
+        availability_id: i32,
+    ) -> Result<Option<User>> {
+        let record = query_file!("sql/user/read_by_availability_id.sql", availability_id)
+            .fetch_optional(pool)
+            .await?;
+
+        let result = record.map(|r| User {
+            id: r.id,
+            name: r.name.clone(),
+            email: r.email.clone(),
+            password: r.password.clone(),
+            salt: r.salt.clone(),
+            role: r.role,
+            function: r.function.clone(),
+            area_id: r.areaid,
+            area: None,
+            locked: r.locked,
+            last_login: r.lastlogin,
+            receive_notifications: r.receivenotifications,
+        });
+
+        Ok(result)
+    }
+
     pub async fn update(pool: &PgPool, id: i32, changeset: UserChangeset) -> Result<()> {
         sqlx::query!(
             "UPDATE user_ SET name = $1, email = $2, role = $3, function = $4, areaId = $5 WHERE id = $6;",

web/snapshots/brass_web__endpoints__availability__get_new__tests__inner_produces_template_when_user_is_admin.snap

@@ -8,7 +8,7 @@ snapshot_kind: text
     
     <form hx-post="/availability/new" hx-target="body"
           hx-target-422="#error">
-      <h1 class="title">Neue Vefügbarkeit für Mittwoch, 01.01.2025</h1>
+      <h1 class="title">Neue Verfügbarkeit für Mittwoch, 01.01.2025</h1>
 
       <input type="hidden" name="startdate" value="2025-01-01">
       <input type="hidden" name="enddate" value="2025-01-01" id="enddate">

web/src/endpoints/assignment/delete.rs

@@ -4,6 +4,7 @@ use sqlx::PgPool;
 
 use crate::{
     endpoints::assignment::PlanEventPersonalTablePartialTemplate,
+    mail::Mailer,
     utils::{
         event_planning_template::{
             generate_availability_assignment_list, generate_status_whether_staff_is_required,
@@ -24,6 +25,7 @@ pub async fn delete(
     user: web::ReqData<User>,
     pool: web::Data<PgPool>,
     query: web::Query<AssignmentDeleteQuery>,
+    mailer: web::Data<Mailer>,
 ) -> Result<impl Responder, ApplicationError> {
     let Some(event) = Event::read_by_id_including_location(pool.get_ref(), query.event).await?
     else {
@@ -45,6 +47,16 @@ pub async fn delete(
 
     Assignment::delete(pool.get_ref(), event.id, assignment.availability_id).await?;
 
+    let user_of_availability =
+        User::read_by_availability_id(pool.get_ref(), assignment.availability_id)
+            .await?
+            .unwrap();
+    if user_of_availability.receive_notifications {
+        mailer
+            .send_assignment_deleted_mail(&user_of_availability, &assignment.function, &event)
+            .await?;
+    }
+
     let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
     let (
         further_posten_required,

web/src/endpoints/assignment/post_new.rs

@@ -4,6 +4,7 @@ use sqlx::PgPool;
 
 use crate::{
     endpoints::assignment::PlanEventPersonalTablePartialTemplate,
+    mail::Mailer,
     utils::{
         event_planning_template::{
             generate_availability_assignment_list, generate_status_whether_staff_is_required,
@@ -29,6 +30,7 @@ pub async fn post(
     user: web::ReqData<User>,
     pool: web::Data<PgPool>,
     query: web::Query<AssignmentQuery>,
+    mailer: web::Data<Mailer>,
 ) -> Result<impl Responder, ApplicationError> {
     if user.role != Role::Admin && user.role != Role::AreaManager {
         return Err(ApplicationError::Unauthorized);
@@ -59,6 +61,16 @@ pub async fn post(
 
     Assignment::create(pool.get_ref(), event.id, query.availability, changeset).await?;
 
+    let user_of_availability =
+        User::read_by_availability_id(pool.get_ref(), context.availability_id)
+            .await?
+            .unwrap();
+    if user_of_availability.receive_notifications {
+        mailer
+            .send_assignment_created_mail(&user_of_availability, &function, &event)
+            .await?;
+    }
+
     let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
 
     let (

web/src/endpoints/availability/get_calendar.rs

@@ -67,20 +67,22 @@ async fn get(
 
     let availabilities_from_user =
         Availability::read_all_by_user_and_date(pool.get_ref(), user.id, &date).await?;
-    //println!("{availabilities_from_user:#?}");
 
     let user_can_create_availability = availabilities_from_user.is_empty()
         || !find_free_date_time_slots(&availabilities_from_user).is_empty();
 
-    //println!("{} || {} || {} = {user_can_create_availability}", availabilities_from_user.is_empty(),
+    let area_for_which_user_is_manager = if user.role == Role::Admin || user.role == Role::AreaManager {
-    // !only_one_availability_exists_and_is_whole_day(&availabilities_from_user),
+        Some(user.area_id)
-    // !find_free_time_slots(&availabilities_from_user).is_empty());
+    } else {
+        None
+    };
 
     let events = EventForCalendar::read_all_by_date_and_area_and_user(
         pool.get_ref(),
         &date,
         query.area.unwrap_or(user.area_id),
         user.id,
+        area_for_which_user_is_manager
     )
     .await?;
 

web/src/endpoints/availability/get_overview.rs

@@ -43,11 +43,18 @@ async fn get(
     )
     .await?;
 
+    let area_for_which_user_is_manager = if user.role == Role::Admin || user.role == Role::AreaManager {
+        Some(user.area_id)
+    } else {
+        None
+    };
+
     let mut foreign_events = Event::read_all_by_date_range_and_assigned_user_in_other_area(
         pool.get_ref(),
         date_range,
         user.id,
         user.area_id,
+        area_for_which_user_is_manager
     )
     .await?;
 

web/src/mail/notify_planned.rs

@@ -1,5 +1,5 @@
 use askama::Template;
-use brass_db::models::{Assignment, Event, Function, User};
+use brass_db::models::{Event, Function, User};
 use lettre::{
     message::{Mailbox, MultiPart, SinglePart},
     Address, AsyncTransport, Message,
@@ -10,7 +10,7 @@ use crate::{
     mail::Mailer,
     utils::{
         ApplicationError,
-        DateTimeFormat::{DayMonthYear, WeekdayDayMonthYear},
+        DateTimeFormat::{DayMonthYear, HourMinute, WeekdayDayMonthYear},
     },
 };
 
@@ -18,14 +18,14 @@ impl Mailer {
     pub async fn send_assignment_created_mail(
         &self,
         user: &User,
-        assignment: &Assignment,
+        assigned_function: &Function,
         event: &Event,
     ) -> Result<(), ApplicationError> {
         let message = build(
             &self.hostname,
             &user.name,
             &user.email,
-            &assignment.function,
+            &assigned_function,
             event,
         )?;
         self.transport.send(message).await?;

web/src/mail/notify_unplanned.rs

@@ -1,5 +1,5 @@
 use askama::Template;
-use brass_db::models::{Assignment, Event, Function, User};
+use brass_db::models::{Event, Function, User};
 use lettre::{
     message::{Mailbox, MultiPart, SinglePart},
     Address, AsyncTransport, Message,
@@ -18,14 +18,14 @@ impl Mailer {
     pub async fn send_assignment_deleted_mail(
         &self,
         user: &User,
-        assignment: &Assignment,
+        assigned_function: &Function,
         event: &Event,
     ) -> Result<(), ApplicationError> {
         let message = build(
             &self.hostname,
             &user.name,
             &user.email,
-            &assignment.function,
+            &assigned_function,
             event,
         )?;
         self.transport.send(message).await?;

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
+    - Beginn: 18:30 Uhr
-    - Ende: 2025-06-02 04:00:00
+    - Ende: 04:00 Uhr
     - Kleidungsordnung: komplette PSA
     - Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...
 
@@ -45,9 +45,9 @@ ag, 01.06.2025 als Posten eingeteilt.</p>
 
 <ul>
     <li>Name: Wave Gotik Treffen</li>
-    <li>- Ort: agra Messe Leipzig</li>
+    <li>Ort: agra Messe Leipzig</li>
-    <li>Beginn: 2025-06-01 18:30:00</li>
+    <li>Beginn: 18:30 Uhr</li>
-    <li>Ende: 2025-06-02 04:00:00</li>
+    <li>Ende: 04:00 Uhr</li>
     <li>Kleidungsordnung: komplette PSA</li>
     <li>Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...</li>
 </ul>

web/templates/availability/new_or_edit.html

@@ -6,7 +6,7 @@
     {% let is_edit = id.is_some() %}
     <form hx-post="/availability/{% if is_edit %}edit/{{ id.unwrap() }}{% else %}new{% endif %}" hx-target="body"
           hx-target-422="#error">
-      <h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Vefügbarkeit für {{
+      <h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Verfügbarkeit für {{
         date|fmt_date(WeekdayDayMonthYear) }}</h1>
 
       <input type="hidden" name="startdate" value="{{ date }}">

web/templates/calendar.html

@@ -274,12 +274,14 @@
         </div>
         {% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
         <div class="level-right">
+          {% if user.role == Role::Admin || user.role == Role::AreaManager %}
           <a class="button is-link is-outlined" href="/availability/new-other?date={{ date }}">
             <svg class="icon">
               <use href="/static/feather-sprite.svg#plus-circle" />
             </svg>
             <span>Neue Verfügbarkeit für anderen Nutzer</span>
           </a>
+          {% endif %}
           {% let btn_disabled = !user_can_create_availability %}
           <a class="button is-link is-light" href="/availability/new?date={{ date }}" {{
              btn_disabled|cond_show("disabled") }}>

web/templates/emails/notify_planned.html

@@ -6,9 +6,9 @@
 
 <ul>
     <li>Name: {{ event.name }}</li>
-    <li>- Ort: {{ event.location.as_ref().unwrap().name }}</li>
+    <li>Ort: {{ event.location.as_ref().unwrap().name }}</li>
-    <li>Beginn: {{ event.start }}</li>
+    <li>Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr</li>
-    <li>Ende: {{ event.end }}</li>
+    <li>Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr</li>
     <li>Kleidungsordnung: {{ event.clothing.name }}</li>
     {% if let Some(note) = event.note %}<li>Anmerkungen: {{ note }}</li>{% endif %}
 </ul>

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 }}
+    - Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr
-    - Ende: {{ event.end }}
+    - Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr
     - Kleidungsordnung: {{ event.clothing.name }}
     {% if let Some(note) = event.note %}- Anmerkungen: {{ note }}{% endif %}
 

web/templates/location/overview.html

@@ -40,6 +40,7 @@
             <h5 class="title is-5">Bereich {{ gl.0.name }}</h5>
           </div>
 
+          {% if user.role == Role::Admin %}
           <div class="level-item buttons are-small">
             <a class="button is-primary is-light" hx-boost="true" href="/area/edit/{{ gl.0.id }}">
               <svg class="icon">
@@ -53,6 +54,7 @@
               </svg>
             </button>
           </div>
+          {% endif %}
         </div>
       </div>