BACKEND/Modules/Admin/app/Http/Controllers/LeaveManagementController.php

@@ -83,7 +83,6 @@ class LeaveManagementController extends Controller
                 'users.name as user_name',
                 'users.email',
                 'users.avatar',
-                'users.is_separated',
                 'users.created_at as user_created_at',
                 'users.permission',
                 'users.updated_at as user_updated_at',
@@ -105,7 +104,6 @@ class LeaveManagementController extends Controller
                         'name' => $item->user_name,
                         'email' => $item->email,
                         'avatar' => $item->avatar,
-                        'is_separated' => $item->is_separated,
                         'created_at' => $item->user_created_at,
                         'permission' => $item->permission,
                         'updated_at' => $item->user_updated_at,

FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx

@@ -51,7 +51,6 @@ interface User {
   permission: string
   remember_token: string | null
   avatar: string
-  is_separated: boolean
   created_at: string | null
   updated_at: string | null
 }
@@ -112,7 +111,6 @@ const LeaveManagement = () => {
       permission: '',
       remember_token: '',
       avatar: '',
-      is_separated: false,
       created_at: '',
       updated_at: '',
     },
@@ -779,7 +777,7 @@ const LeaveManagement = () => {
               return (
                 <Table.Tr key={user.user.id} className={classes.tableTr}>
                   <Table.Td ta={'center'}>{index + 1}</Table.Td>
-                  <Table.Td pos="relative">
+                  <Table.Td>
                     <Tooltip multiline label={user.user.name}>
                       <div style={{ display: 'flex', alignItems: 'center' }}>
                         <Avatar
@@ -798,23 +796,6 @@ const LeaveManagement = () => {
                         {user.user.name}
                       </div>
                     </Tooltip>
-
-                    {user.user.is_separated ? (
-                      <Tooltip label="Nhân viên không còn làm việc, đang xử lý hồ sơ">
-                        <Badge
-                          color="red"
-                          pos="absolute"
-                          top={0}
-                          right={0}
-                          radius={0}
-                          size="xs"
-                        >
-                          Off
-                        </Badge>
-                      </Tooltip>
-                    ) : (
-                      ''
-                    )}
                   </Table.Td>
 
                   {/* On leave per month */}
@@ -1136,7 +1117,6 @@ const LeaveManagement = () => {
               permission: '',
               remember_token: '',
               avatar: '',
-              is_separated: false,
               created_at: '',
               updated_at: '',
             },

FRONTEND/src/pages/Timekeeping/Timekeeping.tsx

@@ -24,7 +24,6 @@ import {
   TextInput,
   Tooltip,
   Modal,
-  Badge,
 } from '@mantine/core'
 import { useDisclosure } from '@mantine/hooks'
 import { notifications } from '@mantine/notifications'
@@ -49,7 +48,6 @@ interface User {
   permission: string
   remember_token: string | null
   avatar: string
-  is_separated: boolean
   created_at: string | null
   updated_at: string | null
 }
@@ -949,8 +947,14 @@ const Timekeeping = () => {
                   2
               return (
                 <Table.Tr key={user.user.id} className={classes.tableTr}>
-                  <Table.Td pos="relative">
-                    <Tooltip multiline label={showTooltipAllNote(user)}>
+                  <Table.Td>
+                    <Tooltip
+                      // position={'auto'}
+                      multiline
+                      // opened
+                      // offset={{ mainAxis: 5, crossAxis: 0 }}
+                      label={showTooltipAllNote(user)}
+                    >
                       <div style={{ display: 'flex', alignItems: 'center' }}>
                         <Avatar
                           size={'md'}
@@ -968,27 +972,6 @@ const Timekeeping = () => {
                         {user.user.name}
                       </div>
                     </Tooltip>
-
-                    {user.user.is_separated ? (
-                      <Tooltip label="Nhân viên không còn làm việc, đang xử lý hồ sơ">
-                        <Badge
-                          color="red"
-                          pos="absolute"
-                          top={0}
-                          right={0}
-                          radius={0}
-                          size="xs"
-                          style={{
-                            fontSize: 10,
-                            textTransform: 'capitalize',
-                          }}
-                        >
-                          Off
-                        </Badge>
-                      </Tooltip>
-                    ) : (
-                      ''
-                    )}
                   </Table.Td>
                   <Table.Td ta={'center'}>{totalDays}</Table.Td>
                   <Table.Td ta={'center'}>{workingDays - totalDays}</Table.Td>