diff --git a/public/temp/AR01_Late Start Report.xlsx b/public/temp/AR01_Late Start Report.xlsx index 24da97f..f93a8e8 100644 Binary files a/public/temp/AR01_Late Start Report.xlsx and b/public/temp/AR01_Late Start Report.xlsx differ diff --git a/public/temp/AR02_Delay Report.xlsx b/public/temp/AR02_Delay Report.xlsx index a8c53a8..4db1f65 100644 Binary files a/public/temp/AR02_Delay Report.xlsx and b/public/temp/AR02_Delay Report.xlsx differ diff --git a/public/temp/AR03_Resource Overconsumption.xlsx b/public/temp/AR03_Resource Overconsumption.xlsx index f021fbc..013c31c 100644 Binary files a/public/temp/AR03_Resource Overconsumption.xlsx and b/public/temp/AR03_Resource Overconsumption.xlsx differ diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx index db5b544..53dbb5c 100644 --- a/src/components/NavigationContent/NavigationContent.tsx +++ b/src/components/NavigationContent/NavigationContent.tsx @@ -103,8 +103,8 @@ const navigationItems: NavigationItem[] = [ {icon: , label:"Delay Report", path: "/analytics/DelayReport"}, {icon: , label:"Resource Overconsumption Report", path: "/analytics/ResourceOverconsumptionReport"}, {icon: , label:"Cost and Expense Report", path: "/analytics/CostandExpenseReport"}, - {icon: , label:"Completion Report", path: "/analytics/CompletionReport"}, - {icon: , label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/CompletionReportWO"}, + {icon: , label:"Completion Report", path: "/analytics/ProjectCompletionReport"}, + {icon: , label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/ProjectCompletionReportWO"}, ], }, { diff --git a/src/components/Report/DelayReportGen/DelayReportGen.tsx b/src/components/Report/DelayReportGen/DelayReportGen.tsx index 4155613..8f8b10d 100644 --- a/src/components/Report/DelayReportGen/DelayReportGen.tsx +++ b/src/components/Report/DelayReportGen/DelayReportGen.tsx @@ -16,8 +16,8 @@ const ProgressByClientSearch: React.FC = ({ projects }) => { const searchCriteria: Criterion[] = useMemo( () => [ - { label: "Team", paramName: "team", type: "text" }, - { label: "Client", paramName: "client", type: "text" }, + { label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] }, + { label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] }, { label: "Status", paramName: "status", type: "select", options: ["Delayed", "Potential Delay"] }, // { // label: "Status", diff --git a/src/components/Report/LateStartReportGen/LateStartReportGen.tsx b/src/components/Report/LateStartReportGen/LateStartReportGen.tsx index 81ff1a0..2fca827 100644 --- a/src/components/Report/LateStartReportGen/LateStartReportGen.tsx +++ b/src/components/Report/LateStartReportGen/LateStartReportGen.tsx @@ -5,6 +5,9 @@ import SearchBox, { Criterion } from "../../ReportSearchBox"; import { useTranslation } from "react-i18next"; import { LateStart } from "@/app/api/report"; //import { DownloadReportButton } from './DownloadReportButton'; +import axios from 'axios'; +import { apiPath } from '../../../auth/utils'; +//import { GET_QC_CATEGORY_COMBO } from 'utils/ApiPathConst'; interface Props { projects: LateStart[]; } @@ -13,11 +16,19 @@ type SearchParamNames = keyof SearchQuery; const ProgressByClientSearch: React.FC = ({ projects }) => { const { t } = useTranslation("projects"); - + // const [teamCombo, setteamCombo] = useState([]); + // const getteamCombo = () => { + // axios.get(`${apiPath}${GET_QC_CATEGORY_COMBO}`) + // .then(response => { + // setteamCombo(response.data.records)}) + // .catch(error => { + // console.error('Error fetching data: ', error); + // }); + // } const searchCriteria: Criterion[] = useMemo( () => [ - { label: "Team", paramName: "team", type: "text" }, - { label: "Client", paramName: "client", type: "text" }, + { label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] }, + { label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] }, { label: "Remained Date From", label2: "Remained Date To", diff --git a/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx b/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx index 9d527a3..0faf37e 100644 --- a/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx +++ b/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx @@ -16,8 +16,8 @@ const ProgressByClientSearch: React.FC = ({ projects }) => { const searchCriteria: Criterion[] = useMemo( () => [ - { label: "Team", paramName: "team", type: "text" }, - { label: "Client", paramName: "client", type: "text" }, + { label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] }, + { label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] }, { label: "Status", paramName: "status", type: "select", options: ["Overconsumption", "Potential Overconsumption"] }, // { // label: "Status",