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

#90 - user profile (#125)

Browse Source 
* fix css focuses

* #90 - wip

* #90 - fix to generate PDF

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - wip

* #90 - fix to calendar

* #90 - wip

* #90 - fix

* #90 - fix lint

* #90 - fix

* Apply suggestions from code review

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>

* #90 - cr fixes

* #90 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
Co-authored-by: Ewelina Lasowy <56546832+EwelinaLasowy@users.noreply.github.com>
This commit is contained in:
Adrian Hopek
2022-04-14 11:58:45 +02:00
committed by GitHub
parent 459b62500e
commit cc981b02b4
62 changed files with 765 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Infrastructure/Http/Resources/AbsenceResource.php
View File

@@ -14,7 +14,7 @@ class AbsenceResource extends JsonResource
{
return [
"id" => $this->id,
"user" => new UserResource($this->user),
"user" => new SimpleUserResource($this->user),
"date" => $this->date->toDisplayString(),
];
}

1
app/Infrastructure/Http/Resources/HolidayResource.php
View File

@@ -16,6 +16,7 @@ class HolidayResource extends JsonResource
"id" => $this->id,
"name" => $this->name,
"date" => $this->date->toDateString(),
"isPast" => $this->date->isPast(),
"displayDate" => $this->date->toDisplayString(),
"dayOfWeek" => $this->date->dayName,
];

22
app/Infrastructure/Http/Resources/SimpleUserResource.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class SimpleUserResource extends JsonResource
{
public static $wrap = null;
public function toArray($request): array
{
return [
"id" => $this->id,
"name" => $this->profile->full_name,
"email" => $this->email,
"avatar" => $this->profile->getAvatar(),
];
}
}

10
app/Infrastructure/Http/Resources/UserFormDataResource.php
View File

@@ -14,13 +14,13 @@ class UserFormDataResource extends JsonResource
{
return [
"id" => $this->id,
"firstName" => $this->first_name,
"lastName" => $this->last_name,
"firstName" => $this->profile->first_name,
"lastName" => $this->profile->last_name,
"email" => $this->email,
"role" => $this->role,
"position" => $this->position,
"employmentForm" => $this->employment_form,
"employmentDate" => $this->employment_date->toDateString(),
"position" => $this->profile->position,
"employmentForm" => $this->profile->employment_form,
"employmentDate" => $this->profile->employment_date->toDateString(),
];
}
}

11
app/Infrastructure/Http/Resources/UserResource.php
View File

@@ -14,14 +14,15 @@ class UserResource extends JsonResource
{
return [
"id" => $this->id,
"name" => $this->fullName,
"name" => $this->profile->full_name,
"email" => $this->email,
"role" => $this->role->label(),
"position" => $this->position,
"avatar" => $this->getAvatar(),
"position" => $this->profile->position,
"avatar" => $this->profile->getAvatar(),
"deleted" => $this->trashed(),
"employmentForm" => $this->employment_form->label(),
"employmentDate" => $this->employment_date->toDisplayString(),
"lastActiveAt" => $this->last_active_at?->toDateTimeString(),
"employmentForm" => $this->profile->employment_form->label(),
"employmentDate" => $this->profile->employment_date->toDisplayString(),
];
}
}

2
app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
View File

@@ -15,7 +15,7 @@ class VacationRequestActivityResource extends JsonResource
return [
"date" => $this->created_at->toDisplayString(),
"time" => $this->created_at->format("H:i"),
"user" => $this->user ? $this->user->fullName : __("System"),
"user" => $this->user ? $this->user->profile->full_name : __("System"),
"state" => $this->to,
];
}

2
app/Infrastructure/Http/Resources/VacationRequestResource.php
View File

@@ -15,7 +15,7 @@ class VacationRequestResource extends JsonResource
return [
"id" => $this->id,
"name" => $this->name,
"user" => new UserResource($this->user),
"user" => new SimpleUserResource($this->user),
"type" => $this->type,
"state" => $this->state,
"from" => $this->from->toDisplayString(),