feat: refactor attendance management; remove 'mine' method and related components, update permissions and types
This commit is contained in:
Yoga Pangestu
parent
d411085400
commit
7ea4fb067d
@ -34,17 +34,6 @@ public function index(Request $request): Response
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function mine(Request $request): Response
|
|
||||||
{
|
|
||||||
$student = $request->user()->student;
|
|
||||||
|
|
||||||
abort_if(! $student, 403);
|
|
||||||
|
|
||||||
return Inertia::render('admin/academic-classes/attendances/mine', [
|
|
||||||
'summaries' => $this->service->forStudent($student),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function show(CourseClass $courseClass): Response
|
public function show(CourseClass $courseClass): Response
|
||||||
{
|
{
|
||||||
$this->abortUnlessLecturerOwnsClass($courseClass);
|
$this->abortUnlessLecturerOwnsClass($courseClass);
|
||||||
|
|||||||
@ -5,10 +5,8 @@
|
|||||||
use App\Enums\AttendanceStatus;
|
use App\Enums\AttendanceStatus;
|
||||||
use App\Models\Attendance;
|
use App\Models\Attendance;
|
||||||
use App\Models\CourseClass;
|
use App\Models\CourseClass;
|
||||||
use App\Models\Student;
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
use Illuminate\Support\Collection as BaseCollection;
|
|
||||||
|
|
||||||
class AttendanceService
|
class AttendanceService
|
||||||
{
|
{
|
||||||
@ -113,35 +111,4 @@ public function deleteSession(int $courseClassId, int $meetingNumber): void
|
|||||||
->delete();
|
->delete();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Per-class attendance summary for a student's own classes: every class
|
|
||||||
* they're enrolled in, with their recorded meetings and a present/total
|
|
||||||
* tally, even for classes with no attendance taken yet.
|
|
||||||
*/
|
|
||||||
public function forStudent(Student $student): BaseCollection
|
|
||||||
{
|
|
||||||
$enrollments = $student->enrollments()
|
|
||||||
->with([
|
|
||||||
'courseClass.course:id,code,name',
|
|
||||||
'courseClass.academicTerm:id,academic_year,semester,start_date,end_date',
|
|
||||||
])
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$recordsByClass = Attendance::query()
|
|
||||||
->where('student_id', $student->id)
|
|
||||||
->orderBy('meeting_number')
|
|
||||||
->get(['course_class_id', 'meeting_number', 'date', 'status'])
|
|
||||||
->groupBy('course_class_id');
|
|
||||||
|
|
||||||
return $enrollments->map(function ($enrollment) use ($recordsByClass) {
|
|
||||||
$records = $recordsByClass->get($enrollment->course_class_id, new Collection);
|
|
||||||
|
|
||||||
return [
|
|
||||||
'course_class' => $enrollment->courseClass,
|
|
||||||
'records' => $records->values(),
|
|
||||||
'present_count' => $records->where('status', AttendanceStatus::Present)->count(),
|
|
||||||
'total_count' => $records->count(),
|
|
||||||
];
|
|
||||||
})->values();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,7 +18,7 @@ class PermissionCatalog
|
|||||||
'view-assignment-submissions', 'update-assignment-submissions',
|
'view-assignment-submissions', 'update-assignment-submissions',
|
||||||
'submit-assignments',
|
'submit-assignments',
|
||||||
'view-schedules', 'create-schedules', 'update-schedules', 'delete-schedules',
|
'view-schedules', 'create-schedules', 'update-schedules', 'delete-schedules',
|
||||||
'view-attendances', 'create-attendances', 'delete-attendances', 'view-own-attendances',
|
'view-attendances', 'create-attendances', 'delete-attendances',
|
||||||
];
|
];
|
||||||
|
|
||||||
public const MANAGE = [
|
public const MANAGE = [
|
||||||
|
|||||||
@ -51,7 +51,6 @@ public function run(): void
|
|||||||
'view-materials',
|
'view-materials',
|
||||||
'view-assignments',
|
'view-assignments',
|
||||||
'submit-assignments',
|
'submit-assignments',
|
||||||
'view-own-attendances',
|
|
||||||
'view-announcements',
|
'view-announcements',
|
||||||
...$feedbackSelfService,
|
...$feedbackSelfService,
|
||||||
],
|
],
|
||||||
|
|||||||
@ -36,10 +36,7 @@ import {
|
|||||||
SidebarMenuItem,
|
SidebarMenuItem,
|
||||||
} from '@/components/ui/sidebar';
|
} from '@/components/ui/sidebar';
|
||||||
import { index as assignmentsRoute } from '@/routes/admin/academic-classes/assignments';
|
import { index as assignmentsRoute } from '@/routes/admin/academic-classes/assignments';
|
||||||
import {
|
import { index as attendancesRoute } from '@/routes/admin/academic-classes/attendances';
|
||||||
index as attendancesRoute,
|
|
||||||
mine as myAttendancesRoute,
|
|
||||||
} from '@/routes/admin/academic-classes/attendances';
|
|
||||||
import { index as materialsRoute } from '@/routes/admin/academic-classes/materials';
|
import { index as materialsRoute } from '@/routes/admin/academic-classes/materials';
|
||||||
import { index as schedulesRoute } from '@/routes/admin/academic-classes/schedules';
|
import { index as schedulesRoute } from '@/routes/admin/academic-classes/schedules';
|
||||||
import { index as logsRoute } from '@/routes/admin/developer/logs';
|
import { index as logsRoute } from '@/routes/admin/developer/logs';
|
||||||
@ -175,15 +172,6 @@ function buildNavMain({
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
: []),
|
: []),
|
||||||
...(can('view-own-attendances')
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
name: 'Riwayat Kehadiran',
|
|
||||||
url: myAttendancesRoute.url(),
|
|
||||||
icon: ClipboardCheck,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: []),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const keuanganItems: NavItem[] = [
|
const keuanganItems: NavItem[] = [
|
||||||
|
|||||||
@ -1,150 +0,0 @@
|
|||||||
import { Head } from '@inertiajs/react';
|
|
||||||
import { format } from 'date-fns';
|
|
||||||
import { PageHeader } from '@/components/page-header';
|
|
||||||
import {
|
|
||||||
Accordion,
|
|
||||||
AccordionContent,
|
|
||||||
AccordionItem,
|
|
||||||
AccordionTrigger,
|
|
||||||
} from '@/components/ui/accordion';
|
|
||||||
import { Badge } from '@/components/ui/badge';
|
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
|
||||||
import { formatAcademicTermLabel } from '@/types/academic-term';
|
|
||||||
import type { AttendanceClassSummary } from '@/types/attendance';
|
|
||||||
import { AttendanceStatusLabels } from '@/types/attendance';
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
summaries: AttendanceClassSummary[];
|
|
||||||
};
|
|
||||||
|
|
||||||
function courseClassLabel(
|
|
||||||
courseClass: AttendanceClassSummary['course_class'],
|
|
||||||
): string {
|
|
||||||
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function percentageOf(part: number, total: number): number {
|
|
||||||
return total > 0 ? Math.round((part / total) * 100) : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function MyAttendance({ summaries }: Props) {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Head title="Riwayat Kehadiran" />
|
|
||||||
|
|
||||||
<div className="flex h-full flex-1 flex-col gap-6 p-4 md:p-6">
|
|
||||||
<PageHeader title="Riwayat Kehadiran" />
|
|
||||||
|
|
||||||
{summaries.length === 0 ? (
|
|
||||||
<p className="rounded-md border border-dashed p-6 text-center text-sm text-muted-foreground">
|
|
||||||
Belum ada kelas yang terdaftar.
|
|
||||||
</p>
|
|
||||||
) : (
|
|
||||||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
|
|
||||||
{summaries.map((summary) => (
|
|
||||||
<Card key={summary.course_class.id}>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle className="text-base leading-tight">
|
|
||||||
{courseClassLabel(summary.course_class)}
|
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent className="flex flex-col gap-2">
|
|
||||||
<div className="flex flex-wrap items-center gap-1.5">
|
|
||||||
<Badge
|
|
||||||
variant={
|
|
||||||
percentageOf(
|
|
||||||
summary.present_count,
|
|
||||||
summary.total_count,
|
|
||||||
) >= 75
|
|
||||||
? 'secondary'
|
|
||||||
: 'destructive'
|
|
||||||
}
|
|
||||||
className="w-fit text-[10px] font-normal"
|
|
||||||
>
|
|
||||||
Hadir {summary.present_count} /{' '}
|
|
||||||
{summary.total_count} (
|
|
||||||
{percentageOf(
|
|
||||||
summary.present_count,
|
|
||||||
summary.total_count,
|
|
||||||
)}
|
|
||||||
%)
|
|
||||||
</Badge>
|
|
||||||
{summary.course_class.academic_term && (
|
|
||||||
<Badge
|
|
||||||
variant="outline"
|
|
||||||
className="w-fit text-[10px] font-normal"
|
|
||||||
>
|
|
||||||
{formatAcademicTermLabel(
|
|
||||||
summary.course_class
|
|
||||||
.academic_term,
|
|
||||||
)}
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{summary.records.length > 0 && (
|
|
||||||
<Accordion
|
|
||||||
type="single"
|
|
||||||
collapsible
|
|
||||||
className="-mx-6 -mb-6 border-t"
|
|
||||||
>
|
|
||||||
<AccordionItem
|
|
||||||
value="records"
|
|
||||||
className="border-b-0"
|
|
||||||
>
|
|
||||||
<AccordionTrigger className="px-6 text-xs font-medium text-foreground hover:no-underline">
|
|
||||||
Detail Pertemuan
|
|
||||||
</AccordionTrigger>
|
|
||||||
<AccordionContent className="px-6">
|
|
||||||
<div className="flex flex-col divide-y">
|
|
||||||
{summary.records.map(
|
|
||||||
(record) => (
|
|
||||||
<div
|
|
||||||
key={`${record.course_class_id}-${record.meeting_number}`}
|
|
||||||
className="flex items-center justify-between gap-2 py-2 text-sm"
|
|
||||||
>
|
|
||||||
<span className="text-muted-foreground">
|
|
||||||
Pertemuan
|
|
||||||
ke-
|
|
||||||
{record.meeting_number ??
|
|
||||||
'-'}{' '}
|
|
||||||
·{' '}
|
|
||||||
{format(
|
|
||||||
new Date(
|
|
||||||
record.date,
|
|
||||||
),
|
|
||||||
'd MMM yyyy',
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
<Badge
|
|
||||||
variant={
|
|
||||||
record.status ===
|
|
||||||
'present'
|
|
||||||
? 'default'
|
|
||||||
: 'secondary'
|
|
||||||
}
|
|
||||||
>
|
|
||||||
{
|
|
||||||
AttendanceStatusLabels[
|
|
||||||
record
|
|
||||||
.status
|
|
||||||
]
|
|
||||||
}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</AccordionContent>
|
|
||||||
</AccordionItem>
|
|
||||||
</Accordion>
|
|
||||||
)}
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -41,16 +41,3 @@ export type AttendanceRosterEntry = {
|
|||||||
status: AttendanceStatus;
|
status: AttendanceStatus;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type AttendanceRecord = {
|
|
||||||
course_class_id: number;
|
|
||||||
meeting_number: number | null;
|
|
||||||
date: string;
|
|
||||||
status: AttendanceStatus;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type AttendanceClassSummary = {
|
|
||||||
course_class: AttendanceCourseClass;
|
|
||||||
records: AttendanceRecord[];
|
|
||||||
present_count: number;
|
|
||||||
total_count: number;
|
|
||||||
};
|
|
||||||
|
|||||||
@ -84,7 +84,6 @@
|
|||||||
|
|
||||||
Route::prefix('attendances')->name('attendances.')->group(function () {
|
Route::prefix('attendances')->name('attendances.')->group(function () {
|
||||||
Route::get('/', [AttendanceController::class, 'index'])->name('index')->middleware('permission:view-attendances');
|
Route::get('/', [AttendanceController::class, 'index'])->name('index')->middleware('permission:view-attendances');
|
||||||
Route::get('mine', [AttendanceController::class, 'mine'])->name('mine')->middleware('permission:view-own-attendances');
|
|
||||||
Route::get('{course_class}', [AttendanceController::class, 'show'])->name('show')->middleware('permission:view-attendances');
|
Route::get('{course_class}', [AttendanceController::class, 'show'])->name('show')->middleware('permission:view-attendances');
|
||||||
Route::get('{course_class}/{meeting_number}', [AttendanceController::class, 'session'])
|
Route::get('{course_class}/{meeting_number}', [AttendanceController::class, 'session'])
|
||||||
->whereNumber('meeting_number')
|
->whereNumber('meeting_number')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user