Cleanup

Author: Celeo

Diff for: vzdv-site/src/endpoints/controller.rs

@@ -428,11 +428,13 @@ async fn snippet_get_training_records(
         })
         .collect();
 
-    // Sort by session_date in descending order (newest first)
+    // sort by session_date in descending order (newest first)
     training_records.sort_by(|a, b| {
-      let date_a = NaiveDateTime::parse_from_str(&a.session_date, "%Y-%m-%d %H:%M:%S").unwrap_or_else(|_| NaiveDateTime::from_timestamp(0, 0));
-      let date_b = NaiveDateTime::parse_from_str(&b.session_date, "%Y-%m-%d %H:%M:%S").unwrap_or_else(|_| NaiveDateTime::from_timestamp(0, 0));
-      date_b.cmp(&date_a) // Sort newest first
+        let date_a = NaiveDateTime::parse_from_str(&a.session_date, "%Y-%m-%d %H:%M:%S")
+            .unwrap_or_else(|_| NaiveDateTime::default());
+        let date_b = NaiveDateTime::parse_from_str(&b.session_date, "%Y-%m-%d %H:%M:%S")
+            .unwrap_or_else(|_| NaiveDateTime::default());
+        date_b.cmp(&date_a) // sort newest first
     });
 
     let instructor_cids: Vec<u32> = training_records

Diff for: vzdv-site/src/endpoints/facility.rs

@@ -159,7 +159,7 @@ async fn page_roster(
 
     let certification_order = &state.config.training.certifications;
     let cert_order_map: HashMap<&String, usize> = certification_order
-        .into_iter()
+        .iter()
         .enumerate()
         .map(|(index, cert)| (cert, index))
         .collect();
@@ -179,7 +179,12 @@ async fn page_roster(
                 .collect::<Vec<_>>();
 
             // Sort certifications based on the order in the TOML file
-            certs.sort_by_key(|cert| cert_order_map.get(&cert.name).cloned().unwrap_or(usize::MAX));
+            certs.sort_by_key(|cert| {
+                cert_order_map
+                    .get(&cert.name)
+                    .cloned()
+                    .unwrap_or(usize::MAX)
+            });
 
             ControllerWithCerts {
                 cid: controller.cid,

Diff for: vzdv-site/src/endpoints/user.rs

@@ -10,6 +10,7 @@ use axum::{
     routing::get,
     Router,
 };
+use chrono::NaiveDateTime;
 use log::{debug, info, warn};
 use minijinja::{context, Environment};
 use std::{collections::HashMap, sync::Arc};
@@ -35,7 +36,7 @@ async fn page_training_notes(
         vatusa::get_training_records(&state.config.vatsim.vatusa_api_key, user_info.cid)
             .await
             .map_err(|e| AppError::GenericFallback("getting VATUSA training records", e))?;
-    let training_records: Vec<_> = all_training_records
+    let mut training_records: Vec<_> = all_training_records
         .iter()
         .filter(|record| record.facility_id == "ZDV")
         .map(|record| {
@@ -47,6 +48,15 @@ async fn page_training_notes(
         })
         .collect();
 
+    // sort by session_date in descending order (newest first)
+    training_records.sort_by(|a, b| {
+        let date_a = NaiveDateTime::parse_from_str(&a.session_date, "%Y-%m-%d %H:%M:%S")
+            .unwrap_or_else(|_| NaiveDateTime::default());
+        let date_b = NaiveDateTime::parse_from_str(&b.session_date, "%Y-%m-%d %H:%M:%S")
+            .unwrap_or_else(|_| NaiveDateTime::default());
+        date_b.cmp(&date_a) // sort newest first
+    });
+
     let template = state.templates.get_template("user/training_notes")?;
     let rendered = template.render(context! { user_info, training_records })?;
     Ok(Html(rendered).into_response())