From 3beac250a5d610a6e9c0e091130efc5e0dfc0fb7 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Mon, 28 Mar 2022 13:03:15 +0200
Subject: [PATCH] #95 - fix

---
 .../Controllers/Api/CalculateVacationDaysController.php     | 3 ++-
 resources/js/Pages/VacationRequest/Create.vue               | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php b/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
index b8a8c33..c204be1 100644
--- a/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
+++ b/app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Toby\Infrastructure\Http\Controllers\Api;
 
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Carbon;
 use Toby\Domain\VacationDaysCalculator;
 use Toby\Infrastructure\Http\Controllers\Controller;
 use Toby\Infrastructure\Http\Requests\Api\CalculateVacationDaysRequest;
@@ -15,6 +16,6 @@ class CalculateVacationDaysController extends Controller
     {
         $days = $calculator->calculateDays($request->yearPeriod(), $request->from(), $request->to());
 
-        return new JsonResponse($days->all());
+        return new JsonResponse($days->map(fn(Carbon $day) => $day->toDateString())->all());
     }
 }
diff --git a/resources/js/Pages/VacationRequest/Create.vue b/resources/js/Pages/VacationRequest/Create.vue
index 87e5b63..2e55514 100644
--- a/resources/js/Pages/VacationRequest/Create.vue
+++ b/resources/js/Pages/VacationRequest/Create.vue
@@ -392,7 +392,11 @@ function createForm() {
 }
 
 function onFromChange(selectedDates, dateStr) {
-  form.to = dateStr
+  if (form.to === null) {
+    form.to = dateStr
+
+    return
+  }
 
   refreshEstimatedDays(form.from, form.to)
 }