Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Riepma
2021-04-21 10:17:24 +02:00
10 changed files with 60 additions and 28 deletions

View File

@@ -40,9 +40,9 @@ namespace FarmMapsBlight
var fungicide2 = "{\"ai1\": \"fluazinam\", \"ai2\": \"cymoxanil\", \"ai3\": null, \"code\": \"kunshi\", \"name\": \"kunshi\", \"maxdose\": \"0.5\", \"mindose\": \"0.4\", \"safedays\": \"1\", \"emergence\": false, \"newgrowth\": \"1\", \"contentai1\": \"375\", \"contentai2\": \"250\", \"contentai3\": \"0\", \"fastgrowth\": true, \"contentunit\": \"g/kg\", \"rainfastness\": \"2.5\", \"tuberfilling\": false, \"aidescription\": \"(fluazinam + cymoxanil) 0.5 kg/ha\", \"curativescore\": \"2\", \"dryingtimemax\": \"2\", \"dryingtimemin\": \"1\", \"vracompatible\": true, \"maxapplications\": \"5\", \"preventivescore\": \"2.9\", \"recommendeddose\": \"0.5\", \"tuberprotection\": \"3.3\", \"eradicativescore\": \"1\", \"earlytubersetting\": false, \"protectioncategory\": \"1\", \"applicationrateunit\": \"kg/ha\", \"ctgbregistrationnumber\": \"14371 n\"}";
List<Spray> sprays = new List<Spray>();
sprays.Add(new Spray() { fungicide = JsonConvert.DeserializeObject<Fungicide>(fungicide1), sprayTime = new DateTime(2020, 6, 24), dose = 0.6, isVRA = false });
sprays.Add(new Spray() { fungicide = JsonConvert.DeserializeObject<Fungicide>(fungicide2), sprayTime = new DateTime(2020, 7, 2), dose = 0.6, isVRA = false });
//sprays.Add(new Spray() { fungicideCode = "FLEX", SprayTime = new DateTime(2020, 7, 1), dose = 0.6, isVRA = false });
sprays.Add(new Spray() { fungicide = JsonConvert.DeserializeObject<Fungicide>(fungicide1), sprayTime = new DateTime(2020, 9, 1), dose = 0.6, isVRA = false });
sprays.Add(new Spray() { fungicide = JsonConvert.DeserializeObject<Fungicide>(fungicide2), sprayTime = new DateTime(2020, 9, 1), dose = 0.6, isVRA = false });
taskRequest.attributes["sprays"] = JsonConvert.SerializeObject(sprays);
List<Irrigation> irrigations = new List<Irrigation>();

View File

@@ -11,7 +11,7 @@
<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>>always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

View File

@@ -2,8 +2,10 @@
using System.Collections.Generic;
using System.Text;
namespace FarmMapsBlight.Models {
public class Fungicide {
namespace FarmMapsBlight.Models
{
public class Fungicide
{
public string code { get; set; }
public string name { get; set; }
public string ctgbregistrationnumber { get; set; }
@@ -35,10 +37,12 @@ namespace FarmMapsBlight.Models {
public bool earlytubersetting { get; set; }
public bool tuberfilling { get; set; }
public int? safedays { get; set; }
public double takeback {
get {
public double takeback
{
get
{
return curativescore * 6;
}
}
}
}
}

View File

@@ -5,7 +5,6 @@ namespace FarmMapsBlight.Models
public class Spray
{
public DateTime sprayTime { get; set; }
public string fungicideCode { get; set; }
public Fungicide fungicide { get; set; }
public double dose { get; set; }
public bool isVRA { get; set; }