FarmMaps/CarbonLib
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

filter out invalid organic manures
All checks were successful
FarmMaps.Develop/CarbonLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Francisco Salas
2021-11-19 18:32:44 +01:00
parent 7dc5bb1b50
commit d96976c1f7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CarbonCalculation.cs
View File

@@ -156,7 +156,7 @@ namespace FarmMapsAPI.Carbon
Crop = cropYear.MiterraCropName, Crop = cropYear.MiterraCropName,
CropRes = cropYear.CropRes, CropRes = cropYear.CropRes,
OrganicManures = OrganicManures =
cropYear.OrganicManures.Select(x => new OrganicManureType { Type = x.Type, Quantity = x.Quantity }).ToList(), cropYear.OrganicManures.Where(y=>y.Quantity > 0 && !string.IsNullOrEmpty(y.Type)).Select(x => new OrganicManureType { Type = x.Type, Quantity = x.Quantity }).ToList(),
CropYield = cropYear.CropYield } } CropYield = cropYear.CropYield } }
}); });
} }
@@ -170,7 +170,10 @@ namespace FarmMapsAPI.Carbon
{ {
foreach (var manure in cropYear.OrganicManures) foreach (var manure in cropYear.OrganicManures)
{ {
orgManure.Add(new OrganicManureType { Type = manure.Type, Quantity = manure.Quantity }); if (!string.IsNullOrEmpty(manure.Type) && manure.Quantity > 0)
{
orgManure.Add(new OrganicManureType { Type = manure.Type, Quantity = manure.Quantity });
}
} }
} }
var crop = mappedCropData.SingleOrDefault(x => x.Year == crops.Year); var crop = mappedCropData.SingleOrDefault(x => x.Year == crops.Year);