Update Cargo dependencies

Reviewed-on: #1197

Cargo.toml

@@ -23,11 +23,11 @@ tera =  { version = "1.20", features = ["date-locale"], optional = true}
 ics = "0.5"
 futures = "0.3"
 lettre = "0.11"
-csv = "1.3"
+csv = "1.4"
 itertools = "0.14"
-job_scheduler_ng = "2.2"
-ureq = { version = "3.0", features = ["json"] }
-regex = "1.11"
+job_scheduler_ng = "2.4"
+ureq = { version = "3.3", features = ["json"] }
+regex = "1.12"
 urlencoding = "2.1"
 
 [target.'cfg(not(windows))'.dependencies]

src/main.rs

@@ -8,7 +8,7 @@ use rot::rest;
 use rot::tera;
 use rot::{scheduled, tera::Config};
 
-use sqlx::{pool::PoolOptions, sqlite::SqliteConnectOptions, ConnectOptions};
+use sqlx::{ConnectOptions, pool::PoolOptions, sqlite::SqliteConnectOptions};
 
 #[macro_use]
 extern crate rocket;

src/model/boatreservation.rs

@@ -95,13 +95,13 @@ WHERE end_date >= ? AND start_date <= ?
         res
     }
 
-    pub async fn next_future(db: &SqlitePool) -> Vec<BoatReservationWithDetails> {
+    pub async fn all_future(db: &SqlitePool) -> Vec<BoatReservationWithDetails> {
         let boatreservations = sqlx::query_as!(
             Self,
             "
 SELECT id, boat_id, start_date, end_date, time_desc, usage, user_id_applicant, user_id_confirmation, created_at
 FROM boat_reservation
-WHERE end_date >= CURRENT_DATE AND end_date <= date(CURRENT_DATE, '+3 days') ORDER BY end_date 
+WHERE end_date >= CURRENT_DATE ORDER BY end_date 
         "
         )
         .fetch_all(db)
@@ -158,10 +158,10 @@ WHERE end_date >= CURRENT_DATE AND end_date <= date(CURRENT_DATE, '+3 days') ORD
 
         grouped_reservations
     }
-    pub async fn next_future_with_groups(
+    pub async fn all_future_with_groups(
         db: &SqlitePool,
     ) -> HashMap<String, Vec<BoatReservationWithDetails>> {
-        let reservations = Self::next_future(db).await;
+        let reservations = Self::all_future(db).await;
         Self::with_groups(reservations)
     }
 

src/tera/boatreservation.rs

@@ -1,10 +1,11 @@
 use chrono::NaiveDate;
 use rocket::{
+    FromForm, Route, State,
     form::Form,
     get, post,
     request::FlashMessage,
     response::{Flash, Redirect},
-    routes, FromForm, Route, State,
+    routes,
 };
 use rocket_dyn_templates::Template;
 use sqlx::SqlitePool;
@@ -26,7 +27,7 @@ async fn index_kiosk(
     flash: Option<FlashMessage<'_>>,
     _kiosk: KioskCookie,
 ) -> Template {
-    let boatreservations = BoatReservation::next_future(db).await;
+    let boatreservations = BoatReservation::all_future(db).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {
@@ -55,7 +56,7 @@ async fn index(
     flash: Option<FlashMessage<'_>>,
     user: DonauLinzUser,
 ) -> Template {
-    let boatreservations = BoatReservation::next_future(db).await;
+    let boatreservations = BoatReservation::all_future(db).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {

src/tera/log.rs

@@ -114,7 +114,7 @@ async fn index(db: &SqlitePool, flash: Option<FlashMessage<'_>>, mut context: Co
     context.insert("planned_trips", &Trip::get_for_today(db).await);
     context.insert(
         "reservations",
-        &BoatReservation::next_future_with_groups(db).await,
+        &BoatReservation::all_future_with_groups(db).await,
     );
     context.insert("coxes", &coxes);
     context.insert("users", &users);

templates/includes/macros.html.tera

@@ -40,7 +40,7 @@ function setChoiceByLabel(choicesInstance, label) {
 {% endmacro plannedtrips %}
 {% macro boatreservation() %}
     <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3">
-        <h2 class="h2">Reservierungen<br /><small>in den nächsten 3 Tagen</small></h2>
+        <h2 class="h2">Reservierungen ({{ reservations | length }})</h2>
         <div class="grid grid-cols-1 gap-3 mb-3 w-full">
             {% for _, reservations_for_event in reservations %}
                 {% set reservation = reservations_for_event[0] %}