Merge pull request 'fix: standardize closure syntax and ensure newline at end of file in multiple files' (#34) from fix/standardize-closure-syntax into dev
Reviewed-on: itm/siakad-itm#34
This commit is contained in:
commit
13d5ce5853
@ -66,7 +66,7 @@ public function destroy(User $user): RedirectResponse
|
|||||||
{
|
{
|
||||||
$this->service->delete($user);
|
$this->service->delete($user);
|
||||||
|
|
||||||
return Inertia::flash('toast', ['type' => 'success', 'message' => 'Dosen berhasil dihapus.'])->back();
|
return Inertia::flash('toast', ['type' => 'success', 'message' => 'Dosen berhasil dihapus.'])->back();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function resetPassword(User $user): RedirectResponse
|
public function resetPassword(User $user): RedirectResponse
|
||||||
|
|||||||
@ -17,7 +17,7 @@ public function paginated(int $perPage = 25, string $search = '', string $sort =
|
|||||||
{
|
{
|
||||||
return AcademicTerm::query()
|
return AcademicTerm::query()
|
||||||
->select(['id', 'name', 'semester', 'start_date', 'end_date', 'is_active'])
|
->select(['id', 'name', 'semester', 'start_date', 'end_date', 'is_active'])
|
||||||
->when($search, fn($q) => $q->where('name', 'like', "%{$search}%"))
|
->when($search, fn ($q) => $q->where('name', 'like', "%{$search}%"))
|
||||||
->orderBy($sort, $direction)
|
->orderBy($sort, $direction)
|
||||||
->paginate($perPage);
|
->paginate($perPage);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,11 +12,11 @@ class AdministratorService
|
|||||||
public function getPaginated(array $filters = []): LengthAwarePaginator
|
public function getPaginated(array $filters = []): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return User::with(['profile', 'roles'])
|
return User::with(['profile', 'roles'])
|
||||||
->whereHas('roles', fn($q) => $q->whereIn('name', ['staff-admin', 'staff-keuangan']))
|
->whereHas('roles', fn ($q) => $q->whereIn('name', ['staff-admin', 'staff-keuangan']))
|
||||||
->when($filters['search'] ?? null, fn($q, $search) => $q->where(function ($query) use ($search) {
|
->when($filters['search'] ?? null, fn ($q, $search) => $q->where(function ($query) use ($search) {
|
||||||
$query->where('username', 'like', "%{$search}%")
|
$query->where('username', 'like', "%{$search}%")
|
||||||
->orWhere('email', 'like', "%{$search}%")
|
->orWhere('email', 'like', "%{$search}%")
|
||||||
->orWhereHas('profile', fn($q) => $q->where('full_name', 'like', "%{$search}%"));
|
->orWhereHas('profile', fn ($q) => $q->where('full_name', 'like', "%{$search}%"));
|
||||||
}))
|
}))
|
||||||
->latest()
|
->latest()
|
||||||
->paginate($filters['per_page'] ?? 25);
|
->paginate($filters['per_page'] ?? 25);
|
||||||
|
|||||||
@ -19,12 +19,12 @@ public function getAllForSelect(): Collection
|
|||||||
public function getPaginated(array $filters = []): LengthAwarePaginator
|
public function getPaginated(array $filters = []): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return User::with(['profile', 'lecturer.department'])
|
return User::with(['profile', 'lecturer.department'])
|
||||||
->whereHas('roles', fn($q) => $q->where('name', 'dosen'))
|
->whereHas('roles', fn ($q) => $q->where('name', 'dosen'))
|
||||||
->when($filters['search'] ?? null, fn($q, $search) => $q->where(function ($query) use ($search) {
|
->when($filters['search'] ?? null, fn ($q, $search) => $q->where(function ($query) use ($search) {
|
||||||
$query->where('username', 'like', "%{$search}%")
|
$query->where('username', 'like', "%{$search}%")
|
||||||
->orWhere('email', 'like', "%{$search}%")
|
->orWhere('email', 'like', "%{$search}%")
|
||||||
->orWhereHas('profile', fn($q) => $q->where('full_name', 'like', "%{$search}%"))
|
->orWhereHas('profile', fn ($q) => $q->where('full_name', 'like', "%{$search}%"))
|
||||||
->orWhereHas('lecturer', fn($q) => $q->where('lecturer_number', 'like', "%{$search}%"));
|
->orWhereHas('lecturer', fn ($q) => $q->where('lecturer_number', 'like', "%{$search}%"));
|
||||||
}))
|
}))
|
||||||
->latest()
|
->latest()
|
||||||
->paginate($filters['per_page'] ?? 25);
|
->paginate($filters['per_page'] ?? 25);
|
||||||
|
|||||||
@ -19,12 +19,12 @@ public function getAllForSelect(): Collection
|
|||||||
public function getPaginated(array $filters = []): LengthAwarePaginator
|
public function getPaginated(array $filters = []): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return User::with(['profile', 'student.department'])
|
return User::with(['profile', 'student.department'])
|
||||||
->whereHas('roles', fn($q) => $q->where('name', 'mahasiswa'))
|
->whereHas('roles', fn ($q) => $q->where('name', 'mahasiswa'))
|
||||||
->when($filters['search'] ?? null, fn($q, $search) => $q->where(function ($query) use ($search) {
|
->when($filters['search'] ?? null, fn ($q, $search) => $q->where(function ($query) use ($search) {
|
||||||
$query->where('username', 'like', "%{$search}%")
|
$query->where('username', 'like', "%{$search}%")
|
||||||
->orWhere('email', 'like', "%{$search}%")
|
->orWhere('email', 'like', "%{$search}%")
|
||||||
->orWhereHas('profile', fn($q) => $q->where('full_name', 'like', "%{$search}%"))
|
->orWhereHas('profile', fn ($q) => $q->where('full_name', 'like', "%{$search}%"))
|
||||||
->orWhereHas('student', fn($q) => $q->where('student_number', 'like', "%{$search}%"));
|
->orWhereHas('student', fn ($q) => $q->where('student_number', 'like', "%{$search}%"));
|
||||||
}))
|
}))
|
||||||
->latest()
|
->latest()
|
||||||
->paginate($filters['per_page'] ?? 25);
|
->paginate($filters['per_page'] ?? 25);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user