itm/sispace
itm/sispace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update study group and student queries to sort by full name alphabetically

Browse Source
This commit is contained in:
Yoga Pangestu 2026-03-30 16:38:24 +07:00
parent def7015173
commit 6721ceffcc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filament/Pages/Learning/StudyGroup/Index.php
View File

@ -106,7 +106,7 @@ public function deleteStudyGroupAction(): Action
#[Computed] #[Computed]
public function studyGroups(): Collection public function studyGroups(): Collection
{ {
$query = StudyGroup::with(['leader', 'students', 'courses']) $query = StudyGroup::with(['leader', 'students' => fn ($q) => $q->orderBy('full_name', 'asc'), 'courses'])
->whereHas('courses', fn ($q) => $q->where('courses.semester', app(GeneralSettings::class)->current_semester)); ->whereHas('courses', fn ($q) => $q->where('courses.semester', app(GeneralSettings::class)->current_semester));
if ($this->course_id) { if ($this->course_id) {
@ -115,7 +115,7 @@ public function studyGroups(): Collection
$studentId = auth()->user()?->student?->id; $studentId = auth()->user()?->student?->id;
return $query->latest()->get()->map(function ($record) use ($studentId) { return $query->orderBy('name', 'asc')->get()->map(function ($record) use ($studentId) {
$isMyGroup = ($studentId && ($record->leader_id === $studentId || $record->students->contains($studentId))); $isMyGroup = ($studentId && ($record->leader_id === $studentId || $record->students->contains($studentId)));
return (object) [ return (object) [
@ -197,7 +197,7 @@ public function studyGroupFormSchema(): array
$query->whereNotIn('id', array_unique(array_merge($allBusyIds, $selectedMembers))); $query->whereNotIn('id', array_unique(array_merge($allBusyIds, $selectedMembers)));
} }
return $query->get()->pluck('full_name', 'id')->toArray(); return $query->orderBy('full_name', 'asc')->get()->pluck('full_name', 'id')->toArray();
}) })
->searchable() ->searchable()
->required() ->required()
@ -227,7 +227,7 @@ public function studyGroupFormSchema(): array
); );
} }
return $query->orderBy('student_number', 'asc'); return $query->orderBy('full_name', 'asc');
} }
) )
->multiple() ->multiple()