Explorar el Código

Merge branch 'main' of https://git.2fi-solutions.com/wayne.lee/tsms

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui hace 1 año
padre
commit
3786402cd0
Se han modificado 19 ficheros con 10 adiciones y 10 borrados
  1. +4
    -4
      src/app/api/report6/index.ts
  2. +1
    -1
      src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx
  3. +1
    -1
      src/components/Report/DelayReportGen/DelayReportGen.tsx
  4. +1
    -1
      src/components/Report/LateStartReportGen/LateStartReportGen.tsx
  5. +1
    -1
      src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx
  6. +1
    -1
      src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx
  7. +0
    -0
      src/components/Report/ReportSearchBox/SearchBox.tsx
  8. +0
    -0
      src/components/Report/ReportSearchBox/index.ts
  9. +0
    -0
      src/components/Report/ReportSearchBox2/SearchBox2.tsx
  10. +0
    -0
      src/components/Report/ReportSearchBox2/index.ts
  11. +0
    -0
      src/components/Report/ReportSearchBox3/SearchBox3.tsx
  12. +0
    -0
      src/components/Report/ReportSearchBox3/index.ts
  13. +0
    -0
      src/components/Report/ReportSearchBox4/SearchBox4.tsx
  14. +0
    -0
      src/components/Report/ReportSearchBox4/index.ts
  15. +0
    -0
      src/components/Report/ReportSearchBox5/SearchBox5.tsx
  16. +0
    -0
      src/components/Report/ReportSearchBox5/index.ts
  17. +0
    -0
      src/components/Report/ReportSearchBox6/SearchBox6.tsx
  18. +0
    -0
      src/components/Report/ReportSearchBox6/index.ts
  19. +1
    -1
      src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx

+ 4
- 4
src/app/api/report6/index.ts Ver fichero

@@ -1,7 +1,7 @@
//src\app\api\report\index.ts //src\app\api\report\index.ts
import { cache } from "react"; import { cache } from "react";


export interface ProjectClaims {
export interface ProjectCompletionWO {
id: number; id: number;
projectCode: string; projectCode: string;
projectName: string; projectName: string;
@@ -17,14 +17,14 @@ export interface ProjectClaims {
} }


export const preloadProjects = () => { export const preloadProjects = () => {
fetchProjectsProjectClaims();
fetchProjectsProjectCompletionWO();
}; };


export const fetchProjectsProjectClaims = cache(async () => {
export const fetchProjectsProjectCompletionWO = cache(async () => {
return mockProjects; return mockProjects;
}); });


const mockProjects: ProjectClaims[] = [
const mockProjects: ProjectCompletionWO[] = [
{ {
id: 1, id: 1,
projectCode: "CUST-001", projectCode: "CUST-001",


+ 1
- 1
src/components/Report/CostandExpenseReportGen/CostandExpenseReportGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox4";
import SearchBox, { Criterion } from "../ReportSearchBox4";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { CostandExpense } from "@/app/api/report4"; import { CostandExpense } from "@/app/api/report4";




+ 1
- 1
src/components/Report/DelayReportGen/DelayReportGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox2";
import SearchBox, { Criterion } from "../ReportSearchBox2";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Delay } from "@/app/api/report2"; import { Delay } from "@/app/api/report2";
//import { DownloadReportButton } from './DownloadReportButton'; //import { DownloadReportButton } from './DownloadReportButton';


+ 1
- 1
src/components/Report/LateStartReportGen/LateStartReportGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox";
import SearchBox, { Criterion } from "../ReportSearchBox";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { LateStart } from "@/app/api/report"; import { LateStart } from "@/app/api/report";
//import { DownloadReportButton } from './DownloadReportButton'; //import { DownloadReportButton } from './DownloadReportButton';


+ 1
- 1
src/components/Report/ProjectCompletionReportGen/ProjectCompletionReportGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox5";
import SearchBox, { Criterion } from "../ReportSearchBox5";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ProjectCompletion } from "@/app/api/report5"; import { ProjectCompletion } from "@/app/api/report5";
//import { DownloadReportButton } from './DownloadReportButton'; //import { DownloadReportButton } from './DownloadReportButton';


+ 1
- 1
src/components/Report/ProjectCompletionReportWOGen/ProjectCompletionReportWOGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox6";
import SearchBox, { Criterion } from "../ReportSearchBox6";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ProjectCompletionWO } from "@/app/api/report6"; import { ProjectCompletionWO } from "@/app/api/report6";
//import { DownloadReportButton } from './DownloadReportButton'; //import { DownloadReportButton } from './DownloadReportButton';


src/components/ReportSearchBox/SearchBox.tsx → src/components/Report/ReportSearchBox/SearchBox.tsx Ver fichero


src/components/ReportSearchBox/index.ts → src/components/Report/ReportSearchBox/index.ts Ver fichero


src/components/ReportSearchBox2/SearchBox2.tsx → src/components/Report/ReportSearchBox2/SearchBox2.tsx Ver fichero


src/components/ReportSearchBox2/index.ts → src/components/Report/ReportSearchBox2/index.ts Ver fichero


src/components/ReportSearchBox3/SearchBox3.tsx → src/components/Report/ReportSearchBox3/SearchBox3.tsx Ver fichero


src/components/ReportSearchBox3/index.ts → src/components/Report/ReportSearchBox3/index.ts Ver fichero


src/components/ReportSearchBox4/SearchBox4.tsx → src/components/Report/ReportSearchBox4/SearchBox4.tsx Ver fichero


src/components/ReportSearchBox4/index.ts → src/components/Report/ReportSearchBox4/index.ts Ver fichero


src/components/ReportSearchBox5/SearchBox5.tsx → src/components/Report/ReportSearchBox5/SearchBox5.tsx Ver fichero


src/components/ReportSearchBox5/index.ts → src/components/Report/ReportSearchBox5/index.ts Ver fichero


src/components/ReportSearchBox6/SearchBox6.tsx → src/components/Report/ReportSearchBox6/SearchBox6.tsx Ver fichero


src/components/ReportSearchBox6/index.ts → src/components/Report/ReportSearchBox6/index.ts Ver fichero


+ 1
- 1
src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx Ver fichero

@@ -1,7 +1,7 @@
//src\components\LateStartReportGen\LateStartReportGen.tsx //src\components\LateStartReportGen\LateStartReportGen.tsx
"use client"; "use client";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import SearchBox, { Criterion } from "../../ReportSearchBox3";
import SearchBox, { Criterion } from "../ReportSearchBox3";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { ResourceOverconsumption } from "@/app/api/report3"; import { ResourceOverconsumption } from "@/app/api/report3";




Cargando…
Cancelar
Guardar