improvements, styling, additional infos

src/model/personal/mod.rs

@@ -3,7 +3,7 @@ use equatorprice::Level;
 use serde::Serialize;
 use sqlx::SqlitePool;
 
-use super::{stat::Stat, user::User};
+use super::{logbook::Logbook, stat::Stat, user::User};
 
 pub(crate) mod equatorprice;
 pub(crate) mod rowingbadge;
@@ -14,6 +14,9 @@ pub(crate) struct Achievements {
     pub(crate) curr_equatorprice_name: String,
     pub(crate) new_equatorprice_this_season: bool,
     pub(crate) rowingbadge: Option<rowingbadge::Status>,
+    pub(crate) all_time_km: i32,
+    pub(crate) year_first_mentioned: Option<i32>,
+    pub(crate) year_last_mentioned: Option<i32>,
 }
 
 impl Achievements {
@@ -31,25 +34,18 @@ impl Achievements {
                 .await
                 .rowed_km
         };
-        println!(
-            "old: {}; new: {}",
-            rowed_km,
-            rowed_km - rowed_km_this_season
-        );
-        println!(
-            "old: {:?}; new: {:?}",
-            Level::curr_level(rowed_km),
-            Level::curr_level(rowed_km - rowed_km_this_season)
-        );
+
         let new_equatorprice_this_season =
             Level::curr_level(rowed_km) != Level::curr_level(rowed_km - rowed_km_this_season);
-        println!("{new_equatorprice_this_season:?}");
 
         Self {
             equatorprice: equatorprice::Next::new(rowed_km),
             curr_equatorprice_name: equatorprice::Level::curr_level(rowed_km).desc().to_string(),
             new_equatorprice_this_season,
             rowingbadge: rowingbadge::Status::for_user(db, user).await,
+            all_time_km: rowed_km,
+            year_first_mentioned: Logbook::year_first_logbook_entry(db, user).await,
+            year_last_mentioned: Logbook::year_last_logbook_entry(db, user).await,
         }
     }
 }