From d9032f6f293ff863b2f9831d935a7f24d0616749 Mon Sep 17 00:00:00 2001
From: JOSEPH LE <joseph.le@apactech.io>
Date: Fri, 7 Jun 2024 17:07:59 +0700
Subject: [PATCH] update timekeeping

---
 .../src/pages/Timekeeping/Timekeeping.tsx     | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
index 00807d9..c1a09f5 100644
--- a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
+++ b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx
@@ -171,7 +171,7 @@ const Timekeeping = () => {
                       user.history.find((h) => h.day === d)?.total ?? 0
                     return (
                       <Table.Td key={d} ta={'center'}>
-                        {total / 60 / 60 < 8 && total !== 0 ? (
+                        {total / 60 / 60 < 7 && total !== 0 ? (
                           <Tooltip
                             multiline
                             label={
@@ -225,7 +225,7 @@ const Timekeeping = () => {
                               }}
                             />
                           </Tooltip>
-                        ) : total >= 8 ? (
+                        ) : total >= 7 ? (
                           <Tooltip
                             multiline
                             label={
@@ -235,7 +235,34 @@ const Timekeeping = () => {
                                   .find((h) => h.day === d)
                                   ?.values.map((v) => {
                                     return (
-                                      <p>{v.status + ': ' + v.time_string}</p>
+                                      <Box
+                                        style={{
+                                          display: 'flex',
+                                          alignItems: 'center',
+                                          justifyContent: 'space-between',
+                                        }}
+                                      >
+                                        <p>{v.status + ': ' + v.time_string}</p>{' '}
+                                        {v.image && (
+                                          <Image
+                                            w={100}
+                                            h={100}
+                                            src={
+                                              import.meta.env.VITE_BACKEND_URL.includes(
+                                                'local',
+                                              )
+                                                ? import.meta.env
+                                                    .VITE_BACKEND_URL +
+                                                  'storage/' +
+                                                  v.image
+                                                : import.meta.env
+                                                    .VITE_BACKEND_URL +
+                                                  'image/storage/' +
+                                                  v.image
+                                            }
+                                          />
+                                        )}
+                                      </Box>
                                     )
                                   })}
                               </div>