fix: ionspection add users and infractions
This commit is contained in:
@@ -1,17 +1,103 @@
|
|||||||
import Typography from "../../components/Typography/Typography";
|
import Typography from "../../components/Typography/Typography";
|
||||||
import { Grid } from "../../components/Grid/Grid";
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
|
import {
|
||||||
|
ExclamationTriangleIcon,
|
||||||
|
DocumentTextIcon,
|
||||||
|
CheckCircleIcon,
|
||||||
|
} from "@heroicons/react/24/outline";
|
||||||
|
|
||||||
|
const containerVariants = {
|
||||||
|
hidden: { opacity: 0 },
|
||||||
|
visible: {
|
||||||
|
opacity: 1,
|
||||||
|
transition: { staggerChildren: 0.08, delayChildren: 0.05 },
|
||||||
|
},
|
||||||
|
exit: {
|
||||||
|
opacity: 0,
|
||||||
|
transition: { staggerChildren: 0.05, staggerDirection: -1 },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const itemVariants = {
|
||||||
|
hidden: { opacity: 0, y: 12 },
|
||||||
|
visible: { opacity: 1, y: 0 },
|
||||||
|
exit: { opacity: 0, y: -8 },
|
||||||
|
};
|
||||||
|
|
||||||
export const MainInfractions = ({
|
export const MainInfractions = ({
|
||||||
data,
|
data,
|
||||||
handleUpdate,
|
handleUpdate: _handleUpdate,
|
||||||
}: {
|
}: {
|
||||||
data: any;
|
data: any;
|
||||||
handleUpdate: () => void;
|
handleUpdate: () => void;
|
||||||
}) => {
|
}) => {
|
||||||
console.log(data, handleUpdate);
|
const infractions = data?.infractions || [];
|
||||||
|
|
||||||
|
if (infractions.length === 0) {
|
||||||
|
return (
|
||||||
|
<motion.div
|
||||||
|
initial={{ opacity: 0, scale: 0.96 }}
|
||||||
|
animate={{ opacity: 1, scale: 1 }}
|
||||||
|
transition={{ duration: 0.3 }}
|
||||||
|
className="flex flex-col items-center justify-center py-12 px-6 rounded-xl bg-gray-50 dark:bg-gray-800/50 border border-gray-200 dark:border-gray-700"
|
||||||
|
>
|
||||||
|
<CheckCircleIcon className="w-14 h-14 text-emerald-500 dark:text-emerald-400 mb-4" />
|
||||||
|
<Typography
|
||||||
|
variant="body1"
|
||||||
|
className="text-gray-500 dark:text-gray-400 text-center"
|
||||||
|
>
|
||||||
|
تخلفی ثبت نشده است
|
||||||
|
</Typography>
|
||||||
|
</motion.div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Grid container column>
|
<motion.div
|
||||||
<Typography variant="body1">این بخش در دست توسعه است</Typography>
|
variants={containerVariants}
|
||||||
</Grid>
|
initial="hidden"
|
||||||
|
animate="visible"
|
||||||
|
exit="exit"
|
||||||
|
className="flex flex-col gap-3"
|
||||||
|
>
|
||||||
|
<AnimatePresence mode="popLayout">
|
||||||
|
{infractions.map(
|
||||||
|
(
|
||||||
|
infraction: { _id: string; title: string; description?: string },
|
||||||
|
index: number,
|
||||||
|
) => (
|
||||||
|
<motion.div
|
||||||
|
key={infraction._id || index}
|
||||||
|
variants={itemVariants}
|
||||||
|
layout
|
||||||
|
className="group flex gap-4 p-4 rounded-xl border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800/80 hover:bg-gray-50 dark:hover:bg-gray-800 hover:border-red-200 dark:hover:border-red-900/50 shadow-sm hover:shadow-md transition-all duration-200"
|
||||||
|
>
|
||||||
|
<div className="flex-shrink-0 w-10 h-10 rounded-lg bg-red-100 dark:bg-red-900/30 flex items-center justify-center">
|
||||||
|
<ExclamationTriangleIcon className="w-5 h-5 text-red-600 dark:text-red-400" />
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 min-w-0">
|
||||||
|
<Typography
|
||||||
|
variant="subtitle2"
|
||||||
|
className="font-semibold mb-1 text-gray-900 dark:text-gray-100"
|
||||||
|
>
|
||||||
|
{index + 1}. {infraction.title}
|
||||||
|
</Typography>
|
||||||
|
{infraction.description && (
|
||||||
|
<div className="flex items-start gap-2 mt-2">
|
||||||
|
<DocumentTextIcon className="w-4 h-4 text-gray-400 dark:text-gray-500 flex-shrink-0 mt-0.5" />
|
||||||
|
<Typography
|
||||||
|
variant="body2"
|
||||||
|
className="text-gray-600 dark:text-gray-400 leading-relaxed"
|
||||||
|
>
|
||||||
|
{infraction.description}
|
||||||
|
</Typography>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</motion.div>
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
</AnimatePresence>
|
||||||
|
</motion.div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
|
|||||||
const [personRegistryData, setPersonRegistryData] =
|
const [personRegistryData, setPersonRegistryData] =
|
||||||
useState<PersonRegistryData | null>(null);
|
useState<PersonRegistryData | null>(null);
|
||||||
const [unitRegistryData, setUnitRegistryData] = useState<UnitRegistryData[]>(
|
const [unitRegistryData, setUnitRegistryData] = useState<UnitRegistryData[]>(
|
||||||
[]
|
[],
|
||||||
);
|
);
|
||||||
const [isLoadingRegistry, setIsLoadingRegistry] = useState(false);
|
const [isLoadingRegistry, setIsLoadingRegistry] = useState(false);
|
||||||
const { openDrawer } = useDrawerStore();
|
const { openDrawer } = useDrawerStore();
|
||||||
@@ -201,7 +201,7 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
|
|||||||
const unitsCandidate =
|
const unitsCandidate =
|
||||||
unitResult?.data ?? (Array.isArray(unitResult) ? unitResult : []);
|
unitResult?.data ?? (Array.isArray(unitResult) ? unitResult : []);
|
||||||
setUnitRegistryData(
|
setUnitRegistryData(
|
||||||
Array.isArray(unitsCandidate) ? unitsCandidate : []
|
Array.isArray(unitsCandidate) ? unitsCandidate : [],
|
||||||
);
|
);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error("Unit registry error:", error);
|
console.error("Unit registry error:", error);
|
||||||
@@ -320,7 +320,6 @@ const MainPlaceInfo: React.FC<MainPlaceInfoProps> = ({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Submit Inspection Button */}
|
|
||||||
<div className="pt-2">
|
<div className="pt-2">
|
||||||
<Button
|
<Button
|
||||||
onClick={handleOpenInspection}
|
onClick={handleOpenInspection}
|
||||||
|
|||||||
@@ -93,30 +93,28 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
|
|||||||
{ key: "عمده فروش", value: "عمده فروش" },
|
{ key: "عمده فروش", value: "عمده فروش" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const usersList = Array.isArray(usersData)
|
||||||
|
? usersData
|
||||||
|
: ((usersData as any)?.data ?? []);
|
||||||
|
|
||||||
const inspectorOptions = useMemo(() => {
|
const inspectorOptions = useMemo(() => {
|
||||||
if (!usersData?.data) return [];
|
if (!usersList?.length) return [];
|
||||||
return usersData.data
|
return usersList
|
||||||
.filter(
|
.filter((user: any) => user.province === profile?.province)
|
||||||
(user: any) =>
|
|
||||||
user.province === profile?.province &&
|
|
||||||
!user?.permissions?.includes("admin")
|
|
||||||
)
|
|
||||||
.map((user: any) => ({
|
.map((user: any) => ({
|
||||||
key: `${user.fullname} / ${user.mobile}`,
|
key: `${user.fullname} / ${user.mobile}`,
|
||||||
value: `${user.fullname} / ${user.mobile}`,
|
value: `${user.fullname} / ${user.mobile}`,
|
||||||
}));
|
}));
|
||||||
}, [usersData, profile]);
|
}, [usersList, profile]);
|
||||||
|
|
||||||
const defaultInspectorKeys = useMemo(() => {
|
const defaultInspectorKeys = useMemo(() => {
|
||||||
if (!isEdit || !item?.inspectors) return [];
|
if (!isEdit || !item?.inspectors) return [];
|
||||||
return item.inspectors.map((insp: any) => {
|
return item.inspectors.map((insp: any) => {
|
||||||
if (typeof insp === "string") return insp;
|
if (typeof insp === "string") return insp;
|
||||||
const user = usersData?.data?.find(
|
const user = usersList?.find((u: any) => u.fullname === insp.fullname);
|
||||||
(u: any) => u.fullname === insp.fullname
|
|
||||||
);
|
|
||||||
return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
|
return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
|
||||||
});
|
});
|
||||||
}, [item, isEdit, usersData]);
|
}, [item, isEdit, usersList]);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
control,
|
control,
|
||||||
@@ -150,17 +148,15 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
|
|||||||
const watchedInfractions = watch("infractions");
|
const watchedInfractions = watch("infractions");
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isEdit && item?.inspectors && usersData?.data) {
|
if (isEdit && item?.inspectors && usersList?.length) {
|
||||||
const inspectorStrings = item.inspectors.map((insp: any) => {
|
const inspectorStrings = item.inspectors.map((insp: any) => {
|
||||||
if (typeof insp === "string") return insp;
|
if (typeof insp === "string") return insp;
|
||||||
const user = usersData.data.find(
|
const user = usersList.find((u: any) => u.fullname === insp.fullname);
|
||||||
(u: any) => u.fullname === insp.fullname
|
|
||||||
);
|
|
||||||
return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
|
return user ? `${insp.fullname} / ${user.mobile}` : insp.fullname;
|
||||||
});
|
});
|
||||||
setValue("inspectors", inspectorStrings);
|
setValue("inspectors", inspectorStrings);
|
||||||
}
|
}
|
||||||
}, [item, isEdit, usersData, setValue]);
|
}, [item, isEdit, usersList, setValue]);
|
||||||
|
|
||||||
const submitInspectionMutation = useApiMutation({
|
const submitInspectionMutation = useApiMutation({
|
||||||
api: "inspections",
|
api: "inspections",
|
||||||
@@ -226,8 +222,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
|
|||||||
(Array.isArray(field.value)
|
(Array.isArray(field.value)
|
||||||
? field.value
|
? field.value
|
||||||
: field.value
|
: field.value
|
||||||
? [field.value]
|
? [field.value]
|
||||||
: []) as (string | number)[]
|
: []) as (string | number)[]
|
||||||
}
|
}
|
||||||
onChange={(keys) => setValue("license_type", keys as any)}
|
onChange={(keys) => setValue("license_type", keys as any)}
|
||||||
title="نوع پروانه کسب"
|
title="نوع پروانه کسب"
|
||||||
@@ -307,8 +303,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
|
|||||||
(Array.isArray(field.value)
|
(Array.isArray(field.value)
|
||||||
? field.value
|
? field.value
|
||||||
: field.value
|
: field.value
|
||||||
? [field.value]
|
? [field.value]
|
||||||
: []) as (string | number)[]
|
: []) as (string | number)[]
|
||||||
}
|
}
|
||||||
onChange={(keys) => setValue("ownership_type", keys as any)}
|
onChange={(keys) => setValue("ownership_type", keys as any)}
|
||||||
title="نوع مالکیت"
|
title="نوع مالکیت"
|
||||||
@@ -328,8 +324,8 @@ const MainSubmitInspection: React.FC<MainSubmitInspectionProps> = ({
|
|||||||
(Array.isArray(field.value)
|
(Array.isArray(field.value)
|
||||||
? field.value
|
? field.value
|
||||||
: field.value
|
: field.value
|
||||||
? [field.value]
|
? [field.value]
|
||||||
: []) as (string | number)[]
|
: []) as (string | number)[]
|
||||||
}
|
}
|
||||||
onChange={(keys) => setValue("unit_type", keys as any)}
|
onChange={(keys) => setValue("unit_type", keys as any)}
|
||||||
title="نوع واحد"
|
title="نوع واحد"
|
||||||
|
|||||||
Reference in New Issue
Block a user