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

Merge branch 'main' into #6-google-calendar

Browse Source 
# Conflicts:
#	app/Domain/CalendarGenerator.php
#	app/Domain/Enums/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/Vacation.php
#	database/migrations/2022_02_07_133018_create_vacations_table.php
#	resources/js/Composables/statusInfo.js
#	resources/js/Pages/Calendar.vue
#	tests/Feature/VacationRequestTest.php
#	tests/Unit/VacationRequestStatesTest.php
This commit is contained in:
Adrian Hopek
2022-02-15 15:24:03 +01:00
parent aefa33cbf2 6c352b629c
commit 811c644002
15 changed files with 160 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/factories/UserFactory.php
View File

@@ -23,7 +23,7 @@ class UserFactory extends Factory
"email" => $this->faker->unique()->safeEmail(),
"employment_form" => $this->faker->randomElement(EmploymentForm::cases()),
"position" => $this->faker->jobTitle(),
"role" => Role::EMPLOYEE,
"role" => Role::Employee,
"employment_date" => Carbon::createFromInterface($this->faker->dateTimeBetween("2020-10-27"))->toDateString(),
"remember_token" => Str::random(10),
];

2
database/migrations/2014_10_12_000000_create_users_table.php
View File

@@ -16,7 +16,7 @@ return new class() extends Migration {
$table->string("last_name");
$table->string("email")->unique();
$table->string("avatar")->nullable();
$table->string("role")->default(Role::EMPLOYEE->value);
$table->string("role")->default(Role::Employee->value);
$table->string("position");
$table->string("employment_form");
$table->date("employment_date");