Show rough progress indications and counts

illicitonion · illicitonion · commit e9437ac61340 · 2025-07-22T15:36:55.000+01:00
We will tune these, or may remove them, but they're maybe useful
indicators.
diff --git a/src/course.rs b/src/course.rs
@@ -316,7 +316,26 @@ pub struct TraineeWithSubmissions {
     pub modules: IndexMap<String, ModuleWithSubmissions>,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+pub enum TraineeStatus {
+    OnTrack,
+    Behind,
+    AtRisk,
+}
+
 impl TraineeWithSubmissions {
+    pub fn status(&self) -> TraineeStatus {
+        let progress_score = self.progress_score();
+        // These thresholds are super arbitrary.
+        if progress_score >= 5000 {
+            TraineeStatus::OnTrack
+        } else if progress_score >= 2500 {
+            TraineeStatus::Behind
+        } else {
+            TraineeStatus::AtRisk
+        }
+    }
+
     // This whole calculation is super ad-hoc, we should feel free to tweak this whole process and these parameters however we find useful.
     pub fn progress_score(&self) -> u64 {
         let mut numerator = 0_u64;
diff --git a/src/frontend.rs b/src/frontend.rs
@@ -16,6 +16,7 @@ use crate::{
     config::CourseScheduleWithRegisterSheetId,
     course::{
         fetch_batch_metadata, get_batch, Attendance, Batch, BatchMetadata, Course, Submission,
+        TraineeStatus,
     },
     google_groups::{get_groups, groups_client, GoogleGroup},
     octocrab::octocrab,
@@ -135,7 +136,7 @@ struct TraineeBatchTemplate {
 }
 
 impl TraineeBatchTemplate {
-    fn css_classes(&self, submission: &Submission) -> String {
+    fn css_classes_for_submission(&self, submission: &Submission) -> String {
         match submission {
             Submission::Attendance(Attendance::Absent { .. }) => String::from("attendance-absent"),
             Submission::Attendance(Attendance::OnTime { .. }) => String::from("attendance-present"),
@@ -151,6 +152,32 @@ impl TraineeBatchTemplate {
             },
         }
     }
+
+    fn css_classes_for_trainee_status(&self, trainee_status: &TraineeStatus) -> String {
+        match trainee_status {
+            TraineeStatus::OnTrack => "trainee-on-track",
+            TraineeStatus::Behind => "trainee-behind",
+            TraineeStatus::AtRisk => "trainee-at-risk",
+        }
+        .to_owned()
+    }
+
+    fn on_track_and_total_for_region(&self, region: Option<&str>) -> (usize, usize) {
+        let mut on_track = 0;
+        let mut total = 0;
+        for trainee in &self.batch.trainees {
+            if let Some(region) = region {
+                if trainee.region.as_str() != region {
+                    continue;
+                }
+            }
+            if trainee.status() == TraineeStatus::OnTrack {
+                on_track += 1;
+            }
+            total += 1;
+        }
+        (on_track, total)
+    }
 }
 
 #[derive(Deserialize)]
diff --git a/src/newtypes.rs b/src/newtypes.rs
@@ -43,4 +43,8 @@ impl Region {
             chrono_tz::Europe::London
         }
     }
+
+    pub fn as_str(&self) -> &str {
+        self.0.as_str()
+    }
 }
diff --git a/templates/trainee-batch.html b/templates/trainee-batch.html
@@ -2,15 +2,20 @@
 <html>
     <head>
         <style type="text/css">
+            :root {
+                --green: #adf7c7;
+                --orange: #f8bca3;
+                --red: #ffaaaa;
+            }
             th, td {
                 border: 1px black solid;
                 background-color: white;
             }
             td.attendance-absent {
-                background-color: #ff0d0d57;
+                background-color: var(--red);
             }
             td.attendance-present {
-                background-color: rgba(68, 238, 142, 0.5);
+                background-color: var(--green);
             }
             td.attendance-late {
                 background-color: #e6f4ae;
@@ -19,21 +24,33 @@
                 background-color: grey;
             }
             td.pr-missing {
-                background-color: #ff0d0d57;
+                background-color: var(--red);
             }
             td.pr-complete {
-                background-color: rgba(68, 238, 142, 0.5);
+                background-color: var(--green);
             }
             td.pr-reviewed {
-                background-color: #ee784480;
+                background-color: var(--orange);
             }
             td.pr-needs-review {
-                background-color: #ee784480;
+                background-color: var(--orange);
             }
             td.pr-unknown {
                 background-color: grey;
             }
 
+            .trainee-on-track {
+                background-color: var(--green);
+            }
+
+            .trainee-behind {
+                background-color: var(--orange);
+            }
+
+            .trainee-at-risk {
+                background-color: var(--red);
+            }
+
             table {
                 border-spacing: 0px;
             }
@@ -57,9 +74,11 @@
     </head>
     <body>
         <h1>{{ course.name }} - {{ batch.name }}</h1>
-        <button id="regions-filter-all">All Regions</button>
+        {% set (global_on_track, global_total) = on_track_and_total_for_region(None) %}
+        <button id="regions-filter-all">All Regions ({{ global_on_track }} / {{ global_total }})</button>
         {% for region in batch.all_regions() %}
-            <input type="checkbox" checked="checked" name="region-checkbox" value="{{ region }}" /> {{ region }}
+            {% set (on_track, total) = on_track_and_total_for_region(Some(region.as_str())) %}
+            <input type="checkbox" checked="checked" name="region-checkbox" value="{{ region }}" /> {{ region }} ({{ on_track }} / {{ total }})
         {% endfor %}
         <button id="regions-filter-none">No Regions</button>
         <table>
@@ -95,14 +114,14 @@ <h1>{{ course.name }} - {{ batch.name }}</h1>
             <tbody>
                 {% for trainee in batch.trainees %}
                     <tr>
-                        <th>{{ trainee.name }} - <a href="https://github.com/{{trainee.github_login}}">@{{ trainee.github_login }}</a> - {{ trainee.email }}</th>
+                        <th class="{{ css_classes_for_trainee_status(&trainee.status()) }}">{{ trainee.name }} - <a href="https://github.com/{{trainee.github_login}}">@{{ trainee.github_login }}</a> - {{ trainee.email }} - {{ trainee.progress_score() / 100 }}%</th>
                         <td>{{ trainee.region }}</td>
                         {% for (module_name, module) in trainee.modules %}
                             {% for sprint in module.sprints %}
                                 {% for submission in sprint.submissions %}
                                     {% match submission %}
                                         {% when crate::course::SubmissionState::Some(submission) %}
-                                        <td class="{{ css_classes(submission) }}"><a href="{{ submission.link() }}">{{ submission.display_text() }}</a></td>
+                                        <td class="{{ css_classes_for_submission(submission) }}"><a href="{{ submission.link() }}">{{ submission.display_text() }}</a></td>
                                         {% when crate::course::SubmissionState::MissingButExpected(_) %}
                                         <td class="pr-missing"></td>
                                         {% when crate::course::SubmissionState::MissingButNotExpected(_) %}

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,8 @@ impl Region {`
`43`	`43`	`chrono_tz::Europe::London`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ pub fn as_str(&self) -> &str {`
	`48`	`+ self.0.as_str()`
	`49`	`+ }`
`46`	`50`	`}`