diff --git a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx index 6ffc596..55e003f 100644 --- a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx +++ b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx @@ -111,8 +111,8 @@ const LeaveManagement = () => { const [date, setDate] = useState({ year: new Date().getFullYear().toString(), }) - const [dataTimeType, setDataTimeType] = useState([]) - const [dataReason, setDataReason] = useState([]) + // const [dataTimeType, setDataTimeType] = useState([]) + // const [dataReason, setDataReason] = useState([]) const now = new Date() const currentMonth = now.getMonth() + 1 // getMonth() trả về 0-11 @@ -137,19 +137,19 @@ const LeaveManagement = () => { return [] } - useEffect(() => { - const fetchData = async () => { - const resultTimeType = await getListMasterByType('TIME_TYPE') - setDataTimeType( - resultTimeType.filter((item: DataTimeType) => item.c_code !== 'ALL'), - ) + // useEffect(() => { + // const fetchData = async () => { + // const resultTimeType = await getListMasterByType('TIME_TYPE') + // setDataTimeType( + // resultTimeType.filter((item: DataTimeType) => item.c_code !== 'ALL'), + // ) - const resultReason = await getListMasterByType('REASON') - setDataReason(resultReason) - } + // const resultReason = await getListMasterByType('REASON') + // setDataReason(resultReason) + // } - fetchData() - }, []) + // fetchData() + // }, []) const getLeaveList = async () => { try { @@ -602,8 +602,8 @@ const LeaveManagement = () => { {monthInYear.map((d, i) => { - const isCurrentMonth = - Number(date.year) === currentYear && d.value === currentMonth + // const isCurrentMonth = + // Number(date.year) === currentYear && d.value === currentMonth let leaveDataByMonth = getDetailLeaveDay( user.monthlyLeaveDays, ) diff --git a/FRONTEND/src/pages/Tickets/Tickets.tsx b/FRONTEND/src/pages/Tickets/Tickets.tsx index bd0b13e..6889d79 100755 --- a/FRONTEND/src/pages/Tickets/Tickets.tsx +++ b/FRONTEND/src/pages/Tickets/Tickets.tsx @@ -5,7 +5,7 @@ import { getTicketsOfUser, } from '@/api/Admin' import { DataTablePagination } from '@/components/DataTable/DataTable' -import { Xdelete, create } from '@/rtk/helpers/CRUD' +import { Xdelete } from '@/rtk/helpers/CRUD' import { get, post } from '@/rtk/helpers/apiService' import { Badge, diff --git a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx index 30868be..cc3042d 100644 --- a/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx +++ b/FRONTEND/src/pages/Timekeeping/Timekeeping.tsx @@ -24,7 +24,6 @@ import { TextInput, Tooltip, Modal, - Group, } from '@mantine/core' import { useDisclosure } from '@mantine/hooks' import { notifications } from '@mantine/notifications' @@ -492,9 +491,7 @@ const Timekeeping = () => { content: classes.deleteModal, }} > - - Confirm Delete - + Confirm Delete Are you sure you want to delete this note? @@ -508,10 +505,7 @@ const Timekeeping = () => { > Cancel -