RMS/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/default_values' into 'develop'

Browse Source 
Bugfix/default values

See merge request witel-front-end/rms!52
This commit is contained in:
AmirHossein Mahmoodi
2025-01-05 08:21:24 +00:00
parent 52881e8c86 b3e1eeaad5
commit b612350a04
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx
View File

@@ -137,15 +137,26 @@ const CreateFormContent = ({ setOpen, onSubmit }) => {
const onSubmitBase = (data) => {
let result = { ...data };
result.before_image === null && delete result.before_image;
result.after_image === null && delete result.after_image;
if (result.before_image === null) {
delete result.before_image;
delete data.before_image;
}
if (result.after_image === null) {
delete result.after_image;
delete data.after_image;
}
if (result.end_point === "") {
delete result.end_point;
delete data.end_point;
} else {
result.end_point = `${result.end_point.lat},${result.end_point.lng}`;
}
if (result.start_point === "") {
delete result.start_point;
delete data.start_point;
} else {
result.start_point = `${result.start_point.lat},${result.start_point.lng}`;
}

4
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx
View File

@@ -39,8 +39,8 @@ const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row
defaultData={{
before_image: row.original?.files[0]?.full_path_for_fast_react || null,
after_image: row.original?.files[1]?.full_path_for_fast_react || null,
item: row.original?.item || null,
sub_item: row.original?.sub_item || null,
item_id: row.original?.item || null,
sub_item_id: row.original?.sub_item || null,
amount: row.original?.sub_item_data || null,
start_point: { lat: row.original?.start_lat || "", lng: row.original?.start_lng || "" },
end_point: { lat: row.original?.end_lat || "", lng: row.original?.end_lng || "" },

4
src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx
View File

@@ -4,8 +4,8 @@ import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems";
import EditFormCreate from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate";
const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => {
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item);
const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item);
const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item_id);
const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item_id);
const defaultValues = {
before_image: defaultData?.before_image || null,