This commit is contained in:
Adrian Hopek
2022-04-08 12:42:24 +02:00
parent 4af0482a93
commit 6506855bba
50 changed files with 581 additions and 196 deletions

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(),
];
}

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,
];

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->fullName,
"email" => $this->email,
"avatar" => $this->profile->getAvatar(),
];
}
}

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(),
];
}
}

View File

@@ -14,14 +14,15 @@ class UserResource extends JsonResource
{
return [
"id" => $this->id,
"name" => $this->fullName,
"name" => $this->profile->fullName,
"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(),
];
}
}

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->fullName : __("System"),
"state" => $this->to,
];
}

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(),