Merge branch 'master' of https://git.akkerweb.nl/FarmMaps/FarmMapsApiClient

# Conflicts:
#	FarmMapsBlight/appsettings.json

FarmMapsBlight/BlightService.cs

@@ -1,7 +1,10 @@
 using FarmmapsApi.Models;
 using FarmmapsApi.Services;
+using FarmMapsBlight.Models;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using static FarmmapsApi.Extensions;
 using static FarmmapsApiSamples.Constants;
@@ -32,6 +35,14 @@ namespace FarmMapsBlight
             taskRequest.attributes["plantingDate"] = plantingDate.ToUniversalTime().ToString("o");
             taskRequest.attributes["emergeDate"] = emergeDate.ToUniversalTime().ToString("o");
 
+            List<Spray> sprays = new List<Spray>();
+            sprays.Add(new Spray() { fungicideCode = "FLEX", SprayTime = new DateTime(2020, 9, 1), dose = 0.6, isVRA = false });
+            taskRequest.attributes["sprays"] = JsonConvert.SerializeObject(sprays);
+
+            List<Irrigation> irrigations = new List<Irrigation>();
+            irrigations.Add(new Irrigation() { startTime = new DateTime(2020, 7, 1, 2, 0, 0), endTime = new DateTime(2020, 7, 1, 14, 0, 0) });
+            taskRequest.attributes["irrigations"] = JsonConvert.SerializeObject(irrigations);
+
             var taskCode = await _farmmapsApiService.QueueTaskAsync(cropfieldItem.Code, taskRequest);
             await PollTask(TimeSpan.FromSeconds(3), async (tokenSource) =>
             {

FarmMapsBlight/Models/Irrigation.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace FarmMapsBlight.Models
+{
+    public class Irrigation
+    {
+        public DateTime startTime { get; set; }
+        public DateTime endTime { get; set; }
+        public double mm { get; set; }
+    }
+}

FarmMapsBlight/Models/Spray.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace FarmMapsBlight.Models
+{
+    public class Spray
+    {
+        public DateTime SprayTime { get; set; }
+        public string fungicideCode { get; set; }
+        public double dose { get; set; }
+        public bool isVRA { get; set; }
+    }
+}

FarmMapsBlight/appsettings.json

@@ -1,10 +1,12 @@
 {
    "Authority": "https://accounts.farmmaps.awtest.nl/",
-   "Endpoint": "https://farmmaps.awtest.nl/",
+   //"Endpoint": "http://farmmaps.awtest.nl",
+   //"Endpoint": "http://localhost:8095",
+   "Endpoint": "http://localhost:8083", // vs
    "BasePath": "api/v1",
    "DiscoveryEndpointUrl": "https://accounts.farmmaps.awtest.nl/.well-known/openid-configuration",
    "RedirectUri": "http://example.nl/api",
-   "ClientId": "",
-   "ClientSecret": "",
+   "ClientId": "wurtest1",
+   "ClientSecret": "7<Wy[y,?Lfr66}G`",
    "Scopes": [ "api" ]
 }