Fix icons, minor cleanup

bcgov · Sep 5, 2024 · 91d5912 · 91d5912
1 parent b5b4f4a
commit 91d5912
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs
@@ -708,13 +708,11 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm)
                         fgvm.totProductVolPerSeason = Math.Round((field.Area * convertedProductRate * fgvm.eventsPerSeason), 2); // convert to int/string? Error messages?
 
                         decimal injectionRateConversion = 0;
-                        ConversionFactor _cf = _sd.GetConversionFactor();
                         switch (fgvm.selInjectionRateUnitOption)
                         {
                             //US gallon/min
                             //1 Imperial gallons per minute to gallon/minute = 1.20095 gallon/minute
                             case "1":
-                                //injectionRateConversion = _cf.
                                 injectionRateConversion = 1.20095M;
                                 break;
 
@@ -731,7 +729,6 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm)
                         }
 
                         //Fertigation time 
-                        //volumePerFertigation / (injectionRate / conversionFactor)
                         decimal fertTimeVal = Convert.ToDecimal(fgvm.totProductVolPerFert) / (Convert.ToDecimal(fgvm.injectionRate) / injectionRateConversion);
                         fgvm.fertigationTime = Math.Round(fertTimeVal, 2); 
 
@@ -758,6 +755,7 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm)
                             FertigationUpdate(fgvm);
                         }
 
+                        //Still required this year
                         FertigationStillRequired(ref fgvm);
                         if (fgvm.id == null)
                         {

diff --git a/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml b/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml
@@ -227,12 +227,24 @@
                           </div>
                           <div class="Row">
                               <div class="Cell" style="text-align:center">
+                                @if (!string.IsNullOrEmpty(Model.totNIcon))
+                            {
+                                <img src="~/images/@(Model.totNIcon).svg" title="@Model.totNIconText"/>
+                        }
                                 @Model.totN
                               </div>
                               <div class="Cell" style="text-align:center">
+                                   @if (!string.IsNullOrEmpty(Model.totPIcon))
+                            {
+                                <img src="~/images/@(Model.totPIcon).svg" title="@Model.totPIconText" />
+                        }
                                 @Model.totP2o5
                               </div>
                               <div class="Cell" style="text-align:center">
+                                @if (!string.IsNullOrEmpty(Model.totKIcon))
+                            {
+                                <img src="~/images/@(Model.totKIcon).svg" title="@Model.totKIconText" />
+                        }
                                 @Model.totK2o
                               </div>
                           </div>