From b0ac42a9575722e1abf6684d04f5b513f9dea1d9 Mon Sep 17 00:00:00 2001
From: Francisco Salas <francisco.salas@akkerweb.nl>
Date: Thu, 26 May 2022 10:24:43 +0200
Subject: [PATCH] aw3831: fix yield with decimal

---
 CarbonLib.csproj                | 2 +-
 Models/CarbonRequest.cs         | 8 +++-----
 Models/CarbonSummary.cs         | 2 --
 Models/FarmMapsCarbonRequest.cs | 4 +++-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CarbonLib.csproj b/CarbonLib.csproj
index 91abfec..c026dac 100644
--- a/CarbonLib.csproj
+++ b/CarbonLib.csproj
@@ -8,7 +8,7 @@
 	  <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 	  <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	  <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-	  <Version>1.1.5</Version>
+	  <Version>1.1.6</Version>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/Models/CarbonRequest.cs b/Models/CarbonRequest.cs
index d4944b8..5ab21ad 100644
--- a/Models/CarbonRequest.cs
+++ b/Models/CarbonRequest.cs
@@ -16,7 +16,6 @@ namespace CarbonService.Models
         [Required]
         public int PostalCode { get; set; }
         public List<CropField> CropFields { get; set; }
-        //public List<OrgManureApplied> OrgManureApplied { get; set; }
     }
 
     public class CropField
@@ -43,10 +42,12 @@ namespace CarbonService.Models
 
     public class OrgManureApplied
     {
+        double? yield;
+
         [Required]
         public string Crop { get; set; }
         public List<OrganicManureType> OrganicManures { get; set; }
-        public int? CropYield { get; set; }
+        public double? CropYield { get { return (int?)yield; } set { yield = value; } }
         public bool CropRes { get; set; }
     }
 
@@ -62,8 +63,6 @@ namespace CarbonService.Models
     {
         [Required]
         public int Year { get; set; }
-        //[Required]
-        //public List<string> Crops { get; set; }
         [Required]
         public List<OrgManureApplied> Crops { get; set; }
     }
@@ -81,7 +80,6 @@ namespace CarbonService.Models
         [Required]
         public string Type { get; set; }
 
-        //public string Quality { get; set; }
         [JsonConverter(typeof(StringEnumConverter))]
         public Quality Quality { get; set; }
     }
diff --git a/Models/CarbonSummary.cs b/Models/CarbonSummary.cs
index 386090f..196f675 100644
--- a/Models/CarbonSummary.cs
+++ b/Models/CarbonSummary.cs
@@ -9,8 +9,6 @@ namespace FarmMapsAPI.Carbon.Models
     {
         [JsonProperty("cropField")]
         public List<CropFieldSummary> CropField { get; set; }
-        //[JsonProperty("farmSummary")]
-        //public List<FarmYearSummary> FarmSummary { get; set; }
     }
 
     public class CropFieldSummary
diff --git a/Models/FarmMapsCarbonRequest.cs b/Models/FarmMapsCarbonRequest.cs
index 6030ad4..59cd896 100644
--- a/Models/FarmMapsCarbonRequest.cs
+++ b/Models/FarmMapsCarbonRequest.cs
@@ -54,11 +54,13 @@ namespace FarmMapsAPI.Carbon.Models
 
     public class CropData
     {
+        double? yield;
+
         [Required]
         public string CropCode { get; set; }
         public string MiterraCropName { get; set; }
         public List<OrganicManureFarmMaps> OrganicManures { get; set; }
-        public int? CropYield { get; set; }
+        public double? CropYield { get { return (int?)yield; } set { yield = value; } }
         public bool CropRes { get; set; }
     }