Merge pull request #585 from NBISweden/fix/reset-selling-herd

Fix/reset selling herd
NBISweden · Dec 12, 2022 · 973d08c · 973d08c
2 parents 0c8007b + 41e5372
commit 973d08c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/app/utils/database.py b/app/utils/database.py
@@ -427,7 +427,8 @@ def next_individual_number(herd, birth_date, breeding_event):
                 fn.COALESCE(
                     Breeding.birth_date,
                     Breeding.breed_date + 30,
-                )
+                ),
+                Breeding.id,
             ]
         )
         events = (

diff --git a/frontend/src/individual_add.tsx b/frontend/src/individual_add.tsx
@@ -212,7 +212,6 @@ export function IndividualAdd({
       if (!mother) {
         return;
       }
-      console.log("Mother get is", mother);
       let herds = mother.herd_tracking;
 
       if (herds.length > 0) {
@@ -357,8 +356,8 @@ export function IndividualAdd({
           getIndnumbSuggestion(limitedBreedingInput);
         }
       } else if (
-        individual?.origin_herd.herd === "GX1" ||
-        individual?.origin_herd.herd === "MX1"
+        individual?.origin_herd?.herd === "GX1" ||
+        individual?.origin_herd?.herd === "MX1"
       ) {
         handleUpdateIndividual("number", null);
       }
@@ -549,7 +548,6 @@ export function IndividualAdd({
   const getIndnumbSuggestion = async (
     BreedingMatch: Breeding | LimitedBreeding
   ) => {
-    console.log(BreedingMatch);
     post(`/api/breeding/nextind/`, BreedingMatch).then(
       (json) => {
         switch (json.status) {

diff --git a/frontend/src/individual_form.tsx b/frontend/src/individual_form.tsx
@@ -89,6 +89,19 @@ export function IndividualForm({
           label: `${c.id} - ${c.name}`,
         };
       });
+    } else if (
+      individual &&
+      colors &&
+      Object.keys(colors).includes(individual.genebank)
+    ) {
+      return colors[individual.genebank].map((c) => {
+        return {
+          id: c.id,
+          comment: c.comment,
+          value: c.name,
+          label: `${c.id} - ${c.name}`,
+        };
+      });
     }
     return [];
   }, [colors, genebank]);

diff --git a/frontend/src/individual_sellingform.tsx b/frontend/src/individual_sellingform.tsx
@@ -52,7 +52,9 @@ export function IndividualSellingForm({
       <Autocomplete
         key={herdKey}
         options={herdOptions}
-        value={herdOptions.find((option) => option.herd == individual.herd)}
+        value={
+          herdOptions.find((option) => option.herd == individual.herd) ?? null
+        }
         getOptionLabel={(option: LimitedHerd) => herdLabel(option)}
         renderInput={(params) => (
           <TextField