diff --git a/src/components/AddJob/AddJob.jsx b/src/components/AddJob/AddJob.jsx index b3a3f0f..bac4931 100644 --- a/src/components/AddJob/AddJob.jsx +++ b/src/components/AddJob/AddJob.jsx @@ -6,7 +6,7 @@ import usersService from "../../services/UsersService"; import { useSelector } from "react-redux"; -import { Form, Formik } from "formik"; +import { Field, Form, Formik } from "formik"; import * as Yup from "yup"; const validationSchema = Yup.object().shape({ @@ -50,7 +50,7 @@ function AddJob() { const ApiCall = new usersService(); const navigate = useNavigate(); - let {userDetails} = useSelector((state)=> state.userDetails) + let { userDetails } = useSelector((state) => state.userDetails); let [pageLoading, setPageLoading] = useState(true); // State used for knowing when the page is mounting @@ -199,7 +199,7 @@ function AddJob() { Select... {country.data.map((item, index) => { - if(item[0] == userDetails.country){ + if (item[0] == userDetails.country) { return ( - ) + ); } })} > @@ -316,19 +316,34 @@ function AddJob() {
@@ -396,3 +411,16 @@ function AddJob() { } export default AddJob; + +const publicArray = [ + { duration: 1, name: "1 day" }, + { duration: 2, name: "2 days" }, + { duration: 3, name: "3 days" }, + { duration: 4, name: "4 days" }, + { duration: 5, name: "5 days" }, + { duration: 6, name: "6 days" }, + { duration: 7, name: "1 week" }, + { duration: 14, name: "2 weeks" }, + { duration: 21, name: "3 weeks" }, + { duration: 28, name: "4 weeks" }, +]; diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index b2c0779..cdb37da 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -3,12 +3,12 @@ import Detail from "./popoutcomponent/Detail"; import ModalCom from "../Helpers/ModalCom"; import InputCom from "../Helpers/Inputs/InputCom/index"; import SiteService from "../../services/SiteService"; -import { Form, Formik, Field } from "formik"; +import { Form, Formik, Field, ErrorMessage } from "formik"; import * as Yup from "yup"; import LoadingSpinner from "../Spinners/LoadingSpinner"; const validationSchema = Yup.object().shape({ - family: Yup.string().required("THis is required "), + family: Yup.string().required("This is required "), public: Yup.string(), individual: Yup.string() .email("Invalid email format") @@ -68,18 +68,29 @@ function JobListPopout({ details, onClose, situation }) { group: "", }; - let [inputs, setInputs] = useState({}); + let [textArea, setTextArea] = useState(details?.job_detail); + const [errMsg, setErrMsg] = useState("") - const handleInputChange = ({ target: { name, value } }) => { - setInputs((prev) => ({ ...prev, [name]: value })); + const handleInputChange = ({ target: { value } }) => { + setTextArea(value); }; + const errorHandler = ({target: {name}}) => { + + } + const jobFieldHandler = async (values, helpers) => { - let { job_id, job_uid, job_detail } = details; + let { job_id, job_uid } = details; + + if(!textArea) { + setErrMsg("delivery detail is required!") + return + } + let jobReq = { job_id, job_uid, - job_description: job_detail + job_description: textArea }; let reqData; @@ -119,16 +130,19 @@ function JobListPopout({ details, onClose, situation }) { assign_mode: 110033, }; setLoader({ jobFields: { group: true } }); + } else { + setErrMsg("err herre") + return } try { const res = await apiCall.assignJobTask(reqData); let { data } = await res; - setLoader({ member: false, jobFields: false }); + setLoader({ jobFields: false }); onClose(); throw new Response(data); } catch (error) { - setLoader({ member: false, jobFields: false }); + setLoader({ jobFields: false }); throw new Error(error); } }; @@ -200,11 +214,11 @@ function JobListPopout({ details, onClose, situation }) { + {/*
{errMsg}
*/} @@ -226,9 +240,10 @@ function JobListPopout({ details, onClose, situation }) { value={props?.values.family} data={familyList} btnText="Assign to family" - optionText="select family" + optionText="Select Family" loader={loader?.jobFields.family} /> + {/*{errMsg}
*/} ); }} @@ -250,9 +265,10 @@ function JobListPopout({ details, onClose, situation }) { value={props?.values.public} data={publicArray} btnText="Show Task to Public" - optionText="select duration" + optionText="Select Duration" loader={loader?.jobFields.public} /> + {/*{errMsg}
*/} ); }} @@ -277,6 +293,7 @@ function JobListPopout({ details, onClose, situation }) { btnText="Send Offer to Individual" loader={loader?.jobFields.individual} /> + {/*{errMsg}
*/} ); }} @@ -300,10 +317,12 @@ function JobListPopout({ details, onClose, situation }) { optionText="Group" loader={loader?.jobFields.group} /> + {/*{errMsg}
*/} ); }} + {/* END OF ACTION SECTION */}