Merge branch 'main' into #43-vacation-summary-for-employee
# 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:
		@@ -28,4 +28,25 @@ class UserFactory extends Factory
 | 
			
		||||
            "remember_token" => Str::random(10),
 | 
			
		||||
        ];
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public function admin(): static
 | 
			
		||||
    {
 | 
			
		||||
        return $this->state([
 | 
			
		||||
            "role" => Role::Administrator,
 | 
			
		||||
        ]);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public function technicalApprover(): static
 | 
			
		||||
    {
 | 
			
		||||
        return $this->state([
 | 
			
		||||
            "role" => Role::TechnicalApprover,
 | 
			
		||||
        ]);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public function administrativeApprover(): static
 | 
			
		||||
    {
 | 
			
		||||
        return $this->state([
 | 
			
		||||
            "role" => Role::AdministrativeApprover,
 | 
			
		||||
        ]);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -6,8 +6,8 @@ namespace Database\Factories;
 | 
			
		||||
 | 
			
		||||
use Carbon\CarbonImmutable;
 | 
			
		||||
use Illuminate\Database\Eloquent\Factories\Factory;
 | 
			
		||||
use Toby\Domain\Enums\VacationRequestState;
 | 
			
		||||
use Toby\Domain\Enums\VacationType;
 | 
			
		||||
use Toby\Domain\VacationRequestStatesRetriever;
 | 
			
		||||
use Toby\Eloquent\Models\User;
 | 
			
		||||
use Toby\Eloquent\Models\VacationRequest;
 | 
			
		||||
use Toby\Eloquent\Models\YearPeriod;
 | 
			
		||||
@@ -28,7 +28,7 @@ class VacationRequestFactory extends Factory
 | 
			
		||||
            "year_period_id" => YearPeriod::factory(),
 | 
			
		||||
            "name" => fn(array $attributes): string => $this->generateName($attributes),
 | 
			
		||||
            "type" => $this->faker->randomElement(VacationType::cases()),
 | 
			
		||||
            "state" => $this->faker->randomElement(VacationRequestState::cases()),
 | 
			
		||||
            "state" => $this->faker->randomElement(VacationRequestStatesRetriever::all()),
 | 
			
		||||
            "from" => $from,
 | 
			
		||||
            "to" => $from->addDays($days),
 | 
			
		||||
            "comment" => $this->faker->boolean ? $this->faker->paragraph() : null,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user