From 1ffe7f090b59877e1de89028337e1745b8ec45a3 Mon Sep 17 00:00:00 2001
From: Andre Turner <andre_turner@tsco.org>
Date: Tue, 15 Oct 2024 13:58:13 -0500
Subject: [PATCH 1/3] enabled sort and filter on progress column

---
 .../Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
index 4ec5f2083..1f1410af5 100644
--- a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
+++ b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
@@ -92,10 +92,11 @@ export const ProgressReportsColumnMap = {
     valueGetter: (_, row) => row.status.value,
   },
   scheduleStatus: {
+    field: 'cumulativeSummary.scheduleStatus',
     headerName: 'Progress',
     ...enumColumn(ScheduleStatusList, ScheduleStatusLabels),
-    sortable: false,
-    filterable: false,
+    sortable: true,
+    filterable: true,
     valueGetter: (_, row) => row.varianceExplanation.scheduleStatus,
   },
   cumulativeSummary: {

From f5a35cfbc0a7c699b3d30ff2abcbe67dc5147457 Mon Sep 17 00:00:00 2001
From: Carson Full <carson_full@tsco.org>
Date: Tue, 15 Oct 2024 22:11:25 -0500
Subject: [PATCH 2/3] Order schedule status options by API schema

---
 .../Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
index 1f1410af5..ac3e1e527 100644
--- a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
+++ b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
@@ -94,9 +94,9 @@ export const ProgressReportsColumnMap = {
   scheduleStatus: {
     field: 'cumulativeSummary.scheduleStatus',
     headerName: 'Progress',
-    ...enumColumn(ScheduleStatusList, ScheduleStatusLabels),
-    sortable: true,
-    filterable: true,
+    ...enumColumn(ScheduleStatusList, ScheduleStatusLabels, {
+      orderByIndex: true,
+    }),
     valueGetter: (_, row) => row.varianceExplanation.scheduleStatus,
   },
   cumulativeSummary: {

From 7298a4ca4c107c6387483193fcc85f84eb323efd Mon Sep 17 00:00:00 2001
From: Carson Full <carson_full@tsco.org>
Date: Wed, 16 Oct 2024 08:14:51 -0500
Subject: [PATCH 3/3] Display schedule status by summary numbers, not reason

The varianceExplanation reason can override the status on that object.
We probably don't want that here.
---
 .../Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx     | 2 +-
 .../ProgressReportsWidget/progressReportsDataGridRow.graphql    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
index ac3e1e527..08db2da3b 100644
--- a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
+++ b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
@@ -97,7 +97,7 @@ export const ProgressReportsColumnMap = {
     ...enumColumn(ScheduleStatusList, ScheduleStatusLabels, {
       orderByIndex: true,
     }),
-    valueGetter: (_, row) => row.varianceExplanation.scheduleStatus,
+    valueGetter: (_, row) => row.cumulativeSummary?.scheduleStatus,
   },
   cumulativeSummary: {
     headerName: 'Cumulative Progress',
diff --git a/src/scenes/Dashboard/ProgressReportsWidget/progressReportsDataGridRow.graphql b/src/scenes/Dashboard/ProgressReportsWidget/progressReportsDataGridRow.graphql
index 9125d5d18..59d08b885 100644
--- a/src/scenes/Dashboard/ProgressReportsWidget/progressReportsDataGridRow.graphql
+++ b/src/scenes/Dashboard/ProgressReportsWidget/progressReportsDataGridRow.graphql
@@ -34,7 +34,6 @@ fragment progressReportsDataGridRow on ProgressReport {
     value
   }
   varianceExplanation {
-    scheduleStatus
     reasons {
       value
     }
@@ -43,6 +42,7 @@ fragment progressReportsDataGridRow on ProgressReport {
     planned
     actual
     variance
+    scheduleStatus
   }
   teamNews {
     items {