diff --git a/app/Agri.Data/SeedData/FertigationData.json b/app/Agri.Data/SeedData/FertigationData.json index 57b978fd..8cacb1a9 100644 --- a/app/Agri.Data/SeedData/FertigationData.json +++ b/app/Agri.Data/SeedData/FertigationData.json @@ -201,30 +201,30 @@ ], "FertilizerTypes":[ { - "Id": 1, - "Name": "Dry Fertilizer", - "DryLiquid": "Dry", + "Id": 3, + "Name": "Liquid Fertilizer", + "LiquidSolid": "Solid", "Custom": false, "StaticDataVersionId": 14 }, { - "Id": 2, - "Name": "Dry Fertilizer (Custom)", - "LiquidSolid": "Liquid", + "Id": 4, + "Name": "Liquid Fertilizer (Custom)", + "LiquidSolid": "Solid", "Custom": true, "StaticDataVersionId": 14 }, { - "Id": 3, - "Name": "Liquid Fertilizer", - "LiquidSolid": "Solid", + "Id": 1, + "Name": "Dry Fertilizer", + "DryLiquid": "Dry", "Custom": false, "StaticDataVersionId": 14 }, { - "Id": 4, - "Name": "Liquid Fertilizer (Custom)", - "LiquidSolid": "Solid", + "Id": 2, + "Name": "Dry Fertilizer (Custom)", + "LiquidSolid": "Liquid", "Custom": true, "StaticDataVersionId": 14 } diff --git a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs index 9cfc76b2..2cf6ce85 100644 --- a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs +++ b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs @@ -394,7 +394,7 @@ private void FertigationDetail_Reset(ref FertigationDetailsViewModel fgvm) fgvm.totPIcon = ""; fgvm.totKIcon = ""; - fgvm.fertigationTime = 0.0M; + fgvm.fertigationTime = 0M; fgvm.totProductVolPerFert = 0.0M; fgvm.totProductVolPerSeason = 0.0M; @@ -801,11 +801,11 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm) decimal convertedProductRate = Convert.ToDecimal(fgvm.productRate) * _fU.ConversionToImperialGallonsPerAcre; //Total Product Volume per fertigation - fgvm.totProductVolPerFert = Math.Round((field.Area * convertedProductRate), 2); // convert to int/string? Error messages? + fgvm.totProductVolPerFert = Math.Round((field.Area * convertedProductRate), 1); // convert to int/string? Error messages? // Total product volume per growing season calc // Product Rate x Fertigation area x fert per season - fgvm.totProductVolPerSeason = Math.Round((field.Area * convertedProductRate * fgvm.eventsPerSeason), 2); // convert to int/string? Error messages? + fgvm.totProductVolPerSeason = Math.Round((field.Area * convertedProductRate * fgvm.eventsPerSeason), 1); // convert to int/string? Error messages? decimal injectionRateConversion = 0; switch (fgvm.selInjectionRateUnitOption) @@ -830,7 +830,7 @@ public IActionResult FertigationDetails(FertigationDetailsViewModel fgvm) //Fertigation time decimal fertTimeVal = Convert.ToDecimal(fgvm.totProductVolPerFert) / (Convert.ToDecimal(fgvm.injectionRate) / injectionRateConversion); - fgvm.fertigationTime = Math.Round(fertTimeVal, 2); + fgvm.fertigationTime = Math.Round(fertTimeVal, 0); //Applied nutrients per fertigation fgvm.calcN = Convert.ToInt32(fertilizerNutrients.fertilizer_N).ToString(); @@ -1021,10 +1021,10 @@ private void SolidFertigationCalculation(FertigationDetailsViewModel fgvm){ fgvm.nutrientConcentrationP205 = Convert.ToString(Math.Round(amountToDissolve * Convert.ToDecimal(fgvm.valP2o5) / 100 / tankVolume, 2)); decimal injectionRate = Convert.ToDecimal(fgvm.injectionRate); - fgvm.fertigationTime = Math.Round(Convert.ToDecimal(fgvm.tankVolume) / injectionRate, 2); + fgvm.fertigationTime = Math.Round(Convert.ToDecimal(fgvm.tankVolume) / injectionRate, 0); if (amountToDissolve <= tankVolume * solInWater){ - fgvm.dryAction = "Good"; + fgvm.dryAction = "Soluble"; } else{ fgvm.dryAction = "Reduce the amount to dissolve"; diff --git a/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml b/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml index 6df779aa..088ba2cb 100644 --- a/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml +++ b/app/Server/src/SERVERAPI/Views/Nutrients/FertigationDetails.cshtml @@ -22,8 +22,8 @@ -
Applied Nutrients Per Fetigation (lb/ac)
+Applied Nutrients Per Fertigation (lb/ac)
Total Applied Nutrients (lb/ac)
Still Required This Year (lbs/ac)