diff --git a/src/components/EditStaff/SalaryEffectiveModel.tsx b/src/components/EditStaff/SalaryEffectiveModel.tsx index 3d2f721..78c00da 100644 --- a/src/components/EditStaff/SalaryEffectiveModel.tsx +++ b/src/components/EditStaff/SalaryEffectiveModel.tsx @@ -18,7 +18,6 @@ interface SalaryEffectiveModelProps { open: boolean; onClose: () => void; modalSx?: SxProps; - onSave: () => void; columns: any[] } @@ -69,7 +68,7 @@ const modalSx: SxProps = { ); } -const SalaryEffectiveModel: React.FC = ({ open, onClose, modalSx: mSx, onSave, columns }) => { +const SalaryEffectiveModel: React.FC = ({ open, onClose, modalSx: mSx, columns }) => { const { t } = useTranslation(); const { control, register, formState, trigger, watch, setValue, getValues } = useFormContext(); const [rowModesModel, setRowModesModel] = useState({}); diff --git a/src/components/EditStaff/StaffInfo.tsx b/src/components/EditStaff/StaffInfo.tsx index 60ceb65..8d43ab9 100644 --- a/src/components/EditStaff/StaffInfo.tsx +++ b/src/components/EditStaff/StaffInfo.tsx @@ -42,10 +42,10 @@ const StaffInfo: React.FC = ({ combos }) => { register, formState: { errors, defaultValues }, control, - reset, + // reset, resetField, setValue, - getValues, + // getValues, watch, clearErrors, } = useFormContext(); @@ -62,18 +62,9 @@ const StaffInfo: React.FC = ({ combos }) => { // Salary Effiective History edit modal related const [salaryEffectiveModelOpen, setSalaaryEffectiveModelOpen] = useState(false); - const closeSalaryEffectiveModel = useCallback(() => { - setSalaaryEffectiveModelOpen(false); + const controlSalaryEffectiveModel = useCallback(() => { + setSalaaryEffectiveModelOpen((prev: Boolean) => !prev); }, []); - const openSalaryEffectiveModel = useCallback(() => { - setSalaaryEffectiveModelOpen(true); - }, []); - const onSalaryEffectiveSave = useCallback(async () => { - console.log(getValues()) - setSalaaryEffectiveModelOpen(false); - }, []); - - const resetStaff = useCallback(() => { console.log(defaultValues); @@ -338,7 +329,7 @@ const StaffInfo: React.FC = ({ combos }) => { ))} - @@ -565,8 +556,7 @@ const StaffInfo: React.FC = ({ combos }) => {