Merge pull request 'log-2022' (#63) from log-2022 into staging

Reviewed-on: #63

seeds.sql

@@ -26,9 +26,9 @@ INSERT INTO "boat" (name, amount_seats, location_id) VALUES ('Ottensheim Boot',
 INSERT INTO "boat" (name, amount_seats, location_id, owner) VALUES ('second_private_boat_from_rower', 1, 1, 2);
 INSERT INTO "logbook_type" (name) VALUES ('Wanderfahrt');
 INSERT INTO "logbook_type" (name) VALUES ('Regatta');
-INSERT INTO "logbook" (boat_id, shipmaster,steering_person, shipmaster_only_steering, departure) VALUES (2, 2, 2, false, '1142-12-24 10:00');
+INSERT INTO "logbook" (boat_id, shipmaster,steering_person, shipmaster_only_steering, departure) VALUES (2, 2, 2, false, strftime('%Y', 'now') || '-12-24 10:00');
-INSERT INTO "logbook" (boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km) VALUES (1, 4, 4, false, '1141-12-24 10:00', '2141-12-24 15:00', 'Ottensheim', 25);
+INSERT INTO "logbook" (boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km) VALUES (1, 4, 4, false, strftime('%Y', 'now') || '-12-24 10:00', strftime('%Y', 'now') || '-12-24 15:00', 'Ottensheim', 25);
-INSERT INTO "logbook" (boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km) VALUES (3, 4, 4, false, '1142-12-24 10:00', '2142-12-24 11:30', 'Ottensheim + Regattastrecke', 29);
+INSERT INTO "logbook" (boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km) VALUES (3, 4, 4, false, strftime('%Y', 'now') || '-12-24 10:00', strftime('%Y', 'now') || '-12-24 11:30', 'Ottensheim + Regattastrecke', 29);
 INSERT INTO "rower" (logbook_id, rower_id) VALUES(3,3);
 INSERT INTO "boat_damage" (boat_id, desc, user_id_created, created_at) VALUES(4,'Dolle bei Position 2 fehlt', 5, '2142-12-24 15:02');
 INSERT INTO "boat_damage" (boat_id, desc, user_id_created, created_at, lock_boat) VALUES(5, 'TOHT', 5, '2142-12-24 15:02', 1);

src/model/logbook.rs

@@ -1,4 +1,4 @@
-use chrono::{NaiveDateTime, Utc};
+use chrono::{Datelike, NaiveDateTime, Utc};
 use rocket::FromForm;
 use serde::Serialize;
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
@@ -225,14 +225,14 @@ ORDER BY departure DESC
     }
 
     pub async fn completed(db: &SqlitePool) -> Vec<LogbookWithBoatAndRowers> {
-        let logs = sqlx::query_as!(
+        let year = chrono::Utc::now().year();
-                Logbook,
+        let logs = sqlx::query_as(
-                "
+               &format!("
     SELECT id, boat_id, shipmaster, steering_person, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
     FROM logbook
-    WHERE arrival is not null
+    WHERE arrival is not null AND arrival LIKE '{}-%'
     ORDER BY departure DESC
-            "
+            ", year)
             )
             .fetch_all(db)
             .await
@@ -553,11 +553,11 @@ mod test {
 
         assert_eq!(
             completed[0].logbook,
-            Logbook::find_by_id(&pool, 3).await.unwrap()
+            Logbook::find_by_id(&pool, 2).await.unwrap()
         );
         assert_eq!(
             completed[1].logbook,
-            Logbook::find_by_id(&pool, 2).await.unwrap()
+            Logbook::find_by_id(&pool, 3).await.unwrap()
         );
     }
 

src/model/stat.rs

@@ -1,4 +1,5 @@
 use crate::model::user::User;
+use chrono::Datelike;
 use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
@@ -9,15 +10,20 @@ pub struct Stat {
 }
 
 impl Stat {
-    pub async fn boats(db: &SqlitePool) -> Vec<Stat> {
+    pub async fn boats(db: &SqlitePool, year: Option<i32>) -> Vec<Stat> {
+        let year = match year {
+            Some(year) => year,
+            None => chrono::Utc::now().year(),
+        };
         //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
-        sqlx::query(
+        sqlx::query(&format!(
             "
 SELECT (SELECT name FROM boat WHERE id=logbook.boat_id) as name, CAST(SUM(distance_in_km) AS INTEGER) AS rowed_km
 FROM logbook 
+WHERE arrival LIKE '{}-%'
 GROUP BY boat_id 
 ORDER BY rowed_km DESC;
-",
+",year)
         )
         .fetch_all(db)
         .await
@@ -30,19 +36,24 @@ ORDER BY rowed_km DESC;
         .collect()
     }
 
-    pub async fn people(db: &SqlitePool) -> Vec<Stat> {
+    pub async fn people(db: &SqlitePool, year: Option<i32>) -> Vec<Stat> {
+        let year = match year {
+            Some(year) => year,
+            None => chrono::Utc::now().year(),
+        };
         //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
-        sqlx::query(
+        sqlx::query(&format!(
             "
 SELECT u.name, CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km 
 FROM user u
 INNER JOIN rower r ON u.id = r.rower_id
 INNER JOIN logbook l ON r.logbook_id = l.id
-WHERE u.is_guest = 0 AND l.distance_in_km IS NOT NULL
+WHERE u.is_guest = 0 AND l.distance_in_km IS NOT NULL AND l.arrival LIKE '{}-%'
 GROUP BY u.name
 ORDER BY rowed_km DESC;
 ",
-        )
+            year
+        ))
         .fetch_all(db)
         .await
         .unwrap()

src/tera/stat.rs

@@ -9,9 +9,9 @@ use crate::model::{
 
 use super::log::KioskCookie;
 
-#[get("/boats", rank = 2)]
+#[get("/boats?<year>", rank = 2)]
-async fn index_boat(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
+async fn index_boat(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32>) -> Template {
-    let stat = Stat::boats(db).await;
+    let stat = Stat::boats(db, year).await;
     let kiosk = false;
 
     Template::render(
@@ -20,17 +20,21 @@ async fn index_boat(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
     )
 }
 
-#[get("/boats")]
+#[get("/boats?<year>")]
-async fn index_boat_kiosk(db: &State<SqlitePool>, _kiosk: KioskCookie) -> Template {
+async fn index_boat_kiosk(
-    let stat = Stat::boats(db).await;
+    db: &State<SqlitePool>,
+    _kiosk: KioskCookie,
+    year: Option<i32>,
+) -> Template {
+    let stat = Stat::boats(db, year).await;
     let kiosk = true;
 
     Template::render("stat.boats", context!(stat, kiosk, show_kiosk_header: true))
 }
 
-#[get("/", rank = 2)]
+#[get("/?<year>", rank = 2)]
-async fn index(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
+async fn index(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32>) -> Template {
-    let stat = Stat::people(db).await;
+    let stat = Stat::people(db, year).await;
     let personal = stat::get_personal(db, &user.user).await;
     let kiosk = false;
 
@@ -40,9 +44,9 @@ async fn index(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
     )
 }
 
-#[get("/")]
+#[get("/?<year>")]
-async fn index_kiosk(db: &State<SqlitePool>, _kiosk: KioskCookie) -> Template {
+async fn index_kiosk(db: &State<SqlitePool>, _kiosk: KioskCookie, year: Option<i32>) -> Template {
-    let stat = Stat::people(db).await;
+    let stat = Stat::people(db, year).await;
     let kiosk = true;
 
     Template::render(