gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-20 05:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(FE-137): update RecordingForm to improve project flock handling and label formatting

Browse Source
This commit is contained in:
rstubryan
2025-10-27 05:54:14 +07:00
parent 135fc2d5d3
commit c8f596ad2a
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/production/recording/form/RecordingForm.schema.ts
+1 -1
View File
@@ -93,7 +93,7 @@ export const getRecordingFormInitialValues = (
project_flock_kandang: initialValues?.project_flock_kandang_id
? {
value: initialValues.project_flock_kandang_id,
label: `Project Flock Kandang #${initialValues.project_flock_kandang_id}`,
label: `Project Flock #${initialValues.project_flock_kandang_id}`,
}
: null,
project_flock_kandang_id: initialValues?.project_flock_kandang_id ?? 0,
src/components/pages/production/recording/form/RecordingForm.tsx
+8 -10
View File
@@ -107,7 +107,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
projectFlocks?.data.forEach((projectFlock) => {
projectFlock.kandangs.forEach((kandang) => {
options.push({
value: kandang.id,
value: projectFlock.id,
label: `${projectFlock.flock.name} - ${projectFlock.area.name} - ${kandang.name}`,
});
});
@@ -242,15 +242,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
if (!formik.values.project_flock_kandang || !isResponseSuccess(projectFlocks)) {
return selectedLocation;
}
const kandangId = formik.values.project_flock_kandang.value;
for (const projectFlock of projectFlocks.data) {
const kandang = projectFlock.kandangs.find(k => k.id === kandangId);
if (kandang && projectFlock.location) {
return {
value: projectFlock.location.id,
label: projectFlock.location.name
};
}
const projectFlockId = formik.values.project_flock_kandang.value;
const projectFlock = projectFlocks.data.find(pf => pf.id === projectFlockId);
if (projectFlock && projectFlock.location) {
return {
value: projectFlock.location.id,
label: projectFlock.location.name
};
}
return selectedLocation;
}, [formik.values.project_flock_kandang, projectFlocks, selectedLocation]);