Merge pull request #674 from NBISweden/develop

Merge bugfix to Production
NBISweden · Jul 10, 2023 · 968ea9c · 968ea9c
2 parents 64e1367 + 96c1e43
commit 968ea9c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/individual_sellingform.tsx b/frontend/src/individual_sellingform.tsx
@@ -39,15 +39,25 @@ export function IndividualSellingForm({
   buyDateHelperText: string;
 }) {
   const style = useStyles();
+
   const getMinSellingDate = () => {
-    const minDate = new Date(
-      individual.herd_tracking
-        ? individual.herd_tracking[0].date.toString()
-        : individual.birth_date
-    );
-    minDate.setDate(minDate.getDate() + 43);
+    const herdDate = individual.herd_tracking
+      ? new Date(individual.herd_tracking[0].date.toString())
+      : null;
+    const birthDate = new Date(individual.birth_date);
+
+    let minDate = null;
+
+    if (herdDate && herdDate.getTime() === birthDate.getTime()) {
+      minDate = new Date(birthDate.setDate(birthDate.getDate() + 43));
+    } else if (herdDate) {
+      minDate = new Date(herdDate.setDate(herdDate.getDate() + 1));
+    } else {
+      minDate = new Date(birthDate.setDate(birthDate.getDate() + 43));
+    }
     return minDate;
   };
+
   return (
     <>
       <Autocomplete