Merge pull request 'staging' (#244) from staging into main

Reviewed-on: #244

src/model/logbook.rs

@@ -260,6 +260,10 @@ ORDER BY departure DESC
 
     pub async fn completed(db: &SqlitePool) -> Vec<LogbookWithBoatAndRowers> {
         let year = chrono::Local::now().year();
+        Self::completed_in_year(db, year).await
+    }
+
+    pub async fn completed_in_year(db: &SqlitePool, year: i32) -> Vec<LogbookWithBoatAndRowers> {
         let logs = sqlx::query_as(
                &format!("
     SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype

src/model/user.rs

@@ -753,7 +753,7 @@ impl<'r> FromRequest<'r> for AdminUser {
                 if user.has_role(db, "admin").await {
                     Outcome::Success(AdminUser { user })
                 } else {
-                    Outcome::Error((Status::Forbidden, LoginError::NotACox))
+                    Outcome::Forward(Status::Forbidden)
                 }
             }
             Outcome::Error(f) => Outcome::Error(f),

src/tera/log.rs

@@ -23,7 +23,7 @@ use crate::model::{
         LogbookUpdateError,
     },
     logtype::LogType,
-    user::{DonauLinzUser, User, UserWithRoles, UserWithWaterStatus},
+    user::{AdminUser, DonauLinzUser, User, UserWithRoles, UserWithWaterStatus},
 };
 
 pub struct KioskCookie(String);
@@ -96,6 +96,16 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
     )
 }
 
+#[get("/show?<year>")]
+async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Template {
+    let logs = Logbook::completed_in_year(db, year).await;
+
+    Template::render(
+        "log.completed",
+        context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
+    )
+}
+
 #[get("/show")]
 async fn show_kiosk(db: &State<SqlitePool>, _kiosk: KioskCookie) -> Template {
     let logs = Logbook::completed(db).await;
@@ -378,6 +388,7 @@ pub fn routes() -> Vec<Route> {
         new_kiosk,
         show,
         show_kiosk,
+        show_for_year,
         delete,
         delete_kiosk
     ]

templates/log.completed.html.tera

@@ -3,7 +3,16 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        <h1 class="h1">Logbuch</h1>
+        <h1 class="h1">
+            Logbuch
+            {% if "admin" in loggedin_user.roles %}
+                <select id="yearSelect"
+                        onchange="changeYear()"
+                        style="background: transparent;
+                               background-image: none;
+                               text-decoration: underline"></select>
+            {% endif %}
+        </h1>
         <div class="mt-3">
             <div class="search-wrapper">
                 <label for="name" class="sr-only">Suche</label>
@@ -17,4 +26,32 @@
             {% for log in logs %}{{ log::show_old(log=log, state="completed", only_ones=false, index=loop.index) }}{% endfor %}
         </div>
     </div>
+    <script>
+function getYearFromURL() {
+    var queryParams = new URLSearchParams(window.location.search);
+    return queryParams.get('year');
+}
+
+function populateYears() {
+    var select = document.getElementById('yearSelect');
+    var currentYear = new Date().getFullYear();
+    var selectedYear = getYearFromURL() || currentYear;
+    for (var year = 2019; year <= currentYear; year++) {
+        var option = document.createElement('option');
+        option.value = option.textContent = year;
+	if (year == selectedYear) {
+            option.selected = true;
+        }
+        select.appendChild(option);
+    }
+}
+
+function changeYear() {
+    var selectedYear = document.getElementById('yearSelect').value;
+    window.location.href = '?year=' + selectedYear;
+}
+
+// Call this function when the page loads
+populateYears();
+    </script>
 {% endblock content %}