#27 -cr fix
This commit is contained in:
parent
816af23ce4
commit
78ba962bc9
@ -21,6 +21,7 @@ class UserController extends Controller
|
||||
->withTrashed()
|
||||
->search($request->query("search"))
|
||||
->orderBy("last_name")
|
||||
->orderBy("first_name")
|
||||
->paginate()
|
||||
->withQueryString();
|
||||
|
||||
|
@ -17,6 +17,7 @@ class VacationLimitController extends Controller
|
||||
$limits = VacationLimit::query()
|
||||
->with("user")
|
||||
->orderByUserField("last_name")
|
||||
->orderByUserField("first_name")
|
||||
->get();
|
||||
|
||||
return inertia("VacationLimits", [
|
||||
|
@ -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"],
|
||||
|
Loading…
x
Reference in New Issue
Block a user