From f1a3b8f9dd80439e210f3ffa3e8753d12b696d34 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Fri, 4 Feb 2022 10:11:15 +0100 Subject: [PATCH] #40 - generate pdf --- app/Eloquent/Models/User.php | 1 + app/Eloquent/Models/VacationRequest.php | 8 ++++++ .../Controllers/GeneratePdfController.php | 18 ------------- .../Controllers/VacationRequestController.php | 15 ++++++++++- .../Http/Requests/UserRequest.php | 2 ++ .../Http/Resources/UserFormDataResource.php | 1 + .../Http/Resources/UserResource.php | 1 + database/factories/UserFactory.php | 1 + database/factories/VacationRequestFactory.php | 25 ++++++++++++++---- .../2014_10_12_000000_create_users_table.php | 1 + ..._100039_create_vacation_requests_table.php | 2 ++ database/seeders/DatabaseSeeder.php | 13 +++++++++- resources/js/Pages/Users/Create.vue | 23 ++++++++++++++++ resources/js/Pages/Users/Edit.vue | 23 ++++++++++++++++ resources/js/Pages/Users/Index.vue | 9 +++++++ resources/js/Pages/VacationRequest/Show.vue | 26 +++++++++++++++++++ .../vacation-request.blade.php} | 16 +++++++----- routes/web.php | 5 ++-- tests/Feature/UserTest.php | 6 +++++ 19 files changed, 161 insertions(+), 35 deletions(-) delete mode 100644 app/Infrastructure/Http/Controllers/GeneratePdfController.php rename resources/views/{vacation-request-pdf.blade.php => pdf/vacation-request.blade.php} (72%) diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index 7c6fd93..6a7c4db 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -22,6 +22,7 @@ use Toby\Domain\Enums\Role; * @property string $last_name * @property string $email * @property string $avatar + * @property string $position * @property Role $role * @property EmploymentForm $employment_form * @property Carbon $employment_date diff --git a/app/Eloquent/Models/VacationRequest.php b/app/Eloquent/Models/VacationRequest.php index 528759d..9c7ada0 100644 --- a/app/Eloquent/Models/VacationRequest.php +++ b/app/Eloquent/Models/VacationRequest.php @@ -23,7 +23,10 @@ use Toby\Domain\Enums\VacationType; * @property Carbon $to * @property string $comment * @property User $user + * @property YearPeriod $yearPeriod * @property Collection $activities + * @property Carbon $created_at + * @property Carbon $updated_at */ class VacationRequest extends Model { @@ -43,6 +46,11 @@ class VacationRequest extends Model return $this->belongsTo(User::class); } + public function yearPeriod(): BelongsTo + { + return $this->belongsTo(YearPeriod::class); + } + public function activities(): HasMany { return $this->hasMany(VacationRequestActivity::class); diff --git a/app/Infrastructure/Http/Controllers/GeneratePdfController.php b/app/Infrastructure/Http/Controllers/GeneratePdfController.php deleted file mode 100644 index 6ce8e16..0000000 --- a/app/Infrastructure/Http/Controllers/GeneratePdfController.php +++ /dev/null @@ -1,18 +0,0 @@ -stream(); - } -} diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index a19b81b..3c2eaf8 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -4,13 +4,16 @@ declare(strict_types=1); namespace Toby\Infrastructure\Http\Controllers; +use Barryvdh\DomPDF\Facade\Pdf; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Http\Response as LaravelResponse; use Inertia\Response; use Toby\Domain\Enums\VacationRequestState; use Toby\Domain\Enums\VacationType; use Toby\Domain\VacationRequestStateManager; use Toby\Domain\Validation\VacationRequestValidator; +use Toby\Eloquent\Helpers\YearPeriodRetriever; use Toby\Eloquent\Models\VacationRequest; use Toby\Infrastructure\Http\Requests\VacationRequestRequest; use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource; @@ -18,10 +21,11 @@ use Toby\Infrastructure\Http\Resources\VacationRequestResource; class VacationRequestController extends Controller { - public function index(Request $request): Response + public function index(Request $request, YearPeriodRetriever $yearPeriodRetriever): Response { $vacationRequests = $request->user() ->vacationRequests() + ->where("year_period_id", $yearPeriodRetriever->selected()->id) ->latest() ->states(VacationRequestState::filterByStatus($request->query("status", "all"))) ->paginate(); @@ -40,6 +44,15 @@ class VacationRequestController extends Controller ]); } + public function download(VacationRequest $vacationRequest): LaravelResponse + { + $pdf = PDF::loadView("pdf.vacation-request", [ + "vacationRequest" => $vacationRequest, + ]); + + return $pdf->stream(); + } + public function create(): Response { return inertia("VacationRequest/Create", [ diff --git a/app/Infrastructure/Http/Requests/UserRequest.php b/app/Infrastructure/Http/Requests/UserRequest.php index 2f7ed8c..e46e5f0 100644 --- a/app/Infrastructure/Http/Requests/UserRequest.php +++ b/app/Infrastructure/Http/Requests/UserRequest.php @@ -19,6 +19,7 @@ class UserRequest extends FormRequest "lastName" => ["required", "min:3", "max:80"], "email" => ["required", "email", Rule::unique("users", "email")->ignore($this->user)], "role" => ["required", new Enum(Role::class)], + "position" => ["required"], "employmentForm" => ["required", new Enum(EmploymentForm::class)], "employmentDate" => ["required", "date_format:Y-m-d"], ]; @@ -30,6 +31,7 @@ class UserRequest extends FormRequest "first_name" => $this->get("firstName"), "last_name" => $this->get("lastName"), "email" => $this->get("email"), + "position" => $this->get("position"), "role" => $this->get("role"), "employment_form" => $this->get("employmentForm"), "employment_date" => $this->get("employmentDate"), diff --git a/app/Infrastructure/Http/Resources/UserFormDataResource.php b/app/Infrastructure/Http/Resources/UserFormDataResource.php index 451fda2..6847362 100644 --- a/app/Infrastructure/Http/Resources/UserFormDataResource.php +++ b/app/Infrastructure/Http/Resources/UserFormDataResource.php @@ -18,6 +18,7 @@ class UserFormDataResource extends JsonResource "lastName" => $this->last_name, "email" => $this->email, "role" => $this->role, + "position" => $this->position, "employmentForm" => $this->employment_form, "employmentDate" => $this->employment_date->toDateString(), ]; diff --git a/app/Infrastructure/Http/Resources/UserResource.php b/app/Infrastructure/Http/Resources/UserResource.php index bdff955..5e3107f 100644 --- a/app/Infrastructure/Http/Resources/UserResource.php +++ b/app/Infrastructure/Http/Resources/UserResource.php @@ -17,6 +17,7 @@ class UserResource extends JsonResource "name" => $this->fullName, "email" => $this->email, "role" => $this->role->label(), + "position" => $this->position, "avatar" => asset($this->avatar), "deleted" => $this->trashed(), "employmentForm" => $this->employment_form->label(), diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 5e4086a..c6a5d93 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -22,6 +22,7 @@ class UserFactory extends Factory "last_name" => $this->faker->lastName(), "email" => $this->faker->unique()->safeEmail(), "employment_form" => $this->faker->randomElement(EmploymentForm::cases()), + "position" => $this->faker->jobTitle(), "role" => Role::EMPLOYEE, "employment_date" => Carbon::createFromInterface($this->faker->dateTimeBetween("2020-10-27"))->toDateString(), "remember_token" => Str::random(10), diff --git a/database/factories/VacationRequestFactory.php b/database/factories/VacationRequestFactory.php index 839e2b7..e8bec48 100644 --- a/database/factories/VacationRequestFactory.php +++ b/database/factories/VacationRequestFactory.php @@ -4,11 +4,13 @@ declare(strict_types=1); namespace Database\Factories; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Factories\Factory; use Toby\Domain\Enums\VacationRequestState; use Toby\Domain\Enums\VacationType; use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\VacationRequest; +use Toby\Eloquent\Models\YearPeriod; class VacationRequestFactory extends Factory { @@ -16,17 +18,30 @@ class VacationRequestFactory extends Factory public function definition(): array { - $number = $this->faker->numberBetween(1, 20); - $year = $this->faker->year; + $from = CarbonImmutable::create($this->faker->dateTimeThisYear); + $days = $this->faker->numberBetween(0, 20); return [ "user_id" => User::factory(), - "name" => "{$number}/{$year}", + "year_period_id" => YearPeriod::factory(), + "name" => fn(array $attributes) => $this->generateName($attributes), "type" => $this->faker->randomElement(VacationType::cases()), "state" => $this->faker->randomElement(VacationRequestState::cases()), - "from" => $this->faker->date, - "to" => $this->faker->date, + "from" => $from, + "to" => $from->addDays($days), "comment" => $this->faker->boolean ? $this->faker->paragraph() : null, ]; } + + protected function generateName(array $attributes): string + { + $year = YearPeriod::find($attributes["year_period_id"])->year; + $user = User::find($attributes["user_id"]); + + $number = $user->vacationRequests() + ->whereYear("from", $year) + ->count() + 1; + + return "{$number}/{$year}"; + } } diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index cc11d89..5f09111 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -17,6 +17,7 @@ return new class() extends Migration { $table->string("email")->unique(); $table->string("avatar")->nullable(); $table->string("role")->default(Role::EMPLOYEE->value); + $table->string("position"); $table->string("employment_form"); $table->date("employment_date"); $table->rememberToken(); diff --git a/database/migrations/2022_01_26_100039_create_vacation_requests_table.php b/database/migrations/2022_01_26_100039_create_vacation_requests_table.php index a7e4cd7..f5270da 100644 --- a/database/migrations/2022_01_26_100039_create_vacation_requests_table.php +++ b/database/migrations/2022_01_26_100039_create_vacation_requests_table.php @@ -6,6 +6,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; use Toby\Eloquent\Models\User; +use Toby\Eloquent\Models\YearPeriod; return new class() extends Migration { public function up(): void @@ -14,6 +15,7 @@ return new class() extends Migration { $table->id(); $table->string("name"); $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete(); + $table->foreignIdFor(YearPeriod::class)->constrained()->cascadeOnDelete(); $table->string("type"); $table->string("state")->nullable(); $table->date("from"); diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index af9ac30..205246a 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -31,7 +31,6 @@ class DatabaseSeeder extends Seeder User::factory([ "email" => env("LOCAL_EMAIL_FOR_LOGIN_VIA_GOOGLE"), ]) - ->hasVacationRequests(5) ->create(); $users = User::all(); @@ -70,6 +69,18 @@ class DatabaseSeeder extends Seeder } }) ->create(); + + $yearPeriods = YearPeriod::all(); + + foreach ($users as $user) { + VacationRequest::factory() + ->count(10) + ->for($user) + ->sequence(fn() => [ + "year_period_id" => $yearPeriods->random()->id, + ]) + ->create(); + } } protected function generateAvatarsForUsers(Collection $users): void diff --git a/resources/js/Pages/Users/Create.vue b/resources/js/Pages/Users/Create.vue index 5347b60..9b4029d 100644 --- a/resources/js/Pages/Users/Create.vue +++ b/resources/js/Pages/Users/Create.vue @@ -82,6 +82,28 @@

+
+ +
+ +

+ {{ form.errors.position }} +

+
+
+
+ +
+ +

+ {{ form.errors.position }} +

+
+
role.value === props.user.role), + position: props.user.position, employmentForm: props.employmentForms.find(form => form.value === props.user.employmentForm), employmentDate: props.user.employmentDate, }) diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue index 0565cc9..93e6f10 100644 --- a/resources/js/Pages/Users/Index.vue +++ b/resources/js/Pages/Users/Index.vue @@ -49,6 +49,12 @@ > Rola + + Stanowisko + {{ user.role }} + + {{ user.position }} + {{ user.employmentForm }} diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue index 77ec86e..ce30fec 100644 --- a/resources/js/Pages/VacationRequest/Show.vue +++ b/resources/js/Pages/VacationRequest/Show.vue @@ -58,6 +58,30 @@ {{ request.comment }} +
+
+ Załączniki +
+
+ +
+
@@ -196,11 +220,13 @@