diff --git a/vzdv-site/src/endpoints/admin.rs b/vzdv-site/src/endpoints/admin.rs index ccf146a..98ba260 100644 --- a/vzdv-site/src/endpoints/admin.rs +++ b/vzdv-site/src/endpoints/admin.rs @@ -14,7 +14,7 @@ use axum::{ routing::{delete, get, post}, Form, Router, }; -use chrono::{Months, Utc}; +use chrono::{DateTime, Months, Utc}; use log::{debug, error, info, warn}; use minijinja::{context, Environment}; use reqwest::StatusCode; @@ -789,9 +789,10 @@ async fn page_activity_report_generate( session: Session, ) -> Result { #[derive(Serialize)] - struct CidAndName { + struct BasicInfo { cid: u32, name: String, + join_date: Option>, home: bool, minutes_online: u32, } @@ -842,13 +843,13 @@ async fn page_activity_report_generate( acc }); - let rated_violations: Vec = controllers + let rated_violations: Vec = controllers .iter() .filter(|controller| { controller.rating > ControllerRating::OBS.as_id() && activity_map.get(&controller.cid).unwrap_or(&0) < &180 }) - .map(|controller| CidAndName { + .map(|controller| BasicInfo { cid: controller.cid, name: format!( "{} {} ({})", @@ -859,12 +860,13 @@ async fn page_activity_report_generate( None => "??", } ), + join_date: controller.join_date, home: controller.home_facility == "ZDV", minutes_online: *activity_map.get(&controller.cid).unwrap_or(&0), }) .collect(); - let mut unrated_violations: Vec = Vec::new(); + let mut unrated_violations: Vec = Vec::new(); for controller in &controllers { if controller.rating != ControllerRating::OBS.as_id() { continue; @@ -883,7 +885,7 @@ async fn page_activity_report_generate( } }; if records.is_empty() { - unrated_violations.push(CidAndName { + unrated_violations.push(BasicInfo { cid: controller.cid, name: format!( "{} {} ({})", @@ -894,6 +896,7 @@ async fn page_activity_report_generate( None => "??", } ), + join_date: controller.join_date, home: controller.home_facility == "ZDV", minutes_online: 0, }); diff --git a/vzdv-site/templates/admin/activity_report.jinja b/vzdv-site/templates/admin/activity_report.jinja index 41b6564..8b4f58b 100644 --- a/vzdv-site/templates/admin/activity_report.jinja +++ b/vzdv-site/templates/admin/activity_report.jinja @@ -4,6 +4,7 @@ Name Type + Join date Hours on scope @@ -13,6 +14,7 @@ {{ controller.name }} {% if controller.home %}Home{% else %}Visiting{% endif %} + {{ controller.join_date }} {{ controller.minutes_online|minutes_to_hm }} @@ -30,6 +32,7 @@ Name Type + Join date @@ -38,6 +41,7 @@ {{ controller.name }} {% if controller.home %}Home{% else %}Visiting{% endif %} + {{ controller.join_date }} diff --git a/vzdv-site/templates/changelog.jinja b/vzdv-site/templates/changelog.jinja index 4f7a93c..1ef0032 100644 --- a/vzdv-site/templates/changelog.jinja +++ b/vzdv-site/templates/changelog.jinja @@ -20,6 +20,7 @@
  • Privacy policy page added.
  • +
  • Small changes to activity report.