src/model/notification.rs

@@ -26,6 +26,22 @@ impl Notification {
             .await
             .ok()
     }
+
+    pub async fn oldest_unread_with_action(db: &SqlitePool, user_id: i64) -> Option<Self> {
+        sqlx::query_as!(
+            Self,
+            "SELECT id, user_id, message, read_at, created_at, category, link, action_after_reading
+             FROM notification
+             WHERE user_id = ? AND read_at IS NULL AND action_after_reading IS NOT NULL
+             ORDER BY created_at ASC
+             LIMIT 1",
+            user_id
+        )
+        .fetch_optional(db)
+        .await
+        .unwrap()
+    }
+
     pub async fn create_with_tx(
         db: &mut Transaction<'_, Sqlite>,
         user: &User,

src/model/stat.rs

@@ -104,9 +104,11 @@ pub struct Stat {
 
 impl Stat {
     pub async fn guest(db: &SqlitePool, year: Option<i32>) -> Stat {
-        let year = match year {
-            Some(year) => year,
-            None => chrono::Local::now().year(),
+        let year = year.unwrap_or_else(|| chrono::Local::now().year());
+        let year_filter = if year == 0 {
+            String::new()
+        } else {
+            format!("AND l.arrival LIKE '{}-%'", year)
         };
         //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
         // proper guests
@@ -121,7 +123,7 @@ LEFT JOIN (
     FROM rower
     GROUP BY logbook_id
 ) m ON l.id = m.logbook_id
-WHERE l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%' AND not b.external;
+WHERE l.distance_in_km IS NOT NULL {year_filter} AND not b.external;
 "
         ))
         .fetch_one(db)
@@ -145,7 +147,7 @@ WHERE u.id NOT IN (
     WHERE ro.name = 'Donau Linz'
 )
 AND l.distance_in_km IS NOT NULL
-AND l.arrival LIKE '{year}-%'
+{year_filter}
 AND u.name != 'Externe Steuerperson';
 "
         ))
@@ -183,9 +185,11 @@ AND u.name != 'Externe Steuerperson';
     }
 
     pub async fn people(db: &SqlitePool, year: Option<i32>) -> Vec<Stat> {
-        let year = match year {
-            Some(year) => year,
-            None => chrono::Local::now().year(),
+        let year = year.unwrap_or_else(|| chrono::Local::now().year());
+        let year_filter = if year == 0 {
+            String::new()
+        } else {
+            format!("AND l.arrival LIKE '{}-%'", year)
         };
         //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
         sqlx::query(&format!(
@@ -201,7 +205,7 @@ FROM (
 ) u
 INNER JOIN rower r ON u.id = r.rower_id
 INNER JOIN logbook l ON r.logbook_id = l.id
-WHERE l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%' AND u.name != 'Externe Steuerperson'
+WHERE l.distance_in_km IS NOT NULL {year_filter} AND u.name != 'Externe Steuerperson'
 GROUP BY u.name
 ORDER BY rowed_km DESC, u.name;
 "

src/model/user/mod.rs

@@ -88,17 +88,20 @@ pub struct UserWithDetails {
     pub allowed_to_steer: bool,
     pub on_water: bool,
     pub roles: Vec<String>,
+    pub action_notification: Option<Notification>,
 }
 
 impl UserWithDetails {
     pub async fn from_user(user: User, db: &SqlitePool) -> Self {
         let allowed_to_steer = user.allowed_to_steer(db).await;
+        let action_notification = Notification::oldest_unread_with_action(db, user.id).await;
 
         Self {
             on_water: user.on_water(db).await,
             roles: user.roles(db).await,
             amount_unread_notifications: user.amount_unread_notifications(db).await,
             allowed_to_steer,
+            action_notification,
             user,
         }
     }

templates/base.html.tera

@@ -53,6 +53,21 @@
             {% include "includes/footer" %}
         {% endif %}
         {% include "dynamics/sidebar" %}
+        {% if loggedin_user and loggedin_user.action_notification %}
+        <dialog id="action-notification-modal" class="max-w-screen-sm dark:bg-primary-600 dark:text-white rounded-md">
+            <div class="p-4">
+                <small class="text-gray-600 dark:text-gray-100">
+                    <strong>{{ loggedin_user.action_notification.category }}</strong>
+                </small>
+                <div class="my-4">{{ loggedin_user.action_notification.message }}</div>
+                <a href="/notification/{{ loggedin_user.action_notification.id }}/read" class="btn btn-dark w-full mt-3">
+                    &#10003;
+                    <span class="sr-only">Notification gelesen</span>
+                </a>
+            </div>
+        </dialog>
+        <script>document.getElementById('action-notification-modal').showModal();</script>
+        {% endif %}
         <script src="/public/main.js"></script>
     </body>
 </html>

templates/stat.people.html.tera

@@ -83,6 +83,7 @@
 	    var select = document.getElementById('yearSelect');
 	    var currentYear = new Date().getFullYear();
 	    var selectedYear = getYearFromURL() || currentYear;
+
 	    for (var year = 1977; year <= currentYear; year++) {
 	        var option = document.createElement('option');
 	        option.value = option.textContent = year;
@@ -91,6 +92,14 @@
 	        }
 	        select.appendChild(option);
 	    }
+
+	    var gesamtOption = document.createElement('option');
+	    gesamtOption.value = 0;
+	    gesamtOption.textContent = 'GESAMT';
+	    if (selectedYear == 0) {
+	        gesamtOption.selected = true;
+	    }
+	    select.appendChild(gesamtOption);
 	}
 
 	function changeYear() {