Skip to content

- fix order vacation type in the vacation timesheet #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EwelinaSkrzypacz merged 3 commits into from
Sep 8, 2025
Merged

- fix order vacation type in the vacation timesheet #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b164c0c
- fix order vacation type in the vacation timesheet
EwelinaSkrzypacz Sep 8, 2025
379cce5
- fix order vacation type in the vacation timesheet
EwelinaSkrzypacz Sep 8, 2025
2adc1cd
- cs fix
EwelinaSkrzypacz Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/Domain/TimesheetPerUserSheet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
use PhpOffice\PhpSpreadsheet\Style\Fill;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use Toby\Enums\VacationType;
use Toby\Models\Holiday;
use Toby\Models\User;
use Toby\Models\Vacation;
Expand Down Expand Up @@ -121,7 +120,7 @@ public function generator(): Generator
$workedThisDay ? static::HOURS_PER_DAY : null,
];

foreach (VacationType::cases() as $type) {
foreach ($this->types as $type) {
$row[] = $vacationsForDay->has($type->value) ? static::HOURS_PER_DAY : null;
}

Expand Down
2 changes: 1 addition & 1 deletion app/Enums/VacationType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
enum VacationType: string
{
case RemoteWork = "remote_work";
case Absence = "absence";
case Vacation = "vacation";
case Sick = "sick_vacation";
case Special = "special_vacation";
Expand All @@ -20,6 +19,7 @@ enum VacationType: string
case Training = "training_vacation";
case Childcare = "childcare_vacation";
case Volunteering = "volunteering_vacation";
case Absence = "absence";

public static function casesToSelect(): array
{
Expand Down