Selaa lähdekoodia

update

tags/Baseline_30082024_FRONTEND_UAT
MSI\derek 1 vuosi sitten
vanhempi
commit
4f7e68e481
2 muutettua tiedostoa jossa 19 lisäystä ja 18 poistoa
  1. +2
    -3
      src/components/EditStaff/EditStaff.tsx
  2. +17
    -15
      src/components/EditStaffForm/EditStaffForm.tsx

+ 2
- 3
src/components/EditStaff/EditStaff.tsx Näytä tiedosto

@@ -53,7 +53,6 @@ const EditStaff: React.FC = async () => {
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const { t } = useTranslation(); const { t } = useTranslation();
const idString = searchParams.get("id"); const idString = searchParams.get("id");
const [id, setId] = useState(0);
const [fieldLists, setFieldLists] = useState<Field[][]>(); const [fieldLists, setFieldLists] = useState<Field[][]>();
const [companyCombo, setCompanyCombo] = useState<comboProp[]>(); const [companyCombo, setCompanyCombo] = useState<comboProp[]>();
const [teamCombo, setTeamCombo] = useState<comboProp[]>(); const [teamCombo, setTeamCombo] = useState<comboProp[]>();
@@ -331,11 +330,11 @@ const EditStaff: React.FC = async () => {
}); });
} }
}, [companyCombo, idString]);
}, [companyCombo, teamCombo, departmentCombo, positionCombo, gradeCombo, skillCombo, salaryCombo, idString]);


return ( return (
<> <>
<EditStaffForm Title={title} id={id} fieldLists={fieldLists as Field[][] || [[]]} />
<EditStaffForm Title={title} fieldLists={fieldLists as Field[][] || [[]]} />
</> </>
); );
}; };


+ 17
- 15
src/components/EditStaffForm/EditStaffForm.tsx Näytä tiedosto

@@ -26,14 +26,15 @@ interface Field {
} }


interface formProps { interface formProps {
id: number;
Title?: string[]; Title?: string[];
fieldLists: Field[][]; fieldLists: Field[][];
} }


const EditStaffForm: React.FC<formProps> = ({ id, Title, fieldLists }) => {
const EditStaffForm: React.FC<formProps> = ({ Title, fieldLists }) => {
const router = useRouter(); const router = useRouter();
const { t } = useTranslation(); const { t } = useTranslation();
const searchParams = useSearchParams();
const idString = searchParams.get("id")
const [serverError, setServerError] = useState(""); const [serverError, setServerError] = useState("");
// make new inputs // make new inputs
const onSubmit = useCallback<SubmitHandler<CreateStaffInputs>>( const onSubmit = useCallback<SubmitHandler<CreateStaffInputs>>(
@@ -49,20 +50,21 @@ const EditStaffForm: React.FC<formProps> = ({ id, Title, fieldLists }) => {
const formattedDate = dayjs(data.departDate, 'MM/DD/YYYY').format('YYYY-MM-DD'); const formattedDate = dayjs(data.departDate, 'MM/DD/YYYY').format('YYYY-MM-DD');
formatDepartDate = formattedDate; formatDepartDate = formattedDate;
} }
// console.log(data);
const temp = {
id: id,
...data,
emergContactPhone: data.emergContactPhone.toString(),
phone1: data.phone1.toString(),
phone2: data.phone1.toString(),
joinDate: formatJoinDate,
departDate: formatDepartDate,
if (idString) {
const temp = {
id: parseInt(idString),
...data,
emergContactPhone: data.emergContactPhone.toString(),
phone1: data.phone1.toString(),
phone2: data.phone1.toString(),
joinDate: formatJoinDate,
departDate: formatDepartDate,
}
console.log(temp)
setServerError("");
await saveStaff(temp);
router.replace("/settings/staff");
} }
console.log(temp)
setServerError("");
await saveStaff(temp);
router.replace("/settings/staff");
} catch (e) { } catch (e) {
setServerError(t("An error has occurred. Please try again later.")); setServerError(t("An error has occurred. Please try again later."));
} }


Ladataan…
Peruuta
Tallenna