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

Reviewed-on: #338

Cargo.lock

@@ -2204,6 +2204,7 @@ dependencies = [
  "env_logger",
  "futures",
  "ics",
+ "itertools",
  "lettre",
  "log",
  "openssl",

Cargo.toml

@@ -24,6 +24,7 @@ ics = "0.5"
 futures = "0.3"
 lettre = "0.11"
 csv = "1.3"
+itertools = "0.12"
 
 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10", features = [ "vendored" ] }

src/model/boat.rs

@@ -1,5 +1,6 @@
 use std::ops::DerefMut;
 
+use itertools::Itertools;
 use rocket::serde::{Deserialize, Serialize};
 use rocket::FromForm;
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
@@ -7,7 +8,7 @@ use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 use super::location::Location;
 use super::user::User;
 
-#[derive(FromRow, Debug, Serialize, Deserialize)]
+#[derive(FromRow, Debug, Serialize, Deserialize, Eq, Hash, PartialEq, Clone)]
 pub struct Boat {
     pub id: i64,
     pub name: String,
@@ -279,6 +280,7 @@ ORDER BY amount_seats DESC
         .unwrap(); //TODO: fixme
             boats.extend(boats_in_ottensheim.into_iter());
         }
+        let boats = boats.into_iter().unique().collect();
 
         Self::boats_to_details(db, boats).await
     }

templates/index.html.tera

@@ -20,7 +20,7 @@
                             <div class="relative flex justify-between items-center p-3">
                                 <div class="grow me-4">
                                     <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
+                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M", ) }}
                                     </small>
                                     <div class="mt-1">{{ notification.message }}</div>
                                 </div>
@@ -45,7 +45,7 @@
                             {% if notification.read_at %}
                                 <div class="p-3 relative">
                                     <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
+                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M") }}
                                     </small>
                                     <div class="mt-1">{{ notification.message }}</div>
                                 </div>