From 355000042f778b11eafc519aac1bafc7feadedb9 Mon Sep 17 00:00:00 2001 From: leoho2fi Date: Thu, 25 Apr 2024 11:41:13 +0800 Subject: [PATCH] report update --- src/app/api/report6/index.ts | 8 ++++---- .../CostandExpenseReportGen/CostandExpenseReportGen.tsx | 2 +- src/components/Report/DelayReportGen/DelayReportGen.tsx | 2 +- .../Report/LateStartReportGen/LateStartReportGen.tsx | 2 +- .../ProjectCompletionReportGen.tsx | 2 +- .../ProjectCompletionReportWOGen.tsx | 2 +- src/components/{ => Report}/ReportSearchBox/SearchBox.tsx | 0 src/components/{ => Report}/ReportSearchBox/index.ts | 0 .../{ => Report}/ReportSearchBox2/SearchBox2.tsx | 0 src/components/{ => Report}/ReportSearchBox2/index.ts | 0 .../{ => Report}/ReportSearchBox3/SearchBox3.tsx | 0 src/components/{ => Report}/ReportSearchBox3/index.ts | 0 .../{ => Report}/ReportSearchBox4/SearchBox4.tsx | 0 src/components/{ => Report}/ReportSearchBox4/index.ts | 0 .../{ => Report}/ReportSearchBox5/SearchBox5.tsx | 0 src/components/{ => Report}/ReportSearchBox5/index.ts | 0 .../{ => Report}/ReportSearchBox6/SearchBox6.tsx | 0 src/components/{ => Report}/ReportSearchBox6/index.ts | 0 .../ResourceOverconsumptionReportGen.tsx | 2 +- 19 files changed, 10 insertions(+), 10 deletions(-) rename src/components/{ => Report}/ReportSearchBox/SearchBox.tsx (100%) rename src/components/{ => Report}/ReportSearchBox/index.ts (100%) rename src/components/{ => Report}/ReportSearchBox2/SearchBox2.tsx (100%) rename src/components/{ => Report}/ReportSearchBox2/index.ts (100%) rename src/components/{ => Report}/ReportSearchBox3/SearchBox3.tsx (100%) rename src/components/{ => Report}/ReportSearchBox3/index.ts (100%) rename src/components/{ => Report}/ReportSearchBox4/SearchBox4.tsx (100%) rename src/components/{ => Report}/ReportSearchBox4/index.ts (100%) rename src/components/{ => Report}/ReportSearchBox5/SearchBox5.tsx (100%) rename src/components/{ => Report}/ReportSearchBox5/index.ts (100%) rename src/components/{ => Report}/ReportSearchBox6/SearchBox6.tsx (100%) rename src/components/{ => Report}/ReportSearchBox6/index.ts (100%) diff --git a/src/app/api/report6/index.ts b/src/app/api/report6/index.ts index e1f2925..0df35f6 100644 --- a/src/app/api/report6/index.ts +++ b/src/app/api/report6/index.ts @@ -1,7 +1,7 @@ //src\app\api\report\index.ts import { cache } from "react"; -export interface ProjectClaims { +export interface ProjectCompletionWO { id: number; projectCode: string; projectName: string; @@ -17,14 +17,14 @@ export interface ProjectClaims { } export const preloadProjects = () => { - fetchProjectsProjectClaims(); + fetchProjectsProjectCompletionWO(); }; -export const fetchProjectsProjectClaims = cache(async () => { +export const fetchProjectsProjectCompletionWO = cache(async () => { return mockProjects; }); -const mockProjects: ProjectClaims[] = [ +const mockProjects: ProjectCompletionWO[] = [ { id: 1, projectCode: "CUST-001", diff --git a/src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx b/src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx index eea61cf..a338fc3 100644 --- a/src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx +++ b/src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox4"; +import SearchBox, { Criterion } from "../ReportSearchBox4"; import { useTranslation } from "react-i18next"; import { CostandExpense } from "@/app/api/report4"; diff --git a/src/components/Report/DelayReportGen/DelayReportGen.tsx b/src/components/Report/DelayReportGen/DelayReportGen.tsx index 8f8b10d..330435a 100644 --- a/src/components/Report/DelayReportGen/DelayReportGen.tsx +++ b/src/components/Report/DelayReportGen/DelayReportGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox2"; +import SearchBox, { Criterion } from "../ReportSearchBox2"; import { useTranslation } from "react-i18next"; import { Delay } from "@/app/api/report2"; //import { DownloadReportButton } from './DownloadReportButton'; diff --git a/src/components/Report/LateStartReportGen/LateStartReportGen.tsx b/src/components/Report/LateStartReportGen/LateStartReportGen.tsx index 2fca827..ce4f6cd 100644 --- a/src/components/Report/LateStartReportGen/LateStartReportGen.tsx +++ b/src/components/Report/LateStartReportGen/LateStartReportGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox"; +import SearchBox, { Criterion } from "../ReportSearchBox"; import { useTranslation } from "react-i18next"; import { LateStart } from "@/app/api/report"; //import { DownloadReportButton } from './DownloadReportButton'; diff --git a/src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx b/src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx index 75b12ac..9e315ca 100644 --- a/src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx +++ b/src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox5"; +import SearchBox, { Criterion } from "../ReportSearchBox5"; import { useTranslation } from "react-i18next"; import { ProjectCompletion } from "@/app/api/report5"; //import { DownloadReportButton } from './DownloadReportButton'; diff --git a/src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx b/src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx index 2942e38..60901fa 100644 --- a/src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx +++ b/src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox6"; +import SearchBox, { Criterion } from "../ReportSearchBox6"; import { useTranslation } from "react-i18next"; import { ProjectCompletionWO } from "@/app/api/report6"; //import { DownloadReportButton } from './DownloadReportButton'; diff --git a/src/components/ReportSearchBox/SearchBox.tsx b/src/components/Report/ReportSearchBox/SearchBox.tsx similarity index 100% rename from src/components/ReportSearchBox/SearchBox.tsx rename to src/components/Report/ReportSearchBox/SearchBox.tsx diff --git a/src/components/ReportSearchBox/index.ts b/src/components/Report/ReportSearchBox/index.ts similarity index 100% rename from src/components/ReportSearchBox/index.ts rename to src/components/Report/ReportSearchBox/index.ts diff --git a/src/components/ReportSearchBox2/SearchBox2.tsx b/src/components/Report/ReportSearchBox2/SearchBox2.tsx similarity index 100% rename from src/components/ReportSearchBox2/SearchBox2.tsx rename to src/components/Report/ReportSearchBox2/SearchBox2.tsx diff --git a/src/components/ReportSearchBox2/index.ts b/src/components/Report/ReportSearchBox2/index.ts similarity index 100% rename from src/components/ReportSearchBox2/index.ts rename to src/components/Report/ReportSearchBox2/index.ts diff --git a/src/components/ReportSearchBox3/SearchBox3.tsx b/src/components/Report/ReportSearchBox3/SearchBox3.tsx similarity index 100% rename from src/components/ReportSearchBox3/SearchBox3.tsx rename to src/components/Report/ReportSearchBox3/SearchBox3.tsx diff --git a/src/components/ReportSearchBox3/index.ts b/src/components/Report/ReportSearchBox3/index.ts similarity index 100% rename from src/components/ReportSearchBox3/index.ts rename to src/components/Report/ReportSearchBox3/index.ts diff --git a/src/components/ReportSearchBox4/SearchBox4.tsx b/src/components/Report/ReportSearchBox4/SearchBox4.tsx similarity index 100% rename from src/components/ReportSearchBox4/SearchBox4.tsx rename to src/components/Report/ReportSearchBox4/SearchBox4.tsx diff --git a/src/components/ReportSearchBox4/index.ts b/src/components/Report/ReportSearchBox4/index.ts similarity index 100% rename from src/components/ReportSearchBox4/index.ts rename to src/components/Report/ReportSearchBox4/index.ts diff --git a/src/components/ReportSearchBox5/SearchBox5.tsx b/src/components/Report/ReportSearchBox5/SearchBox5.tsx similarity index 100% rename from src/components/ReportSearchBox5/SearchBox5.tsx rename to src/components/Report/ReportSearchBox5/SearchBox5.tsx diff --git a/src/components/ReportSearchBox5/index.ts b/src/components/Report/ReportSearchBox5/index.ts similarity index 100% rename from src/components/ReportSearchBox5/index.ts rename to src/components/Report/ReportSearchBox5/index.ts diff --git a/src/components/ReportSearchBox6/SearchBox6.tsx b/src/components/Report/ReportSearchBox6/SearchBox6.tsx similarity index 100% rename from src/components/ReportSearchBox6/SearchBox6.tsx rename to src/components/Report/ReportSearchBox6/SearchBox6.tsx diff --git a/src/components/ReportSearchBox6/index.ts b/src/components/Report/ReportSearchBox6/index.ts similarity index 100% rename from src/components/ReportSearchBox6/index.ts rename to src/components/Report/ReportSearchBox6/index.ts diff --git a/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx b/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx index 0faf37e..a6ec216 100644 --- a/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx +++ b/src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx @@ -1,7 +1,7 @@ //src\components\LateStartReportGen\LateStartReportGen.tsx "use client"; import React, { useMemo, useState } from "react"; -import SearchBox, { Criterion } from "../../ReportSearchBox3"; +import SearchBox, { Criterion } from "../ReportSearchBox3"; import { useTranslation } from "react-i18next"; import { ResourceOverconsumption } from "@/app/api/report3";