diff --git a/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx b/src/scenes/Dashboard/ProgressReportsWidget/ProgressReportsGrid.tsx index 4ec5f2083..08db2da3b 100644 --- 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 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 {