feat: enhance assignment management with user role-based filtering and attachment preview

This commit is contained in:
Yoga Pangestu 2026-09-02 23:04:55 +07:00
parent 2b7b4e2ab0
commit be0897ad6e
6 changed files with 165 additions and 64 deletions

View File

@ -23,10 +23,11 @@ public function index(PaginatedRequest $request): Response
{ {
return Inertia::render('admin/academic-classes/assignments/index', [ return Inertia::render('admin/academic-classes/assignments/index', [
'assignments' => $this->service->paginated( 'assignments' => $this->service->paginated(
$request->user(),
...$request->validatedWithDefaults(), ...$request->validatedWithDefaults(),
courseClassId: $request->validated('course_class_id'), courseClassId: $request->validated('course_class_id'),
), ),
'courseClasses' => $this->courseClassService->getAllForSelect(), 'courseClasses' => $this->courseClassService->getAllForSelect($request->user()),
'filters' => $request->only(['course_class_id']), 'filters' => $request->only(['course_class_id']),
]); ]);
} }

View File

@ -14,8 +14,16 @@ public function authorize(): bool
public function rules(): array public function rules(): array
{ {
$user = $this->user();
$courseClassRule = Rule::exists('course_classes', 'id');
if ($user->hasRole('dosen')) {
$courseClassRule->where('lecturer_id', $user->lecturer?->id);
}
return [ return [
'course_class_id' => ['required', 'integer', Rule::exists('course_classes', 'id')], 'course_class_id' => ['required', 'integer', $courseClassRule],
'title' => ['required', 'string', 'max:150'], 'title' => ['required', 'string', 'max:150'],
'description' => ['nullable', 'string'], 'description' => ['nullable', 'string'],
'deadline' => ['required', 'date'], 'deadline' => ['required', 'date'],

View File

@ -2,13 +2,15 @@
namespace App\Services\Admin\AcademicClasses; namespace App\Services\Admin\AcademicClasses;
use App\Enums\RegistrationStatus;
use App\Models\Assignment; use App\Models\Assignment;
use App\Models\User;
use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Http\UploadedFile; use Illuminate\Http\UploadedFile;
class AssignmentService class AssignmentService
{ {
public function paginated(int $perPage = 25, string $search = '', ?int $courseClassId = null): LengthAwarePaginator public function paginated(User $user, int $perPage = 25, string $search = '', ?int $courseClassId = null): LengthAwarePaginator
{ {
return Assignment::query() return Assignment::query()
->select(['id', 'course_class_id', 'title', 'description', 'deadline']) ->select(['id', 'course_class_id', 'title', 'description', 'deadline'])
@ -16,6 +18,13 @@ public function paginated(int $perPage = 25, string $search = '', ?int $courseCl
->with('courseClass.course:id,code,name') ->with('courseClass.course:id,code,name')
->when($search, fn ($q) => $q->where('title', 'like', "%{$search}%")) ->when($search, fn ($q) => $q->where('title', 'like', "%{$search}%"))
->when($courseClassId, fn ($q) => $q->where('course_class_id', $courseClassId)) ->when($courseClassId, fn ($q) => $q->where('course_class_id', $courseClassId))
->when($user->hasRole('dosen'), fn ($q) => $q->whereHas('courseClass', fn ($q) => $q->where('lecturer_id', $user->lecturer?->id)))
->when($user->hasRole('mahasiswa'), fn ($q) => $q->whereHas('courseClass', function ($q) use ($user) {
$q->whereHas('registrations', function ($q) use ($user) {
$q->where('student_id', $user->student?->id)
->whereHas('submission', fn ($q) => $q->where('status', RegistrationStatus::Approved));
});
}))
->latest() ->latest()
->paginate($perPage); ->paginate($perPage);
} }

View File

@ -48,6 +48,7 @@ public function run(): void
'delete-letter-requests', 'delete-letter-requests',
'view-schedules', 'view-schedules',
'view-materials', 'view-materials',
'view-assignments',
...$feedbackSelfService, ...$feedbackSelfService,
], ],
'dosen' => [ 'dosen' => [
@ -63,7 +64,10 @@ public function run(): void
'create-materials', 'create-materials',
'update-materials', 'update-materials',
'delete-materials', 'delete-materials',
...$feedbackSelfService, 'view-assignments',
'create-assignments',
'update-assignments',
'delete-assignments',
...$feedbackSelfService, ...$feedbackSelfService,
], ],
'staff-admin' => [ 'staff-admin' => [

View File

@ -1,6 +1,7 @@
import type { ColumnDef } from '@tanstack/react-table'; import type { ColumnDef } from '@tanstack/react-table';
import { format } from 'date-fns'; import { format } from 'date-fns';
import { ClipboardList, Paperclip, Pencil, Trash2 } from 'lucide-react'; import { ClipboardList, Pencil, Trash2 } from 'lucide-react';
import { AttachmentPreviewDialog } from '@/components/attachment-preview-dialog';
import { RowActions } from '@/components/row-actions'; import { RowActions } from '@/components/row-actions';
import { index as submissionsIndex } from '@/routes/admin/academic-classes/assignments/submissions'; import { index as submissionsIndex } from '@/routes/admin/academic-classes/assignments/submissions';
import type { Assignment } from '@/types/assignment'; import type { Assignment } from '@/types/assignment';
@ -64,20 +65,15 @@ export function createAssignmentColumns(
cell: ({ row }) => { cell: ({ row }) => {
const assignment = row.original; const assignment = row.original;
if (!assignment.attachment_url) { if (!assignment.attachment_url || !assignment.attachment_name) {
return <span className="text-muted-foreground">-</span>; return <span className="text-muted-foreground">-</span>;
} }
return ( return (
<a <AttachmentPreviewDialog
href={assignment.attachment_url} fileUrl={assignment.attachment_url}
target="_blank" fileName={assignment.attachment_name}
rel="noreferrer" />
className="inline-flex items-center gap-1 text-primary underline underline-offset-4 hover:text-primary/80"
>
<Paperclip className="h-3.5 w-3.5" />
{assignment.attachment_name}
</a>
); );
}, },
}, },

View File

@ -6,21 +6,25 @@ import { DataTable } from '@/components/data-table';
import { DateTimeField } from '@/components/datetime-field'; import { DateTimeField } from '@/components/datetime-field';
import { DeleteConfirmDialog } from '@/components/delete-confirm-dialog'; import { DeleteConfirmDialog } from '@/components/delete-confirm-dialog';
import { FileUploadField } from '@/components/file-upload-field'; import { FileUploadField } from '@/components/file-upload-field';
import type { FilterField } from '@/components/filter-dialog'; import type { FilterOptionGroup } from '@/components/filter-dialog';
import { FilterDialog } from '@/components/filter-dialog'; import { FilterDialog } from '@/components/filter-dialog';
import { FormDialog } from '@/components/form-dialog'; import { FormDialog } from '@/components/form-dialog';
import InputError from '@/components/input-error'; import InputError from '@/components/input-error';
import { PageHeader } from '@/components/page-header'; import { PageHeader } from '@/components/page-header';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import {
Combobox,
ComboboxCollection,
ComboboxContent,
ComboboxEmpty,
ComboboxGroup,
ComboboxInput,
ComboboxItem,
ComboboxLabel,
ComboboxList,
} from '@/components/ui/combobox';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { Textarea } from '@/components/ui/textarea'; import { Textarea } from '@/components/ui/textarea';
import { usePermissions } from '@/hooks/use-permissions'; import { usePermissions } from '@/hooks/use-permissions';
import { useServerTable } from '@/hooks/use-server-table'; import { useServerTable } from '@/hooks/use-server-table';
@ -35,9 +39,17 @@ import { createAssignmentColumns } from './columns';
type CourseClassOption = { type CourseClassOption = {
id: number; id: number;
course: { id: number; code: string; name: string } | null; course: {
id: number;
code: string;
name: string;
semester_number: number | null;
department: { id: number; name: string } | null;
} | null;
}; };
type CourseClassGroup = { value: string; items: CourseClassOption[] };
type Props = { type Props = {
assignments: { assignments: {
data: Assignment[]; data: Assignment[];
@ -54,7 +66,80 @@ type Props = {
}; };
function courseClassLabel(courseClass: CourseClassOption): string { function courseClassLabel(courseClass: CourseClassOption): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`; return `${courseClass.course?.code ?? ''} - ${courseClass.course?.name ?? ''}`;
}
function groupCourseClassesByDepartment(
options: CourseClassOption[],
): CourseClassGroup[] {
const groups: CourseClassGroup[] = [];
let currentKey: string | null = null;
for (const option of options) {
const key = `${option.course?.department?.name ?? 'Tanpa Jurusan'} — Semester ${option.course?.semester_number ?? 'Tidak ditentukan'}`;
if (key !== currentKey) {
currentKey = key;
groups.push({ value: key, items: [] });
}
groups[groups.length - 1].items.push(option);
}
return groups;
}
function courseClassFilterGroups(
courseClasses: CourseClassOption[],
): FilterOptionGroup[] {
return groupCourseClassesByDepartment(courseClasses).map((group) => ({
label: group.value,
options: group.items.map((option) => ({
value: String(option.id),
label: courseClassLabel(option),
})),
}));
}
function CourseClassField({
courseClasses,
value,
onChange,
}: {
courseClasses: CourseClassOption[];
value: CourseClassOption | null;
onChange: (value: CourseClassOption | null) => void;
}) {
const groups = groupCourseClassesByDepartment(courseClasses);
return (
<Combobox
items={groups}
value={value}
onValueChange={onChange}
itemToStringLabel={courseClassLabel}
isItemEqualToValue={(a, b) => a.id === b.id}
>
<ComboboxInput placeholder="Pilih kelas" className="w-full" />
<ComboboxContent>
<ComboboxEmpty>Kelas tidak ditemukan.</ComboboxEmpty>
<ComboboxList>
{(group: CourseClassGroup) => (
<ComboboxGroup key={group.value} items={group.items}>
<ComboboxLabel>{group.value}</ComboboxLabel>
<ComboboxCollection>
{(option: CourseClassOption) => (
<ComboboxItem key={option.id} value={option}>
{courseClassLabel(option)}
</ComboboxItem>
)}
</ComboboxCollection>
</ComboboxGroup>
)}
</ComboboxList>
</ComboboxContent>
</Combobox>
);
} }
export default function AssignmentIndex({ export default function AssignmentIndex({
@ -72,14 +157,12 @@ export default function AssignmentIndex({
const canDelete = hasPermission('delete-assignments'); const canDelete = hasPermission('delete-assignments');
const canViewSubmissions = hasPermission('view-assignment-submissions'); const canViewSubmissions = hasPermission('view-assignment-submissions');
const filterFields: FilterField[] = [ const filterFields = [
{ {
key: 'course_class_id', key: 'course_class_id',
label: 'Kelas', label: 'Kelas',
options: courseClasses.map((courseClass) => ({ type: 'combobox' as const,
value: String(courseClass.id), groups: courseClassFilterGroups(courseClasses),
label: courseClassLabel(courseClass),
})),
}, },
]; ];
@ -227,6 +310,10 @@ function CreateForm({
onOpenChange: (open: boolean) => void; onOpenChange: (open: boolean) => void;
courseClasses: CourseClassOption[]; courseClasses: CourseClassOption[];
}) { }) {
const [courseClass, setCourseClass] = useState<CourseClassOption | null>(
null,
);
return ( return (
<FormDialog <FormDialog
open={open} open={open}
@ -234,7 +321,10 @@ function CreateForm({
title="Tambah Tugas" title="Tambah Tugas"
action={store()} action={store()}
resetOnSuccess resetOnSuccess
onSuccess={() => onOpenChange(false)} onSuccess={() => {
onOpenChange(false);
setCourseClass(null);
}}
> >
{({ errors }) => ( {({ errors }) => (
<div className="grid gap-4"> <div className="grid gap-4">
@ -242,22 +332,16 @@ function CreateForm({
<Label> <Label>
Kelas <span className="text-destructive">*</span> Kelas <span className="text-destructive">*</span>
</Label> </Label>
<input type="hidden" name="course_class_id" /> <input
<Select name="course_class_id"> type="hidden"
<SelectTrigger className="w-full"> name="course_class_id"
<SelectValue placeholder="Pilih kelas" /> value={courseClass?.id ?? ''}
</SelectTrigger> />
<SelectContent> <CourseClassField
{courseClasses.map((courseClass) => ( courseClasses={courseClasses}
<SelectItem value={courseClass}
key={courseClass.id} onChange={setCourseClass}
value={String(courseClass.id)} />
>
{courseClassLabel(courseClass)}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.course_class_id} /> <InputError message={errors.course_class_id} />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
@ -310,6 +394,13 @@ function EditForm({
editing: Assignment | null; editing: Assignment | null;
courseClasses: CourseClassOption[]; courseClasses: CourseClassOption[];
}) { }) {
const [courseClass, setCourseClass] = useState<CourseClassOption | null>(
editing
? (courseClasses.find((c) => c.id === editing.course_class_id) ??
null)
: null,
);
return ( return (
<FormDialog <FormDialog
open={open} open={open}
@ -327,24 +418,16 @@ function EditForm({
Kelas{' '} Kelas{' '}
<span className="text-destructive">*</span> <span className="text-destructive">*</span>
</Label> </Label>
<Select <input
type="hidden"
name="course_class_id" name="course_class_id"
defaultValue={String(editing.course_class_id)} value={courseClass?.id ?? ''}
> />
<SelectTrigger className="w-full"> <CourseClassField
<SelectValue placeholder="Pilih kelas" /> courseClasses={courseClasses}
</SelectTrigger> value={courseClass}
<SelectContent> onChange={setCourseClass}
{courseClasses.map((courseClass) => ( />
<SelectItem
key={courseClass.id}
value={String(courseClass.id)}
>
{courseClassLabel(courseClass)}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.course_class_id} /> <InputError message={errors.course_class_id} />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">