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

formating

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2025-09-03 15:41:15 +03:30
parent 781018225b
commit 28af206696
13 changed files with 243 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ const CreateFormContent = ({ setOpen, onSubmit, is_gasht = false }) => {
if (!is_gasht) {
result[`activity_time`] = format(new Date(result.activity_time), "HH:mm");
result.mission_id = result.mission_id.id
result.mission_id = result.mission_id.id;
} else {
delete result.activity_date;
delete result.activity_time;

7
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/MissionsList/RowActions/Allocate/index.jsx
View File

@@ -9,7 +9,12 @@ const Allocate = ({ row, setMission, setOpenDialog }) => {
return (
<>
<Button color="primary" sx={{ textTransform: "unset", alignSelf: "center" }} onClick={handleClick} startIcon={<Done />}>
<Button
color="primary"
sx={{ textTransform: "unset", alignSelf: "center" }}
onClick={handleClick}
startIcon={<Done />}
>
انتخاب
</Button>
</>

4
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/MissionsDialog/index.jsx
View File

@@ -30,9 +30,7 @@ const MissionsDialog = ({ setMission, mode }) => {
>
<Close />
</IconButton>
{open && (
<MissionList setMission={setMission} setOpenDialog={setOpen} />
)}
{open && <MissionList setMission={setMission} setOpenDialog={setOpen} />}
</Dialog>
</>
);

28
src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo/index.jsx
View File

@@ -21,28 +21,22 @@ const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, err
render={({ field: { onChange, value }, fieldState: { error } }) => {
return value ? (
<Stack spacing={1}>
<Stack direction={"row"} alignItems={"center"} spacing={1} >
<Chip
label={
value
? `کد ماموریت: ${value.id}`
: "ماموریت انتخاب نشده"
}
/>
<Stack direction={"row"} alignItems={"center"} spacing={1}>
<Chip label={value ? `کد ماموریت: ${value.id}` : "ماموریت انتخاب نشده"} />
<Divider sx={{ flex: 1 }} />
<MissionsDialog setMission={m => onChange(m)} mode={"edit"} />
<MissionsDialog setMission={(m) => onChange(m)} mode={"edit"} />
</Stack>
<FormHelperText error={!!error} >{error ? error.message : null}</FormHelperText>
<FormHelperText error={!!error}>{error ? error.message : null}</FormHelperText>
</Stack>
) : (
<Stack spacing={1}>
<MissionsDialog setMission={m => onChange(m)} />
<FormHelperText error={!!error} >{error ? error.message : null}</FormHelperText>
<MissionsDialog setMission={(m) => onChange(m)} />
<FormHelperText error={!!error}>{error ? error.message : null}</FormHelperText>
</Stack>
)
);
}}
/>
<Stack >
<Stack>
<NumberField
{...register("amount")}
label={`مقدار (${subItemsList.unit})`}
@@ -68,7 +62,7 @@ const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, err
variant="outlined"
fullWidth
/>
</Stack >
</Stack>
{!is_gasht ? (
<Stack>
<Grid container spacing={2}>
@@ -109,7 +103,7 @@ const GetItemInfo = ({ register, itemsList, subItemsList, control, setValue, err
<MapInfoOneMarker setValue={setValue} errors={errors} />
)}
</Stack>
</Stack >
</Stack>
);
};
export default GetItemInfo;
export default GetItemInfo;

4
src/components/dashboard/roadItems/operator/OperatorList.jsx
View File

@@ -129,8 +129,8 @@ const OperatorList = () => {
props.dependencyFieldValue.value === ""
? "empty"
: loadingSubItemsList
? "loading"
: props.filterParameters.value
? "loading"
: props.filterParameters.value
}
columnSelectOption={getColumnSelectOptions}
/>

8
src/components/dashboard/roadItems/supervisor/SupervisorList.jsx
View File

@@ -127,8 +127,8 @@ const SupervisorList = () => {
props.dependencyFieldValue?.value === ""
? "empty"
: loadingEdaratList
? "loading"
: props.filterParameters.value
? "loading"
: props.filterParameters.value
}
columnSelectOption={getColumnSelectOptions}
/>
@@ -227,8 +227,8 @@ const SupervisorList = () => {
props.dependencyFieldValue.value === ""
? "empty"
: loadingSubItemsList
? "loading"
: props.filterParameters.value
? "loading"
: props.filterParameters.value
}
columnSelectOption={getColumnSelectOptions}
/>

3
src/components/dashboard/roadMissions/control/ControlList.jsx
View File

@@ -103,7 +103,8 @@ const ControlList = () => {
},
},
{
accessorFn: (row) => row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
accessorFn: (row) =>
row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
header: "تاریخ خروج",
id: "start_time",
enableColumnFilter: true,

144
src/components/dashboard/roadMissions/operator/Actions/Create/Form/GetDateTime/MissionDates/index.jsx
View File

@@ -15,103 +15,105 @@ const MissionDates = ({ control }) => {
const endDateTime = makeDateTime(end_date, end_time);
const now = new Date();
return type && (
<>
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"start_date"}
render={({ field, fieldState: { error } }) => {
return (
<MuiDatePicker
name="start_date"
error={error}
value={field.value}
disableFuture={false}
minDate={now}
maxDate={end_date ?? null}
placeholder={"تاریخ شروع ماموریت را وارد کنید"}
label={"تاریخ شروع ماموریت"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
{type == 1 && (
return (
type && (
<>
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"start_time"}
name={"start_date"}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="start_time"
<MuiDatePicker
name="start_date"
error={error}
value={field.value}
views={["hours"]}
minTime={
start_date && new Date(start_date).toDateString() === now.toDateString()
? now
: null
}
maxTime={endDateTime ?? null}
placeholder={"زمان شروع ماموریت را وارد کنید"}
label={"زمان شروع ماموریت"}
setFieldValue={(name, value) => field.onChange(value || null)}
disableFuture={false}
minDate={now}
maxDate={end_date ?? null}
placeholder={"تاریخ شروع ماموریت را وارد کنید"}
label={"تاریخ شروع ماموریت"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
)}
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"end_date"}
render={({ field, fieldState: { error } }) => {
return (
<MuiDatePicker
name="end_date"
error={error}
value={field.value}
disableFuture={false}
minDate={start_date ? start_date : now}
placeholder={"تاریخ پایان ماموریت را وارد کنید"}
label={"تاریخ پایان ماموریت"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
{type == 1 && (
{type == 1 && (
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"start_time"}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="start_time"
error={error}
value={field.value}
views={["hours"]}
minTime={
start_date && new Date(start_date).toDateString() === now.toDateString()
? now
: null
}
maxTime={endDateTime ?? null}
placeholder={"زمان شروع ماموریت را وارد کنید"}
label={"زمان شروع ماموریت"}
setFieldValue={(name, value) => field.onChange(value || null)}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
)}
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"end_time"}
name={"end_date"}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="end_time"
<MuiDatePicker
name="end_date"
error={error}
value={field.value}
views={["hours"]}
minTime={startDateTime ?? null}
placeholder={"زمان پایان ماموریت را وارد کنید"}
label={"زمان پایان ماموریت"}
setFieldValue={(name, value) => field.onChange(value || null)}
disableFuture={false}
minDate={start_date ? start_date : now}
placeholder={"تاریخ پایان ماموریت را وارد کنید"}
label={"تاریخ پایان ماموریت"}
setFieldValue={(name, value) => field.onChange(value || [])}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
)}
</>
{type == 1 && (
<Grid item xs={12} sm={6}>
<Controller
control={control}
name={"end_time"}
render={({ field, fieldState: { error } }) => {
return (
<MuiTimePicker
name="end_time"
error={error}
value={field.value}
views={["hours"]}
minTime={startDateTime ?? null}
placeholder={"زمان پایان ماموریت را وارد کنید"}
label={"زمان پایان ماموریت"}
setFieldValue={(name, value) => field.onChange(value || null)}
helperText={error ? error.message : null}
/>
);
}}
/>
</Grid>
)}
</>
)
);
};
export default MissionDates;

21
src/components/dashboard/roadMissions/operator/Actions/CreateWithoutProcess/Form/GetDateTime/MissionDates/index.jsx
View File

@@ -47,10 +47,9 @@ const MissionDates = ({ control }) => {
views={["hours", "minutes"]}
maxTime={
endDateTime &&
start_date &&
end_date &&
new Date(start_date).toDateString() ===
new Date(end_date).toDateString()
start_date &&
end_date &&
new Date(start_date).toDateString() === new Date(end_date).toDateString()
? endDateTime
: null
}
@@ -95,18 +94,14 @@ const MissionDates = ({ control }) => {
views={["hours", "minutes"]}
minTime={
startDateTime &&
end_date &&
start_date &&
new Date(start_date).toDateString() ===
new Date(end_date).toDateString()
end_date &&
start_date &&
new Date(start_date).toDateString() === new Date(end_date).toDateString()
? startDateTime
: null
}
maxTime={
end_date &&
new Date(end_date).toDateString() === now.toDateString()
? now
: null
end_date && new Date(end_date).toDateString() === now.toDateString() ? now : null
}
placeholder={"زمان پایان ماموریت را وارد کنید"}
label={"زمان پایان ماموریت"}
@@ -121,4 +116,4 @@ const MissionDates = ({ control }) => {
);
};
export default MissionDates;
export default MissionDates;

6
src/components/dashboard/roadMissions/operator/OperatorList.jsx
View File

@@ -228,7 +228,8 @@ const OperatorList = () => {
},
},
{
accessorFn: (row) => row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
accessorFn: (row) =>
row.start_time ? moment(row.start_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
header: "تاریخ خروج",
id: "start_time",
enableColumnFilter: true,
@@ -238,7 +239,8 @@ const OperatorList = () => {
size: 100,
},
{
accessorFn: (row) => row.finish_time ? moment(row.finish_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
accessorFn: (row) =>
row.finish_time ? moment(row.finish_time).locale("fa").format("HH:mm | yyyy/MM/DD") : null,
header: "تاریخ ورود",
id: "finish_time",
enableColumnFilter: true,