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

#27 - separate fields for name and surname #29

Merged
Baakoma merged 2 commits from #27-separate-fields-for-name-and-surname into main 2022-01-24 12:40:56 +01:00
Conversation 4 Commits 2 Files Changed 17 +4 -2
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78ba962bc9 - Show all commits

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

@@ -21,6 +21,7 @@ class UserController extends Controller
->withTrashed()
->search($request->query("search"))
->orderBy("last_name")
->orderBy("first_name")
krzysztofrewak commented 2022-01-24 12:22:01 +01:00 (Migrated from github.com)
Review
Copy Link
            ->orderBy("last_name")
            ->orderBy("first_name")

Please remember about nepotism. ;)

```suggestion ->orderBy("last_name") ->orderBy("first_name") ``` Please remember about nepotism. ;)
->paginate()
->withQueryString();

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

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

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

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