From 50366617436ca3eff57653c431b4fd2f8478cde9 Mon Sep 17 00:00:00 2001 From: leoho2fi Date: Tue, 23 Apr 2024 16:31:05 +0800 Subject: [PATCH] bug fix --- public/temp/AR01_Late Start Report.xlsx | Bin 12958 -> 12554 bytes public/temp/AR02_Delay Report.xlsx | Bin 13358 -> 13279 bytes .../temp/AR03_Resource Overconsumption.xlsx | Bin 12888 -> 12894 bytes .../NavigationContent/NavigationContent.tsx | 4 ++-- .../Report/DelayReportGen/DelayReportGen.tsx | 4 ++-- .../LateStartReportGen/LateStartReportGen.tsx | 17 ++++++++++++++--- .../ResourceOverconsumptionReportGen.tsx | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/public/temp/AR01_Late Start Report.xlsx b/public/temp/AR01_Late Start Report.xlsx index 24da97fdaf261701fcfd8b1110216245b4c543b3..f93a8e842ea0da6248e63191919f85f9df773f62 100644 GIT binary patch delta 3029 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 delta 2635 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 Z;4u{exRdrVJ^?+GH8LXx94`O>008GTP_qC4 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",