From 1bb42074bfa730b25dede196f00581bf0f25557b Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Thu, 13 Jun 2024 14:25:43 +0800 Subject: [PATCH] reports update --- .../ProjectCompletionReport.tsx | 17 +++++++---------- .../ResourceOverconsumptionReport.tsx | 3 +-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/components/ProjectCompletionReport/ProjectCompletionReport.tsx b/src/components/ProjectCompletionReport/ProjectCompletionReport.tsx index 5b916ac..6859910 100644 --- a/src/components/ProjectCompletionReport/ProjectCompletionReport.tsx +++ b/src/components/ProjectCompletionReport/ProjectCompletionReport.tsx @@ -53,7 +53,7 @@ const ProjectCompletionReport: React.FC = ( criteria={searchCriteria} onSearch={async (query: any) => { let postData: ProjectCompletionReportRequest = { - startDate: "", + startDate: "1900-01-01", endDate: dayjs().format(INPUT_DATE_FORMAT).toString(), outstanding: query.outstanding && query.outstanding === "Outstanding Accounts Receivable" }; @@ -63,16 +63,13 @@ const ProjectCompletionReport: React.FC = ( if (teamId) { postData.teamId = teamId } - // check if start date exist - if (query.startDate.length === 0) { - setError(t("Start Date cant be empty")); - } else { + if (query.startDateFrom && query.startDateFrom.length > 0) { postData.startDate = query.startDate; - console.log(postData) - const response = await fetchProjectCompletionReport(postData); - if (response) { - downloadFile(new Uint8Array(response.blobValue), response.filename!!); - } + } + console.log(postData) + const response = await fetchProjectCompletionReport(postData); + if (response) { + downloadFile(new Uint8Array(response.blobValue), response.filename!!); } }} /> diff --git a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx index 36d4a6d..06d0b62 100644 --- a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx +++ b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx @@ -24,8 +24,7 @@ type SearchParamNames = keyof SearchQuery; const ResourceOverconsumptionReport: React.FC = ({ team, customer, subsidiaries, needAll }) => { const { t } = useTranslation("report"); - console.log(customer) - const statusCombo = ["Overconsumption", "Potential Overconsumption"] + const statusCombo = ["Potential Overconsumption"] const teamCombo = team.map(t => `${t.name} - ${t.code}`) const custCombo = customer.map(c => ({ value: `custId-${c.id}`,