Merge pull request #79 from martijnmelchers/development

Development
martijnmelchers · Jan 10, 2020 · b00aef5 · b00aef5
2 parents 4e53bfc + f0046fc
commit b00aef5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/DomainServices/Services/AvailabilityService.cs b/src/DomainServices/Services/AvailabilityService.cs
@@ -75,7 +75,7 @@ public async Task<Dictionary<long, Availability>> GetUnavailabilitiesForFuture(i
         {
              var list = await _db.Availabilities
                 .OrderByDescending(c => c.EndTime)
-                .Where(c => c.StartTime > startDate &&  c.Employee.Id == employeeId)
+                .Where(c => c.StartTime > startDate &&  c.Employee.Id == employeeId && c.EventTitle == "Niet beschikbaar")
                 .ToListAsync();
             var dictionary = new Dictionary<long, Availability>();
             foreach (Availability availability in list)

diff --git a/src/DomainServices/Startup.cs b/src/DomainServices/Startup.cs
@@ -38,7 +38,6 @@ public static IServiceCollection AddDomainServices(this IServiceCollection servi
                 services.AddScoped<IAddressService, AddressService>();
                 services.AddScoped<IGoogleMapsService, GoogleMapsService>();
                 services.AddScoped<ISicknessService, SicknessService>();
-
                 services.AddScoped<IAvailabilityService, AvailabilityService>();
 
                 // Database initialisation code below

diff --git a/src/Web/Controllers/AvailabilityController.cs b/src/Web/Controllers/AvailabilityController.cs
@@ -58,7 +58,7 @@ public async Task<IActionResult> Index(String j)
                 var test = Request.Form[item].ToString();
                 foreach (var s in test.Split(','))
                 {
-                    dateTimes.Add(DateTime.Parse(s));
+                    dateTimes.Add(DateTime.Parse(s, new System.Globalization.CultureInfo("nl-NL")));
                 }
             }