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

Merge branch 'main' into #43-vacation-summary-for-employee

Browse Source 
# Conflicts:
#	app/Infrastructure/Http/Controllers/HolidayController.php
#	app/Infrastructure/Http/Controllers/VacationLimitController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	composer.lock
#	resources/js/Pages/Holidays/Index.vue
#	resources/js/Pages/VacationRequest/Create.vue
This commit is contained in:
Adrian Hopek
2022-03-02 10:01:14 +01:00
parent 758689d376 d825dd727f
commit 474707e691
51 changed files with 1993 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Domain/UserVacationStatsRetriever.php
View File

@@ -6,7 +6,6 @@ namespace Toby\Domain;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Toby\Domain\Enums\VacationRequestState;
use Toby\Domain\Enums\VacationType;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\YearPeriod;
@@ -26,7 +25,7 @@ class UserVacationStatsRetriever
"vacationRequest",
fn(Builder $query) => $query
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestState::successStates()),
->states(VacationRequestStatesRetriever::successStates()),
)
->count();
}
@@ -40,7 +39,7 @@ class UserVacationStatsRetriever
"vacationRequest",
fn(Builder $query) => $query
->whereIn("type", $this->getLimitableVacationTypes())
->states(VacationRequestState::pendingStates()),
->states(VacationRequestStatesRetriever::pendingStates()),
)
->count();
}
@@ -54,7 +53,7 @@ class UserVacationStatsRetriever
"vacationRequest",
fn(Builder $query) => $query
->whereIn("type", $this->getNotLimitableVacationTypes())
->states(VacationRequestState::successStates()),
->states(VacationRequestStatesRetriever::successStates()),
)
->count();
}