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

#120 - wip

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-20 10:17:58 +02:00
parent cc981b02b4
commit 4158e88634
7 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Infrastructure/Http/Controllers/TimesheetController.php
View File

@@ -35,7 +35,8 @@ class TimesheetController extends Controller
$types = VacationType::all()
->filter(
fn(VacationType $type) => $configRetriever->isAvailableFor($type, EmploymentForm::EmploymentContract),
fn(VacationType $type) => $configRetriever->isAvailableFor($type, EmploymentForm::EmploymentContract)
&& $configRetriever->isVacation($type),
);
$filename = "{$carbonMonth->translatedFormat("F Y")}.xlsx";

4
app/Infrastructure/Http/Controllers/VacationLimitController.php
View File

@@ -11,7 +11,7 @@ use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\VacationLimit;
use Toby\Eloquent\Models\YearPeriod;
use Toby\Infrastructure\Http\Requests\VacationLimitRequest;
use Toby\Infrastructure\Http\Resources\SimpleUserResource;
use Toby\Infrastructure\Http\Resources\UserResource;
class VacationLimitController extends Controller
{
@@ -32,7 +32,7 @@ class VacationLimitController extends Controller
$limitsResource = $limits->map(fn(VacationLimit $limit) => [
"id" => $limit->id,
"user" => new SimpleUserResource($limit->user),
"user" => new UserResource($limit->user),
"hasVacation" => $limit->hasVacation(),
"days" => $limit->days,
"remainingLastYear" => $previousYearPeriod