This is better

bcgov · Aug 15, 2024 · 1274b8f · 1274b8f
1 parent 00a0355
commit 1274b8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/frontend/src/Utils/convertToNMP.ts b/frontend/src/Utils/convertToNMP.ts
@@ -70,12 +70,10 @@ const convertToNMP = (
             sampleDate: field.SoilTest.sampleDate ?? '2024-07-01T00:00:00',
           }
         : null,
-      LeafTest: field.HasLeafTest
-        ? {
-            leafTissueP: field.LeafTest.leafTissueP,
-            leafTissueK: field.LeafTest.leafTissueK,
-          }
-        : null,
+      LeafTest: {
+        leafTissueP: field.LeafTest?.leafTissueP ?? 0,
+        leafTissueK: field.LeafTest?.leafTissueK ?? 0,
+      },
       Crops: newCrops,
 
       HasNutrients: field.Nutrients && field.Nutrients?.nutrientFertilizers?.length >= 0,

diff --git a/frontend/src/Utils/getLocalDetails.ts b/frontend/src/Utils/getLocalDetails.ts
@@ -31,7 +31,11 @@ const loadFarmDetails = (): FarmDetailsInterface => {
     updatedFarmDetails.FarmRegion = nmpFarmDetails.FarmRegion ?? 0;
 
     fieldsJSON.forEach((field) => {
-      const updateField: FieldDetailInterface = field;
+      const updateField: FieldDetailInterface = {
+        ...field,
+        HasLeafTest:
+          (field.LeafTest?.leafTissueK >= 0 && field.LeafTest?.leafTissueP >= 0) ?? false,
+      };
       updatedFarmDetails.Fields.push(updateField);
     });
     updatedFarmDetails.Fields = localDetails.years[0].Fields;

diff --git a/frontend/src/Utils/getLocalFertilizers.ts b/frontend/src/Utils/getLocalFertilizers.ts
@@ -21,8 +21,8 @@ const loadFertDetails = (farmDetails: FarmDetailsInterface): FertilizerInterface
   const localFerts = getLocalFertilizers();
   const updatedFertDetails = [...localFerts];
 
-  farmDetails.Fields.forEach((field) => {
-    field.Nutrients.nutrientFertilizers.forEach((fertilizer) => {
+  farmDetails.Fields?.forEach((field) => {
+    field.Nutrients.nutrientFertilizers?.forEach((fertilizer) => {
       const normalizedFertilizerId = fertilizer.fertilizerId.toString();
 
       if (!updatedFertDetails.find((f) => f.fertilizerId === normalizedFertilizerId)) {