From fed5422c59ac557a305863b162003f5300b18d24 Mon Sep 17 00:00:00 2001 From: Amin Ghasempoor Date: Sun, 5 Jan 2025 09:52:54 +0000 Subject: [PATCH] Bugfix/unit pass --- .../operator/Actions/Create/Forms/CreateFormContent.jsx | 8 ++++---- .../operator/RowActions/EditForm/EditFormContent.jsx | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx index d6311e9..7f47a7d 100644 --- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx +++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useForm } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; -import { array, mixed, object, string } from "yup"; +import { array, mixed, number, object, string } from "yup"; import { useTheme } from "@emotion/react"; import useRequest from "@/lib/hooks/useRequest"; import { Box, Button, DialogActions, DialogContent, Tab, Tabs, useMediaQuery } from "@mui/material"; @@ -40,8 +40,8 @@ const defaultValues = { end_point: "", }; const validationSchema = object({ - item_id: string().required("نوع آیتم را مشخص کنید!"), - sub_item_id: string().required("موضوع مشاهده شده را مشخص کنید!"), + item_id: number().required("نوع آیتم را مشخص کنید!"), + sub_item_id: number().required("موضوع مشاهده شده را مشخص کنید!"), amount: string().required("وارد کردن مقدار الزامیست!"), cmms_machines: array().required("وارد کردن کد خودرو الزامیست!"), rahdaran_id: array().required("وارد کردن کد راهداران الزامیست!").min(1, "حداقل یک کد راهدار باید وارد شود!"), // بررسی حداقل یک آیتم, @@ -133,7 +133,6 @@ const CreateFormContent = ({ setOpen, onSubmit }) => { mode: "onBlur", context: { subItemsList }, }); - const onSubmitBase = (data) => { let result = { ...data }; @@ -177,6 +176,7 @@ const CreateFormContent = ({ setOpen, onSubmit }) => { ...data, item_name: itemsList.name, sub_item_name: subItemsList.name, + unit_fa: subItemsList.unit, }, }); }; diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx index 095c706..620f052 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx @@ -46,6 +46,7 @@ const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => { ...data, item_name: subItem.item_str, sub_item_name: subItemsList.name, + unit_fa: subItemsList.unit, }, }); };