diff --git a/src/app/(main)/analytics/LastModifiedReport/page.tsx b/src/app/(main)/analytics/LastModifiedReport/page.tsx new file mode 100644 index 0000000..848b77a --- /dev/null +++ b/src/app/(main)/analytics/LastModifiedReport/page.tsx @@ -0,0 +1,28 @@ +import { Metadata } from "next"; +import { Suspense } from "react"; +import { I18nProvider, getServerI18n } from "@/i18n"; +import GenerateLastModifiedReport from "@/components/GenerateLastModifiedReport"; +import { Typography } from "@mui/material"; + +export const metadata: Metadata = { + title: "Staff Last Record Report", +}; + +const LastModifiedReport: React.FC = async () => { + const { t } = await getServerI18n("report"); + + return ( + <> + + {t("Staff Last Record Report")} + + + }> + + + + + ); +}; + +export default LastModifiedReport; diff --git a/src/app/(main)/analytics/ProjectManhourSummaryReport/page.tsx b/src/app/(main)/analytics/ProjectManhourSummaryReport/page.tsx index 28cf20d..d1f9cf5 100644 --- a/src/app/(main)/analytics/ProjectManhourSummaryReport/page.tsx +++ b/src/app/(main)/analytics/ProjectManhourSummaryReport/page.tsx @@ -6,7 +6,7 @@ import { Typography } from "@mui/material"; import GenerateProjectManhourSummaryReport from "@/components/GenerateProjectManhourSummaryReport"; export const metadata: Metadata = { - title: "Project Manhour Summary Report", + title: "Project Manhour Summary Monthly Report", }; const ProjectManhourSummaryReport: React.FC = async () => { @@ -15,7 +15,7 @@ const ProjectManhourSummaryReport: React.FC = async () => { return ( <> - {t("Project Manhour Summary Report")} + {t("Project Manhour Summary Monthly Report")} }> diff --git a/src/app/(main)/analytics/ProjectMonthlyReport/page.tsx b/src/app/(main)/analytics/ProjectMonthlyReport/page.tsx index 149b7df..bb2045e 100644 --- a/src/app/(main)/analytics/ProjectMonthlyReport/page.tsx +++ b/src/app/(main)/analytics/ProjectMonthlyReport/page.tsx @@ -5,7 +5,7 @@ import GenerateProjectMonthlyReport from "@/components/GenerateProjectMonthlyRep import { Typography } from "@mui/material"; export const metadata: Metadata = { - title: "Staff Monthly Work Hours Analysis Report", + title: "Project Manhour Summary Daily Report", }; const ProjectMonthlyReport: React.FC = async () => { @@ -14,7 +14,7 @@ const ProjectMonthlyReport: React.FC = async () => { return ( <> - {t("Staff Monthly Work Hours Analysis Report")} + {t("Project Manhour Summary Daily Report")} }> diff --git a/src/app/api/reports/actions.ts b/src/app/api/reports/actions.ts index c4fe1cd..60908b4 100644 --- a/src/app/api/reports/actions.ts +++ b/src/app/api/reports/actions.ts @@ -1,7 +1,7 @@ "use server"; import { serverFetchBlob } from "@/app/utils/fetchUtil"; -import { MonthlyWorkHoursReportRequest, ProjectCashFlowReportRequest, LateStartReportRequest, ProjectResourceOverconsumptionReportRequest, ProjectPandLReportRequest, ProjectCompletionReportRequest, ProjectPotentialDelayReportRequest, CostAndExpenseReportRequest, CrossTeamChargeReportRequest, ProjectManhourSummaryReportRequest, ProjectMonthlyReportRequest } from "."; +import { MonthlyWorkHoursReportRequest, ProjectCashFlowReportRequest, LateStartReportRequest, ProjectResourceOverconsumptionReportRequest, ProjectPandLReportRequest, ProjectCompletionReportRequest, ProjectPotentialDelayReportRequest, CostAndExpenseReportRequest, CrossTeamChargeReportRequest, ProjectManhourSummaryReportRequest, ProjectMonthlyReportRequest, LastModifiedReportRequest } from "."; import { BASE_API_URL } from "@/config/api"; export interface FileResponse { @@ -163,3 +163,16 @@ export const fetchProjectMonthlyReport = async (data: ProjectMonthlyReportReques return reportBlob }; + +export const fetchLastModifiedReport = async (data: LastModifiedReportRequest) => { + const reportBlob = await serverFetchBlob( + `${BASE_API_URL}/reports/gen-staff-last-record-report`, + { + method: "POST", + body: JSON.stringify(data), + headers: { "Content-Type": "application/json" }, + }, + ); + + return reportBlob +}; diff --git a/src/app/api/reports/index.ts b/src/app/api/reports/index.ts index 07f55fb..109da96 100644 --- a/src/app/api/reports/index.ts +++ b/src/app/api/reports/index.ts @@ -147,4 +147,12 @@ export interface ProjectMonthlyReportRequest { export interface ProjectMonthlyReportFilter { projects: string[]; date: string; +} + +export interface LastModifiedReportFilter { + date: string; +} + +export interface LastModifiedReportRequest { + dateString: string; } \ No newline at end of file diff --git a/src/components/Breadcrumb/Breadcrumb.tsx b/src/components/Breadcrumb/Breadcrumb.tsx index b6e608d..20804ac 100644 --- a/src/components/Breadcrumb/Breadcrumb.tsx +++ b/src/components/Breadcrumb/Breadcrumb.tsx @@ -74,6 +74,9 @@ const pathToLabelMap: { [path: string]: string } = { "/analytics/FinancialStatusReport": "Financial Status Report", "/analytics/ProjectCashFlowReport": "Project Cash Flow Report", "/analytics/StaffMonthlyWorkHoursAnalysisReport": "Staff Monthly Work Hours Analysis Report", + "/analytics/ProjectManhourSummaryReport": "Project Manhour Summary Monthly Report", + "/analytics/ProjectMonthlyReport": "Project Manhour Summary Daily Report", + "/analytics/LastModifiedReport": "Staff Last Record Report", "/analytics/CrossTeamChargeReport": "Cross Team Charge Report", "/invoice": "Invoice", }; diff --git a/src/components/GenerateLastModifiedReport/GenerateLastModifiedReport.tsx b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReport.tsx new file mode 100644 index 0000000..6181b3b --- /dev/null +++ b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReport.tsx @@ -0,0 +1,74 @@ +"use client"; +import React, { useMemo } from "react"; +import SearchBox, { Criterion } from "../SearchBox"; +import { useTranslation } from "react-i18next"; +import { ProjectResult } from "@/app/api/projects"; +import { + fetchLastModifiedReport, +} from "@/app/api/reports/actions"; +import { downloadFile } from "@/app/utils/commonUtil"; +import { LastModifiedReportFilter } from "@/app/api/reports"; + + +import dayjs from "dayjs"; +import { getPublicHolidaysForNYears } from "@/app/utils/holidayUtils"; + +interface Props { + projects: ProjectResult[]; + companyHolidays: String[]; +} + +type SearchQuery = Partial>; +type SearchParamNames = keyof SearchQuery; + +const GenerateLastModifiedReport: React.FC = ({ projects, companyHolidays }) => { + const { t } = useTranslation("report"); + const projectCombo = projects.map((project) => ({label: `${project.code} - ${project.name}`, value: project.id})) + console.log(companyHolidays) + + const searchCriteria: Criterion[] = useMemo( + () => [ + { + label: t("Date"), + paramName: "date", + type: "date", + }, + ], + [t] + ); + + return ( + <> + { + + console.log(query); + const yearNeeded = parseInt(dayjs(query.date).format("YYYY")) + const holidayList: String[] = [...getPublicHolidaysForNYears(1, yearNeeded).map((item) => dayjs(item.date).format("DD/MM/YYYY")), ...companyHolidays] + const uniqueHoliday = holidayList.filter((value, index, arr) => index === arr.indexOf(value)); + + let postData = { + dateString: dayjs().format("YYYY-MM-DD").toString(), + holidays: uniqueHoliday + }; + console.log(query.date.length > 0) + if (query.date.length > 0) { + postData.dateString = query.date + } + console.log(postData) + const response = await fetchLastModifiedReport(postData); + if (response) { + downloadFile( + new Uint8Array(response.blobValue), + response.filename!! + ); + } + }} + /> + + ); +}; + +export default GenerateLastModifiedReport; diff --git a/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportLoading.tsx b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportLoading.tsx new file mode 100644 index 0000000..46c0696 --- /dev/null +++ b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportLoading.tsx @@ -0,0 +1,38 @@ +import Card from "@mui/material/Card"; +import CardContent from "@mui/material/CardContent"; +import Skeleton from "@mui/material/Skeleton"; +import Stack from "@mui/material/Stack"; +import React from "react"; + +// Can make this nicer +export const GenerateLastModifiedReportLoading: React.FC = () => { + return ( + <> + + + + + + + + + + + + + + + + + + + + ); +}; + +export default GenerateLastModifiedReportLoading; \ No newline at end of file diff --git a/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportWrapper.tsx b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportWrapper.tsx new file mode 100644 index 0000000..aa7709c --- /dev/null +++ b/src/components/GenerateLastModifiedReport/GenerateLastModifiedReportWrapper.tsx @@ -0,0 +1,38 @@ +import React from "react"; +import GenerateLastModifiedReportLoading from "./GenerateLastModifiedReportLoading"; +import GenerateLastModifiedReport from "./GenerateLastModifiedReport"; +import { fetchStaff } from "@/app/api/staff"; +import { getServerSession } from "next-auth"; +import { authOptions } from "@/config/authConfig"; +import { TEAM_LEAD } from "@/middleware"; +import { fetchHolidays } from "@/app/api/holidays"; +import { convertDateArrayToString } from "@/app/utils/formatUtil"; +import { fetchProjects } from "@/app/api/projects"; +interface SubComponents { + Loading: typeof GenerateLastModifiedReportLoading; +} + +const GenerateLastModifiedReportWrapper: React.FC & + SubComponents = async () => { + const session: any = await getServerSession(authOptions); + const teamId = session.staff?.teamId; + const role = session.role; + + const companyHolidays = await fetchHolidays() + let companyHolidaysList: String[] = [] + if (companyHolidays.length > 0) { + companyHolidaysList = companyHolidays.map(item => convertDateArrayToString(item.date, "DD/MM/YYYY")) as String[] + } + console.log(companyHolidaysList) + let projects = await fetchProjects(); + + if (role.includes(TEAM_LEAD)) { + projects = projects.filter((project) => project.teamId === teamId); + } + + return ; +}; + +GenerateLastModifiedReportWrapper.Loading = GenerateLastModifiedReportLoading; + +export default GenerateLastModifiedReportWrapper; diff --git a/src/components/GenerateLastModifiedReport/index.ts b/src/components/GenerateLastModifiedReport/index.ts new file mode 100644 index 0000000..28e8594 --- /dev/null +++ b/src/components/GenerateLastModifiedReport/index.ts @@ -0,0 +1 @@ +export { default } from "./GenerateLastModifiedReportWrapper"; \ No newline at end of file diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx index d4801f6..d42e3b3 100644 --- a/src/components/NavigationContent/NavigationContent.tsx +++ b/src/components/NavigationContent/NavigationContent.tsx @@ -338,7 +338,11 @@ const NavigationContent: React.FC = ({ abilities, username }) => { abilities!.includes(ability), ), }, - + { + icon: , + label: "Last Modified Report", + path: "/analytics/LastModifiedReport", + }, ], }, { diff --git a/src/components/SearchBox/SearchBox.tsx b/src/components/SearchBox/SearchBox.tsx index 872e540..d9069d9 100644 --- a/src/components/SearchBox/SearchBox.tsx +++ b/src/components/SearchBox/SearchBox.tsx @@ -72,13 +72,18 @@ interface NumberCriterion extends BaseCriterion { type: "number"; } +interface DateCriterion extends BaseCriterion { + type: "date"; +} + export type Criterion = | TextCriterion | SelectCriterion | AutocompleteCriterion | DateRangeCriterion | MonthYearCriterion - | NumberCriterion; + | NumberCriterion + | DateCriterion; interface Props { criteria: Criterion[]; @@ -118,6 +123,9 @@ function SearchBox({ case "monthYear": defaultValue = dayjs().format("YYYY-MM") break; + case "date": + defaultValue = dayjs().format("YYYY-MM-DD") + break; } return { @@ -185,6 +193,13 @@ function SearchBox({ }; }, []); + const makeSingleDateChangeHandler = useCallback((paramName: T) => { + return (e: any) => { + console.log(dayjs(e).format("YYYY-MM-DD")); + setInputs((i) => ({ ...i, [paramName]: dayjs(e).format("YYYY-MM-DD") })); + }; + }, []); + const makeDateToChangeHandler = useCallback((paramName: T, needMonth?: boolean) => { return (e: any) => { if (needMonth) { @@ -383,7 +398,7 @@ function SearchBox({ value={inputs[c.paramName] && parseFloat(inputs[c.paramName])} /> )} - {c.type === "monthYear" && ( + {(c.type === "monthYear" || c.type === "date") && ( ({