kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#95 - fix

Browse Source
This commit is contained in:
Adrian Hopek 2022-03-28 13:03:15 +02:00
parent c97d8a151c
commit 3beac250a5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Infrastructure/Http/Controllers/Api/CalculateVacationDaysController.php
View File

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Toby\Infrastructure\Http\Controllers\Api; namespace Toby\Infrastructure\Http\Controllers\Api;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Support\Carbon;
use Toby\Domain\VacationDaysCalculator; use Toby\Domain\VacationDaysCalculator;
use Toby\Infrastructure\Http\Controllers\Controller; use Toby\Infrastructure\Http\Controllers\Controller;
use Toby\Infrastructure\Http\Requests\Api\CalculateVacationDaysRequest; use Toby\Infrastructure\Http\Requests\Api\CalculateVacationDaysRequest;
@ -15,6 +16,6 @@ class CalculateVacationDaysController extends Controller
{ {
$days = $calculator->calculateDays($request->yearPeriod(), $request->from(), $request->to()); $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());
} }
} }

4
resources/js/Pages/VacationRequest/Create.vue
View File

@ -392,8 +392,12 @@ function createForm() {
} }
function onFromChange(selectedDates, dateStr) { function onFromChange(selectedDates, dateStr) {
if (form.to === null) {
form.to = dateStr form.to = dateStr
return
}
refreshEstimatedDays(form.from, form.to) refreshEstimatedDays(form.from, form.to)
} }