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

changes for the controller have been withdrawn

Browse Source 
Co-authored-by: Adrian Hopek <adrian.hopek@blumilk.pl>
This commit is contained in:
Kamil Niemczycki
2022-06-07 12:37:07 +02:00
parent 2be881381d
commit ba1d5bce2a
2 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Infrastructure/Http/Controllers/VacationRequestController.php
View File

@@ -28,7 +28,6 @@ use Toby\Domain\VacationTypeConfigRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever; use Toby\Eloquent\Helpers\YearPeriodRetriever;
use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationRequest; use Toby\Eloquent\Models\VacationRequest;
use Toby\Infrastructure\Http\Requests\CreateVacationRequestRequest;
use Toby\Infrastructure\Http\Requests\VacationRequestRequest; use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
use Toby\Infrastructure\Http\Resources\SimpleUserResource; use Toby\Infrastructure\Http\Resources\SimpleUserResource;
use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource; use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
@@ -167,15 +166,13 @@ class VacationRequestController extends Controller
return $pdf->stream(); return $pdf->stream();
} }
public function create(CreateVacationRequestRequest $request): Response public function create(Request $request): Response
{ {
$users = User::query() $users = User::query()
->orderByProfileField("last_name") ->orderByProfileField("last_name")
->orderByProfileField("first_name") ->orderByProfileField("first_name")
->get(); ->get();
$requestData = $request->data();
return inertia("VacationRequest/Create", [ return inertia("VacationRequest/Create", [
"vacationTypes" => VacationType::casesToSelect(), "vacationTypes" => VacationType::casesToSelect(),
"users" => SimpleUserResource::collection($users), "users" => SimpleUserResource::collection($users),
@@ -183,8 +180,8 @@ class VacationRequestController extends Controller
"createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class), "createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class),
"skipFlow" => $request->user()->can("skipFlow", VacationRequest::class), "skipFlow" => $request->user()->can("skipFlow", VacationRequest::class),
], ],
"vacationUserId" => $requestData["user"], "vacationUserId" => (int)$request->get("user"),
"vacationFromDate" => $requestData["from_date"], "vacationFromDate" => $request->get("from_date"),
]); ]);
} }

36
app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php
View File

@@ -1,36 +0,0 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Toby\Eloquent\Models\VacationRequest;
class CreateVacationRequestRequest extends FormRequest
{
protected $redirectRoute = "vacation.requests.create";
public function authorize(): bool
{
return ($this->get("user") === null) ||
((int)$this->get("user") === $this->user()->id) ||
$this->user()->can("createOnBehalfOfEmployee", VacationRequest::class);
}
public function rules(): array
{
return [
"user" => ["nullable", "exists:users,id"],
"from_date" => ["nullable", "date_format:Y-m-d"],
];
}
public function data(): array
{
return [
"user" => (int)$this->get("user"),
"from_date" => $this->get("from_date"),
];
}
}