Merge pull request #1607 from SeedCompany/0213-Dashboard-Filter-Sort-…

…By-Progress
SeedCompany · Oct 16, 2024 · 3fea8f9 · 3fea8f9
2 parents 4b9443a + 7298a4c
commit 3fea8f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx
@@ -92,11 +92,12 @@ export const ProgressReportsColumnMap = {
     valueGetter: (_, row) => row.status.value,
   },
   scheduleStatus: {
+    field: 'cumulativeSummary.scheduleStatus',
     headerName: 'Progress',
-    ...enumColumn(ScheduleStatusList, ScheduleStatusLabels),
-    sortable: false,
-    filterable: false,
-    valueGetter: (_, row) => row.varianceExplanation.scheduleStatus,
+    ...enumColumn(ScheduleStatusList, ScheduleStatusLabels, {
+      orderByIndex: true,
+    }),
+    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
@@ -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 {