diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 0e6ce61..a8c4e48 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -21,6 +21,7 @@ class UserController extends Controller ->withTrashed() ->search($request->query("search")) ->orderBy("last_name") + ->orderBy("first_name") ->paginate() ->withQueryString(); diff --git a/app/Http/Controllers/VacationLimitController.php b/app/Http/Controllers/VacationLimitController.php index e1a5ec1..3ec755b 100644 --- a/app/Http/Controllers/VacationLimitController.php +++ b/app/Http/Controllers/VacationLimitController.php @@ -17,6 +17,7 @@ class VacationLimitController extends Controller $limits = VacationLimit::query() ->with("user") ->orderByUserField("last_name") + ->orderByUserField("first_name") ->get(); return inertia("VacationLimits", [ diff --git a/app/Http/Requests/UserRequest.php b/app/Http/Requests/UserRequest.php index a6d6009..0c1d59e 100644 --- a/app/Http/Requests/UserRequest.php +++ b/app/Http/Requests/UserRequest.php @@ -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"],