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

fix

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-07 12:50:44 +02:00
parent 760c9bf514
commit d24517271d
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Infrastructure/Http/Controllers/AnnualSummaryController.php
View File

@@ -5,7 +5,6 @@ declare(strict_types=1);
namespace Toby\Infrastructure\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Inertia\Response;
use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\Holiday;
@@ -18,24 +17,20 @@ class AnnualSummaryController extends Controller
{
$yearPeriod = $yearPeriodRetriever->selected();
$startDate = Carbon::createFromDate($yearPeriod->year)->startOfYear()->startOfWeek();
$endDate = Carbon::createFromDate($yearPeriod->year)->endOfYear()->endOfWeek();
$holidays = $yearPeriod->holidays()
->whereBetween("date", [$startDate, $endDate])
->get();
$vacations = $request->user()
->vacations()
->with("vacationRequest.vacations")
->whereBetween("date", [$startDate, $endDate])
->whereBelongsTo($yearPeriod)
->approved()
->get();
$pendingVacations = $request->user()
->vacations()
->with("vacationRequest.vacations")
->whereBetween("date", [$startDate, $endDate])
->whereBelongsTo($yearPeriod)
->pending()
->get();