From 43f922df63d8930239090d4ee8f9b71b84a22435 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Tue, 9 Jul 2024 15:16:06 +0800
Subject: [PATCH] update timesheet

---
 src/components/LeaveTable/LeaveEditModal.tsx        |  9 ++++++++-
 src/components/PastEntryCalendar/PastEntryList.tsx  | 13 ++++++++++++-
 .../TimesheetTable/TimesheetEditModal.tsx           |  9 ++++++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/LeaveTable/LeaveEditModal.tsx b/src/components/LeaveTable/LeaveEditModal.tsx
index d5ac79c..150d617 100644
--- a/src/components/LeaveTable/LeaveEditModal.tsx
+++ b/src/components/LeaveTable/LeaveEditModal.tsx
@@ -6,7 +6,7 @@ import {
 } from "@/app/api/timesheets/utils";
 import { shortDateFormatter } from "@/app/utils/formatUtil";
 import { roundToNearestQuarter } from "@/app/utils/manhourUtils";
-import { Check, Delete } from "@mui/icons-material";
+import { Check, Delete, Close } from "@mui/icons-material";
 import {
   Box,
   Button,
@@ -173,6 +173,13 @@ const LeaveEditModal: React.FC<Props> = ({
               {t("Delete")}
             </Button>
           )}
+          <Button
+            variant="outlined"
+            startIcon={<Close />}
+            onClick={(event) => closeHandler(event, "backdropClick")}
+          >
+            {t("Close")}
+          </Button>
           <Button
             variant="contained"
             startIcon={<Check />}
diff --git a/src/components/PastEntryCalendar/PastEntryList.tsx b/src/components/PastEntryCalendar/PastEntryList.tsx
index fe16172..35fbb3c 100644
--- a/src/components/PastEntryCalendar/PastEntryList.tsx
+++ b/src/components/PastEntryCalendar/PastEntryList.tsx
@@ -2,7 +2,7 @@ import {
   RecordTimesheetInput,
   RecordLeaveInput,
 } from "@/app/api/timesheets/actions";
-import { shortDateFormatter } from "@/app/utils/formatUtil";
+import { manhourFormatter, shortDateFormatter } from "@/app/utils/formatUtil";
 import { Box, Stack, Typography } from "@mui/material";
 import dayjs from "dayjs";
 import React, { useMemo } from "react";
@@ -28,6 +28,7 @@ const PastEntryList: React.FC<Props> = ({
   allProjects,
 }) => {
   const {
+    t,
     i18n: { language },
   } = useTranslation("home");
 
@@ -93,6 +94,16 @@ const PastEntryList: React.FC<Props> = ({
             leaveTypeMap={leaveTypeMap}
           />
         ))}
+        <Typography
+          variant="overline"
+        >
+          {t("Total Work Hours")}: {manhourFormatter.format(timeEntries.map(entry => (entry.inputHours ?? 0) + (entry.otHours ?? 0)).reduce((acc, cur) => { return acc + cur }, 0))}
+        </Typography>
+        <Typography
+          variant="overline"
+        >
+          {t("Total Leave Hours")}: {manhourFormatter.format(leaveEntries.map(entry => entry.inputHours).reduce((acc, cur) => { return acc + cur }, 0))}
+        </Typography>
       </Box>
     </Stack>
   );
diff --git a/src/components/TimesheetTable/TimesheetEditModal.tsx b/src/components/TimesheetTable/TimesheetEditModal.tsx
index e41b207..bfec0ef 100644
--- a/src/components/TimesheetTable/TimesheetEditModal.tsx
+++ b/src/components/TimesheetTable/TimesheetEditModal.tsx
@@ -1,5 +1,5 @@
 import { TimeEntry } from "@/app/api/timesheets/actions";
-import { Check, Delete } from "@mui/icons-material";
+import { Check, Delete, Close } from "@mui/icons-material";
 import {
   Box,
   Button,
@@ -297,6 +297,13 @@ const TimesheetEditModal: React.FC<Props> = ({
               {t("Delete")}
             </Button>
           )}
+          <Button
+            variant="outlined"
+            startIcon={<Close />}
+            onClick={(event) => closeHandler(event, "backdropClick")}
+          >
+            {t("Close")}
+          </Button>
           <Button
             variant="contained"
             startIcon={<Check />}