chore: Bb 351 update nmp compatibility (#352)

* Merge with BB-254 * INvert plants per acre * Search fert type option * Fix region load * Update conversion function * Lint * Removed console.log
bcgov · Aug 14, 2024 · 0d14edf · 0d14edf
1 parent ffe3d6c
commit 0d14edf
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 36 deletions.
diff --git a/frontend/src/Commons/Forms/InputModules/CalculateNutrients/CalculateNutrients.tsx b/frontend/src/Commons/Forms/InputModules/CalculateNutrients/CalculateNutrients.tsx
@@ -285,10 +285,10 @@ const CalculateNutrientsComponent: FC<InputModuleProps> = ({
   };
 
   const displayFertilizerOption = (): OptionInterface[] => {
-    if (fertilizersDetails[selectedIndex]?.fertilizerTypeId.includes('Dry Fertilizer')) {
+    if (fertilizersDetails[selectedIndex]?.fertilizerTypeId.includes('1')) {
       return DryApplicationUnits;
     }
-    if (fertilizersDetails[selectedIndex]?.fertilizerTypeId.includes('Liquid Fertilizer')) {
+    if (fertilizersDetails[selectedIndex]?.fertilizerTypeId.includes('3')) {
       return LiquidApplicationUnits;
     }
     return [];

diff --git a/frontend/src/Commons/Forms/InputModules/Crops/CropsInfo.tsx b/frontend/src/Commons/Forms/InputModules/Crops/CropsInfo.tsx
@@ -128,27 +128,27 @@ const CropsInfoComponent: FC<InputModuleProps> = ({
     switch (distanceCombination) {
       case '0.6x2.7':
         res = '(2ft x 9ft)';
-        setplantsPerHa(getPlantsPerAcre(5));
+        setplantsPerHa(getPlantsPerAcre(0));
         break;
       case '0.6x3.0':
         res = '(2ft x 10ft)';
-        setplantsPerHa(getPlantsPerAcre(4));
+        setplantsPerHa(getPlantsPerAcre(1));
         break;
       case '0.75x2.7':
         res = '(2.5ft x 9ft)';
-        setplantsPerHa(getPlantsPerAcre(3));
+        setplantsPerHa(getPlantsPerAcre(2));
         break;
       case '0.75x3.0':
         res = '(2.5ft x 10ft)';
-        setplantsPerHa(getPlantsPerAcre(2));
+        setplantsPerHa(getPlantsPerAcre(3));
         break;
       case '0.9x2.7':
         res = '(3ft x 9ft)';
-        setplantsPerHa(getPlantsPerAcre(1));
+        setplantsPerHa(getPlantsPerAcre(4));
         break;
       case '0.9x3.0':
         res = '(3ft x 10ft)';
-        setplantsPerHa(getPlantsPerAcre(0));
+        setplantsPerHa(getPlantsPerAcre(5));
         break;
       default:
         break;

diff --git a/frontend/src/Commons/Forms/InputModules/FarmInformation/FarmInformation.tsx b/frontend/src/Commons/Forms/InputModules/FarmInformation/FarmInformation.tsx
@@ -27,7 +27,7 @@ import {
 interface SubmissionValues {
   FarmName: string;
   Year: string;
-  FarmRegion: string;
+  FarmRegion: number;
 }
 
 const FarmInfoComponent: FC<InputModuleProps> = ({

diff --git a/frontend/src/Commons/Forms/InputModules/Fertilizers/Fertilizers.tsx b/frontend/src/Commons/Forms/InputModules/Fertilizers/Fertilizers.tsx
@@ -166,8 +166,8 @@ const FertilizersInfo: FC<InputModuleProps> = ({
                     mobileWidth="100%"
                     onChange={(e) => handleChange(e, setFieldValue)}
                   />
-                  {values.fertilizerTypeId.includes('Dry Fertilizer (Custom)') ||
-                  values.fertilizerTypeId.includes('Liquid Fertilizer (Custom)') ? (
+                  {values.fertilizerTypeId.includes('2') ||
+                  values.fertilizerTypeId.includes('4') ? (
                     <StyledCustomNumberField>
                       <CustomField
                         label="N (%)"
@@ -200,9 +200,9 @@ const FertilizersInfo: FC<InputModuleProps> = ({
                       id="fertilizerId"
                       label="Fertilizer Name"
                       options={
-                        values.fertilizerTypeId.includes('Dry Fertilizer')
+                        values.fertilizerTypeId.includes('1')
                           ? DryFertilizerOptions
-                          : values.fertilizerTypeId.includes('Liquid Fertilizer')
+                          : values.fertilizerTypeId.includes('3')
                             ? LiquidFertilizerOptions
                             : []
                       }

diff --git a/frontend/src/Commons/Forms/InputModules/Fertilizers/FertilizersListComponent.tsx b/frontend/src/Commons/Forms/InputModules/Fertilizers/FertilizersListComponent.tsx
@@ -3,6 +3,7 @@ import { faTrashCan } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import FertilizerInterface from '@Interface/FertilizerInterface';
 import getFertilizerOption from '@Utils/getFertID';
+import { FertilizerTypeOptions } from '@Constants/FertilizersOptions';
 import {
   StyledFieldInfoList,
   StyledListItem,
@@ -32,11 +33,16 @@ const FertilizersListComponent: FC<FertilizerProps> = ({ fertilizerDetails, remo
               mobileWidth="127px"
             >
               <h2>Fertilizer Type</h2>
-              <p>{fertilizer.fertilizerTypeId}</p>
+              <p>
+                {
+                  FertilizerTypeOptions.find(
+                    (option) => option.value.toString() === fertilizer.fertilizerTypeId,
+                  )?.label
+                }
+              </p>
             </StyledListItem>
             <DesktopFertilizerGroup>
-              {fertilizer.fertilizerTypeId === 'Dry Fertilizer (Custom)' ||
-              fertilizer.fertilizerTypeId === 'Liquid Fertilizer (Custom)' ? (
+              {fertilizer.fertilizerTypeId === '2' || fertilizer.fertilizerTypeId === '4' ? (
                 <StyledCustomFertilizerGroup>
                   <StyledListItem
                     desktopWidth="80px"

diff --git a/frontend/src/Constants/FertilizersOptions.ts b/frontend/src/Constants/FertilizersOptions.ts
@@ -2,19 +2,19 @@ import OptionInterface from '@Interface/OptionInterface';
 
 const FertilizerTypeOptions: OptionInterface[] = [
   {
-    value: 'Dry Fertilizer',
+    value: '1',
     label: 'Dry Fertilizer',
   },
   {
-    value: 'Dry Fertilizer (Custom)',
+    value: '2',
     label: 'Dry Fertilizer (Custom)',
   },
   {
-    value: 'Liquid Fertilizer',
+    value: '3',
     label: 'Liquid Fertilizer',
   },
   {
-    value: 'Liquid Fertilizer (Custom)',
+    value: '4',
     label: 'Liquid Fertilizer (Custom)',
   },
 ];

diff --git a/frontend/src/Constants/SoilTestOptions.ts b/frontend/src/Constants/SoilTestOptions.ts
@@ -2,19 +2,19 @@ import OptionInterface from 'src/Interface/OptionInterface';
 
 const soilTestOptions: OptionInterface[] = [
   {
-    value: 'Other Lab (Bicarbonate and Amm Acetate)',
+    value: '11',
     label: 'Other Lab (Bicarbonate and Amm Acetate)',
   },
   {
-    value: 'Other Lab (Original Kelowna Method)',
+    value: '12',
     label: 'Other Lab (Original Kelowna Method)',
   },
   {
-    value: 'AGAT (Mod Bray-1 and Amm Acetate)',
+    value: '1',
     label: 'AGAT (Mod Bray-1 and Amm Acetate)',
   },
   {
-    value: 'A and L Canada (Bray-1 and Mehlich 3)',
+    value: '2',
     label: 'A and L Canada (Bray-1 and Mehlich 3)',
   },
 ];

diff --git a/frontend/src/Interface/FarmDetailsInterface.tsx b/frontend/src/Interface/FarmDetailsInterface.tsx
@@ -10,7 +10,7 @@ import FieldDetailInterface from './FieldDetailsInterface';
 interface FarmDetailsInterface {
   Year: string;
   FarmName: string;
-  FarmRegion: string;
+  FarmRegion: number;
   HasBerries: boolean;
   Fields: FieldDetailInterface[];
 }

diff --git a/frontend/src/Utils/convertToNMP.ts b/frontend/src/Utils/convertToNMP.ts
@@ -30,7 +30,12 @@ const convertToNMP = (
   newDetails: FarmDetailsInterface,
   prevDetails: NmpInterface,
 ): NmpInterface => {
+  let hasLeafTest = false;
+  let testingMethod = '';
   const newFields: NmpFieldInterface[] = newDetails.Fields.map((field: FieldDetailInterface) => {
+    if (field.HasLeafTest) hasLeafTest = true;
+    if (field.HasSoilTest) testingMethod = field.SoilTest.TestingMethod;
+
     const newCrops: NmpCropInterface[] = field.Crops?.map((crop: CropsDetailsInterface) => ({
       ...templateCropNMP,
       id: crop.id,
@@ -39,9 +44,9 @@ const convertToNMP = (
       plantAgeYears: crop.plantAgeYears,
       numberOfPlantsPerAcre: crop.numberOfPlantsPerAcre,
       distanceBtwnPlantsRows: crop.distanceBtwnPlantsRows,
-      willPlantsBePruned: crop.willPlantsBePruned === true,
+      willPlantsBePruned: crop.willPlantsBePruned ?? false,
       whereWillPruningsGo: crop.whereWillPruningsGo,
-      willSawdustBeApplied: crop.willSawdustBeApplied === true,
+      willSawdustBeApplied: crop.willSawdustBeApplied ?? false,
     }));
 
     const newNutrients: FertilizerInterface[] = Array.isArray(field.Nutrients?.nutrientFertilizers)
@@ -62,14 +67,13 @@ const convertToNMP = (
             ValP: field.SoilTest.ValP || templateFieldNMP.SoilTest?.ValP,
             valK: field.SoilTest.valK || templateFieldNMP.SoilTest?.valK,
             valPH: field.SoilTest.valPH || templateFieldNMP.SoilTest?.valPH,
-            // sampleDate: field.SoilTest?.sampleDate || templateFieldNMP.SoilTest?.sampleDate,
-            sampleDate: '2024-07-01T00:00:00',
+            sampleDate: field.SoilTest.sampleDate ?? '2024-07-01T00:00:00',
           }
         : null,
       LeafTest: field.HasLeafTest
         ? {
-            leafTissueP: field.LeafTest?.leafTissueP,
-            leafTissueK: field.LeafTest?.leafTissueK,
+            leafTissueP: field.LeafTest.leafTissueP,
+            leafTissueK: field.LeafTest.leafTissueK,
           }
         : null,
       Crops: newCrops,
@@ -108,13 +112,15 @@ const convertToNMP = (
       },
     };
   });
-
   return {
     ...prevDetails,
     farmDetails: {
       ...prevDetails.farmDetails,
       FarmName: newDetails.FarmName,
       Year: newDetails.Year,
+      FarmRegion: newDetails.FarmRegion,
+      LeafTestingMethod: hasLeafTest ? '0' : '',
+      TestingMethod: testingMethod,
     },
     years: [{ ...prevDetails.years[0], Year: newDetails.Year, Fields: newFields }],
   };

diff --git a/frontend/src/Utils/getLocalDetails.ts b/frontend/src/Utils/getLocalDetails.ts
@@ -27,10 +27,7 @@ const loadFarmDetails = (farmDetails: FarmDetailsInterface): FarmDetailsInterfac
 
     updatedFarmDetails.FarmName = nmpFarmDetails.FarmName;
     updatedFarmDetails.Year = nmpFarmDetails.Year;
-
-    if (nmpFarmDetails.FarmRegion === 21) {
-      updatedFarmDetails.FarmRegion = 'Vancouver Island';
-    }
+    updatedFarmDetails.FarmRegion = nmpFarmDetails.FarmRegion ?? 0;
 
     fieldsJSON.forEach((field) => {
       const updateField: FieldDetailInterface = field;