Merge pull request #690 from bcgov/678-fertigation-delete-functionality

[TASK][NMP-678] Fertigation calculations, nutrients view, and delete functionality
bcgov · Sep 12, 2024 · 1202ae7 · 1202ae7
2 parents e21b8a2 + 4e77922
commit 1202ae7
Show file tree

Hide file tree

Showing 15 changed files with 617 additions and 102 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,6 +23,36 @@
             "env": {"DEBUG":"*"},
             "args": ["--pr=0","--env=dev"],
             "console": "integratedTerminal"
+        },
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md.
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/app/Server/src/SERVERAPI/bin/Debug/net7.0/SERVERAPI.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/app/Server/src/SERVERAPI",
+            "stopAtEntry": false,
+            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/app/Server/Server.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/app/Server/Server.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/app/Server/Server.sln"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/app/Agri.Models/Farm/NutrientFertilizer.cs b/app/Agri.Models/Farm/NutrientFertilizer.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Agri.Models.Farm
 {
@@ -9,6 +10,8 @@ public class NutrientFertilizer
         public int fertilizerId { get; set; }
         public int applUnitId { get; set; }
         public decimal applRate { get; set; }
+        [DataType(DataType.Date)]
+        [DisplayFormat(DataFormatString = "{0:dd-MMM-yyyy}", ApplyFormatInEditMode = true)]
         public DateTime? applDate { get; set; }
         public int applMethodId { get; set; }
         public decimal? customN { get; set; }
@@ -19,5 +22,10 @@ public class NutrientFertilizer
         public decimal fertK2o { get; set; }
         public decimal liquidDensity { get; set; }
         public int liquidDensityUnitId { get; set; }
+        public int eventsPerSeason { get; set; }
+        public bool isFertigation { get; set; }
+        public decimal injectionRate { get; set; }
+        public int injectionRateUnitId { get; set; }
+        public string groupID { get; set; }
     }
-}
+}