From a31bacb3e12932a7e53fcc210f307f2642695da6 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Mon, 19 Aug 2024 13:39:22 +0200
Subject: [PATCH 1/2] create notification if a new event with 'always_show' is
 entered

---
 src/model/event.rs          | 18 +++++++++++++++++-
 templates/planned.html.tera |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/model/event.rs b/src/model/event.rs
index e4c2dbc..bbb6e6e 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -8,7 +8,10 @@ use ics::{
 use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
-use super::{notification::Notification, tripdetails::TripDetails, triptype::TripType, user::User};
+use super::{
+    notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
+    user::User,
+};
 
 #[derive(Serialize, Clone, FromRow, Debug, PartialEq)]
 pub struct Event {
@@ -219,6 +222,19 @@ WHERE trip_details.id=?
         planned_amount_cox: i32,
         trip_details: &TripDetails,
     ) {
+        if trip_details.always_show {
+            let donau = Role::find_by_name(db, "Donau Linz").await.unwrap();
+            Notification::create_for_role(
+                db,
+                &donau,
+                &format!("Am {} um {} wurde ein neues Event angelegt: {} Wir freuen uns wenn du dabei mitmachst, die Anmeldung ist ab sofort offen :-)", trip_details.day, trip_details.planned_starting_time, name),
+                "Neues Event",
+                Some(&format!("/planned#{}", trip_details.day)),
+                None,
+            )
+            .await;
+        }
+
         sqlx::query!(
             "INSERT INTO planned_event(name, planned_amount_cox, trip_details_id) VALUES(?, ?, ?)",
             name,
diff --git a/templates/planned.html.tera b/templates/planned.html.tera
index 0dfab7c..0cccb5e 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -67,7 +67,7 @@
                     {% endif %}
                 {% endfor %}
             {% endif %}
-            <div class="bg-white dark:bg-primary-900 rounded-md flex justify-between flex-col shadow reset-js"
+            <div id="{{ day.day| date(format="%Y-%m-%d") }}" class="bg-white dark:bg-primary-900 rounded-md flex justify-between flex-col shadow reset-js"
                  style="min-height: 10rem"
                  data-trips="{{ amount_trips }}"
                  data-month="{{ day.day| date(format='%m') }}"
-- 
2.45.2


From 6e8a5927a61db672349031e093f461fa975ccc8d Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Mon, 19 Aug 2024 13:50:08 +0200
Subject: [PATCH 2/2] create notification if a new event with 'always_show' is
 updated

---
 src/model/event.rs | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/model/event.rs b/src/model/event.rs
index bbb6e6e..3581810 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -9,7 +9,11 @@ use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
 use super::{
-    notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
+    notification::Notification,
+    role::Role,
+    trip,
+    tripdetails::{self, TripDetails},
+    triptype::TripType,
     user::User,
 };
 
@@ -216,6 +220,19 @@ WHERE trip_details.id=?
         .ok()
     }
 
+    async fn advertise(db: &SqlitePool, day: &str, planned_starting_time: &str, name: &str) {
+        let donau = Role::find_by_name(db, "Donau Linz").await.unwrap();
+        Notification::create_for_role(
+                db,
+                &donau,
+                &format!("Am {} um {} wurde ein neues Event angelegt: {} Wir freuen uns wenn du dabei mitmachst, die Anmeldung ist ab sofort offen :-)", day, planned_starting_time, name),
+                "Neues Event",
+                Some(&format!("/planned#{day}")),
+                None,
+            )
+            .await;
+    }
+
     pub async fn create(
         db: &SqlitePool,
         name: &str,
@@ -223,14 +240,11 @@ WHERE trip_details.id=?
         trip_details: &TripDetails,
     ) {
         if trip_details.always_show {
-            let donau = Role::find_by_name(db, "Donau Linz").await.unwrap();
-            Notification::create_for_role(
+            Self::advertise(
                 db,
-                &donau,
-                &format!("Am {} um {} wurde ein neues Event angelegt: {} Wir freuen uns wenn du dabei mitmachst, die Anmeldung ist ab sofort offen :-)", trip_details.day, trip_details.planned_starting_time, name),
-                "Neues Event",
-                Some(&format!("/planned#{}", trip_details.day)),
-                None,
+                &trip_details.day,
+                &trip_details.planned_starting_time,
+                name,
             )
             .await;
         }
@@ -274,6 +288,16 @@ WHERE trip_details.id=?
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
 
+        if !tripdetails.always_show && update.always_show {
+            Self::advertise(
+                db,
+                &tripdetails.day,
+                &tripdetails.planned_starting_time,
+                update.name,
+            )
+            .await;
+        }
+
         if update.max_people == 0 && !was_already_cancelled {
             let coxes = Registration::all_cox(db, self.id).await;
             for user in coxes {
-- 
2.45.2