Merge branch 'master' into nmp-656-cshtml-updated

bcgov · Aug 28, 2024 · 44a8242 · 44a8242
2 parents 8f7d4be + f2c3ecb
commit 44a8242
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/app/Agri.Models/Configuration/Fertigation.cs b/app/Agri.Models/Configuration/Fertigation.cs
@@ -20,4 +20,4 @@ public Fertigation()
         public List<InjectionRateUnit> InjectionRateUnits { get; set; }
 
     }
-}
+}
diff --git a/app/Agri.Models/Configuration/FertigationType.cs b/app/Agri.Models/Configuration/FertigationType.cs
@@ -8,4 +8,4 @@ public class FertigationType : SelectOption
         public string LiquidSolid { get; set; }
         public bool Custom { get; set; }
     }
-}
+}
diff --git a/app/Agri.Models/Configuration/InjectionRateUnit.cs b/app/Agri.Models/Configuration/InjectionRateUnit.cs
@@ -7,4 +7,4 @@ public class InjectionRateUnit : SelectOption
     {
 
     }
-}
+}
diff --git a/app/Agri.Models/Configuration/ProductRateUnit.cs b/app/Agri.Models/Configuration/ProductRateUnit.cs
@@ -6,4 +6,4 @@ namespace Agri.Models.Configuration
     public class ProductRateUnit: SelectOption
     {
     }
-}
+}
diff --git a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs
@@ -2301,4 +2301,4 @@ public IActionResult FeedAreaEditNote()
             return PartialView(model);
         }
     }
-}
+}
diff --git a/app/Server/src/SERVERAPI/Views/Nutrients/FertilizerDetails.cshtml b/app/Server/src/SERVERAPI/Views/Nutrients/FertilizerDetails.cshtml
@@ -189,7 +189,9 @@
                     </div>
                 </div>
                 <div style="clear:both"></div>
-                <hr style="height:1px;border:none;color:blue;background-color:lightblue;padding:0" />
+
+                <hr style="height:1px;border:none;color:blue;background-color:lightblue;padding:0; margin-top: 5px;" />
+
                 <div class="form-group col-sm-4" style="margin:5px">
                     <div class="Table">
                         <div class="Title">
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ public Fertigation() @@
             public List<InjectionRateUnit> InjectionRateUnits { get; set; }
         }
-    }
+    }