Display ea type as pre ea if phase is pre ea

epictrack-api/src/api/reports/resource_forecast_report.py

@@ -335,6 +335,20 @@ def _filter_data(self, data_items):
                 return filtered_result
         return data_items
 
+    def _format_capital_investment(self, work_data):
+        """Format the capital investment"""
+        if work_data.get("capital_investment", None):
+            work_data["capital_investment"] = (
+                f"{work_data['capital_investment']:,.0f}"
+            )
+        return work_data
+
+    def _format_ea_type(self, work_data):
+        """Format the capital investment"""
+        if work_data.get("project_phase", None) == 'Pre-Early Engagement':
+            work_data["ea_type"] = 'Pre-EA'
+        return work_data
+
     def _format_data(self, data):
         """Format the data into required format"""
         response = []
@@ -347,11 +361,9 @@ def _format_data(self, data):
             work_data["responsible_epd"] = responsible_epd
             work_data["work_lead"] = work_lead
             work_data["work_team_members"] = "; ".join(staffs)
-            if work_data.get("capital_investment", None):
-                work_data["capital_investment"] = (
-                    f"{work_data['capital_investment']:,.0f}"
-                )
+            work_data = self._format_capital_investment(work_data)
             work_data = self._handle_months(work_data)
+            work_data = self._format_ea_type(work_data)
             response.append(work_data)
         return response
 

epictrack-web/src/components/reports/resourceForecast/ResourceForecast.tsx

@@ -18,7 +18,6 @@ import {
 } from "material-react-table";
 import { json2csv } from "json-2-csv";
 import {
-  RESULT_STATUS,
   REPORT_TYPE,
   DISPLAY_DATE_FORMAT,
   COMMON_ERROR_MESSAGE,
@@ -27,15 +26,13 @@ import ReportService from "../../../services/reportService";
 import { dateUtils } from "../../../utils";
 import { ResourceForecastModel } from "./type";
 import ClearAllIcon from "@mui/icons-material/ClearAll";
-import FileDownloadIcon from "@mui/icons-material/FileDownload";
 import ReportHeader from "../shared/report-header/ReportHeader";
 import { ETPageContainer, ETParagraph, IButton } from "../../shared";
 import MasterTrackTable from "components/shared/MasterTrackTable";
 import { showNotification } from "components/shared/notificationProvider";
 import { rowsPerPageOptions } from "components/shared/MasterTrackTable/utils";
 import Icons from "components/icons";
 import { IconProps } from "components/icons/type";
-
 const DownloadIcon: React.FC<IconProps> = Icons["DownloadIcon"];
 
 export default function ResourceForecast() {
@@ -179,8 +176,8 @@ export default function ResourceForecast() {
     [rfData]
   );
 
-  const workFilter = filterFn("work_title");
   const eaTypeFilter = filterFn("ea_type");
+  const workFilter = filterFn("work_title");
   const projectPhaseFilter = filterFn("project_phase");
   const eaActFilter = filterFn("ea_act");
   const iaacFilter = filterFn("iaac");
@@ -383,9 +380,9 @@ export default function ResourceForecast() {
       setRFData([]);
     }
   }, [reportDate]);
+
   const downloadPDFReport = React.useCallback(async () => {
     try {
-      fetchReportData();
       const binaryReponse = await ReportService.downloadPDF(
         REPORT_TYPE.RESOURCE_FORECAST,
         {
@@ -412,7 +409,8 @@ export default function ResourceForecast() {
         type: "error",
       });
     }
-  }, [reportDate, filters, fetchReportData]);
+  }, [reportDate, filters]);
+
   return (
     <ETPageContainer
       direction="row"

epictrack-web/src/components/reports/resourceForecast/constants.ts

@@ -0,0 +1 @@
+export const PRE_EA_TYPE = "Pre-EA";

epictrack-web/src/components/reports/resourceForecast/type.ts

@@ -22,6 +22,7 @@ export type ResourceForecastModel = {
   type: string;
   work_id: number;
   months: Array<MonthColumn>;
+  pre_ea: boolean;
 };
 
 interface MonthColumn {