WIP Still need to properly implement conversions

bcgov · Sep 26, 2024 · 3dcd19e · 3dcd19e
1 parent c60ec85
commit 3dcd19e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/app/Agri.Data/SeedData/FertigationData.json b/app/Agri.Data/SeedData/FertigationData.json
@@ -838,7 +838,7 @@
     {
       "Id": 1,
       "Name": "g/L",
-      "ConvFacter": 0.01002,
+      "ConvFactor": 0.01002,
       "StaticDataVersionId": 14
     },
     {

diff --git a/app/Agri.Models/Configuration/Fertigation.cs b/app/Agri.Models/Configuration/Fertigation.cs
@@ -29,7 +29,6 @@ public LiquidFertilizerDensity GetLiquidFertilizerDensity( int id, int densityUn
             return LiquidFertilizerDensities.Single(density => density.FertilizerId == id && density.DensityUnitId == densityUnitId);
         }
         public DryFertilizerSolubility GetDryFertilizerSolubility(int id, int solubilityUnitId){
-            var test = DryFertilizerSolubilities.Single(solubility => solubility.FertilizerId == id && solubility.SolubilityUnitId == solubilityUnitId);
             return DryFertilizerSolubilities.Single(solubility => solubility.FertilizerId == id && solubility.SolubilityUnitId == solubilityUnitId);
         }
 

diff --git a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs
@@ -614,7 +614,6 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm)
                     }
                     return View(fgvm);
                 }
-                // HERE
                 if (fgvm.buttonPressed == "TankVolumeChange")
                 {
                     ModelState.Clear();
@@ -627,17 +626,21 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm)
                     }
                     return View(fgvm);
                 }
-                if (fgvm.buttonPressed == "SolInWaterChange")
+                if (fgvm.buttonPressed == "SolInWaterUnitChange")
                 {
                     ModelState.Clear();
                     fgvm.buttonPressed = "";
                     fgvm.btnText = "Calculate";
-
-                    if (fgvm.selTypOption == "1")
-                    {
-                        FertigationDetailSetup_DefaultSolubility(ref fgvm);
+                    // These are just test conversions. Will need to implement actual conversions!!!
+                    if (fgvm.selSolubilityUnitOption == 3){
+                        var solubility = Convert.ToDecimal(fgvm.solInWater) * 1.2M;
+                        fgvm.solInWater = solubility.ToString("#.##");    
                     }
-                    return View(fgvm);
+                    if (fgvm.selSolubilityUnitOption == 2){
+                        var solubility = Convert.ToDecimal(fgvm.solInWater) * 0.5M;
+                        fgvm.solInWater = solubility.ToString("#.##");    
+                    }
+                    return PartialView(fgvm);
                 }
                 if (fgvm.buttonPressed == "AmountToDissolveChange")
                 {
@@ -925,18 +928,17 @@ private void FertigationDetailSetup_DefaultSolubility(ref FertigationDetailsView
             }
 
 
-            if (fgvm.selDensityUnitOption == 0 || fgvm.selFertOption == 0)
+            if (fgvm.selSolubilityUnitOption == 0 || fgvm.selFertOption == 0)
             {
-                fgvm.density = "";
-                fgvm.stdDensity = true;
+                fgvm.solInWater = "";
+                // fgvm.stdDensity = true;
             }
 
             if (!fgvm.manualEntry &&
                 fgvm.fertilizerType == "dry" &&
-                fgvm.selFertOption != 0)
+                fgvm.selFertOption != 0 &&
+                fgvm.selSolubilityUnitOption != 0)
             {
-                var Test  = fgvm.selSolubilityUnitOption;
-                var Test2 = fgvm.selFertOption;
                 fgvm.solInWater = _fg.GetDryFertilizerSolubility(Convert.ToInt32(fgvm.selFertOption), Convert.ToInt32(fgvm.selSolubilityUnitOption)).Value.ToString("#.##");
 
                 // fgvm.stdDensity = true;

diff --git a/app/Server/src/SERVERAPI/Views/Nutrients/Calculate.cshtml b/app/Server/src/SERVERAPI/Views/Nutrients/Calculate.cshtml
@@ -389,15 +389,15 @@
     });
 
     $(document).ready(function () {
-        $("body").on("change", "#ddlTankVolume", function () {
-            $('#buttonPressed').val("TankVolumeChange");
+        $("body").on("change", "#ddlSolubilityUnits", function () {
+            $('#buttonPressed').val("SolInWaterUnitChange");
             $("#modForm").submit();
         })
     });
 
     $(document).ready(function () {
-        $("body").on("change", "#ddlSolInWater", function () {
-            $('#buttonPressed').val("SolInWaterChange");
+        $("body").on("change", "#ddlTankVolume", function () {
+            $('#buttonPressed').val("TankVolumeChange");
             $("#modForm").submit();
         })
     });

diff --git a/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml b/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml
@@ -81,8 +81,8 @@
                     <div class="form-group col-sm-2" style="margin-left:0px;padding-left:0px; width:100px">
                         <div style="display:table; width:100%">
                             <div style="display:table-row">
-                                <label for="ddlSolubility" style="text-align: center; display: block;">Units</label>
-                                <select class="form-control" asp-for="selSolubilityUnitOption" asp-items="@(new SelectList(Model.solubilityUnitOptions,"Id","Value"))" id="ddlSolubility"></select>
+                                <label for="ddlSolubilityUnits" style="text-align: center; display: block;">Units</label>
+                                <select class="form-control" asp-for="selSolubilityUnitOption" asp-items="@(new SelectList(Model.solubilityUnitOptions,"Id","Value"))" id="ddlSolubilityUnits"></select>
                                 <span asp-validation-for="selSolubilityUnitOption" class="text-danger"></span>
                             </div>
                         </div>
@@ -425,6 +425,7 @@
         @Html.HiddenFor(x => x.tankVolume)
         @Html.HiddenFor(x => x.solInWater)
         @Html.HiddenFor(x => x.amountToDissolve)
+        @Html.HiddenFor(x => x.selSolubilityUnitOption)
 
         @Html.HiddenFor(x => x.fertigationTime)
         @Html.HiddenFor(x => x.totProductVolPerFert)