fix date when copying fishStocking

AplinkosMinisterija · Oct 20, 2023 · 3d1f743 · 3d1f743
1 parent a6955f6
commit 3d1f743
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/fields/TimePicker.tsx b/src/components/fields/TimePicker.tsx
@@ -61,7 +61,7 @@ const TimePicker = ({
     >
       <StyledTextInput
         readOnly={true}
-        showError={false}
+        showError={true}
         label={label}
         padding={padding}
         value={value ? format(new Date(value), "HH:mm") : ""}

diff --git a/src/components/forms/Registration.tsx b/src/components/forms/Registration.tsx
@@ -120,10 +120,8 @@ const RegistrationForm = ({
   const assignedTo =
     fishStocking?.assignedTo || fishStocking?.createdBy || null;
 
-  const initialValues: FishStocking = {
-    eventTime: fishStocking?.eventTime
-      ? new Date(fishStocking.eventTime)
-      : new Date(new Date().setDate(new Date().getDate() + minTime + 1)),
+  const initialValues: any = {
+    eventTime: null,
     fishOriginCompanyName: fishStocking?.fishOriginCompanyName || "",
     assignedTo: fishStocking?.assignedTo || user || undefined,
     fishOriginReservoir: fishStocking?.fishOriginReservoir || undefined,

diff --git a/src/utils/validations.ts b/src/utils/validations.ts
@@ -54,7 +54,8 @@ export const validateMyProfile = Yup.object().shape({
 
 export const validateFishStocking = Yup.object().shape({
   location: Yup.object().required(validationTexts.requireText),
-  assignedTo: Yup.object().required(validationTexts.requireText).nullable(),
+    eventTime: Yup.date().required(validationTexts.requireText),
+    assignedTo: Yup.object().required(validationTexts.requireText).nullable(),
   phone: Yup.string()
     .required(validationTexts.requireText)
     .trim()
@@ -84,6 +85,7 @@ export const validateFishStocking = Yup.object().shape({
 
 export const validateFreelancerFishStocking = Yup.object().shape({
   location: Yup.object().required(validationTexts.requireText),
+    eventTime: Yup.date().required(validationTexts.requireText),
   batches: Yup.array().of(
     Yup.object().shape({
       fishType: Yup.object().required(validationTexts.requireSelect).nullable(),