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

#27 -cr fix

Browse Source
This commit is contained in:
Adrian Hopek 2022-01-24 12:25:28 +01:00
parent 816af23ce4
commit 78ba962bc9
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/UserController.php
View File

@ -21,6 +21,7 @@ class UserController extends Controller
->withTrashed() ->withTrashed()
->search($request->query("search")) ->search($request->query("search"))
->orderBy("last_name") ->orderBy("last_name")
->orderBy("first_name")
->paginate() ->paginate()
->withQueryString(); ->withQueryString();

1
app/Http/Controllers/VacationLimitController.php
View File

@ -17,6 +17,7 @@ class VacationLimitController extends Controller
$limits = VacationLimit::query() $limits = VacationLimit::query()
->with("user") ->with("user")
->orderByUserField("last_name") ->orderByUserField("last_name")
->orderByUserField("first_name")
->get(); ->get();
return inertia("VacationLimits", [ return inertia("VacationLimits", [

4
app/Http/Requests/UserRequest.php
View File

@ -14,8 +14,8 @@ class UserRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
return [ return [
"firstName" => ["required", "min:3", "max: 80"], "firstName" => ["required", "min:3", "max:80"],
"lastName" => ["required", "min:3", "max: 80"], "lastName" => ["required", "min:3", "max:80"],
"email" => ["required", "email", Rule::unique("users", "email")->ignore($this->user)], "email" => ["required", "email", Rule::unique("users", "email")->ignore($this->user)],
"employmentForm" => ["required", new Enum(EmploymentForm::class)], "employmentForm" => ["required", new Enum(EmploymentForm::class)],
"employmentDate" => ["required", "date"], "employmentDate" => ["required", "date"],