itm/itmpwk.ac.id
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: itm:40c55e9bd21fbd0c46c6999f9d4dd331cf322050
Branches Tags
itm:dev
itm:master
..
compare: itm:6c287824846b7e9269e722da1bf3cbac63c9d712
Branches Tags
itm:dev
itm:master

No commits in common. "40c55e9bd21fbd0c46c6999f9d4dd331cf322050" and "6c287824846b7e9269e722da1bf3cbac63c9d712" have entirely different histories.
40c55e9bd2 ... 6c28782484

25 changed files with 192 additions and 158 deletions
Show Stats Expand all files Collapse all files

1
app/Http/Requests/Admin/Manage/CourseClassRequest.php
View File

@ -26,6 +26,7 @@ public function rules(): array
Rule::exists('lecturers', 'id')->where('department_id', $departmentId),
],
'academic_term_id' => ['required', 'integer', Rule::exists('academic_terms', 'id')],
'class_name' => ['nullable', 'string', 'max:50'],
'method' => ['nullable', 'string', Rule::in(ClassMethod::values())],
];
}

8
app/Services/Admin/Manage/CourseClassService.php
View File

@ -10,7 +10,7 @@ class CourseClassService
{
public function getAllForSelect(): Collection
{
return CourseClass::select(['id', 'course_id'])
return CourseClass::select(['id', 'course_id', 'class_name'])
->with('course:id,code,name')
->get();
}
@ -18,10 +18,11 @@ public function getAllForSelect(): Collection
public function paginated(int $perPage = 25, string $search = '', ?int $academicTermId = null, ?string $method = null): LengthAwarePaginator
{
return CourseClass::query()
->select(['id', 'course_id', 'lecturer_id', 'academic_term_id', 'method'])
->select(['id', 'course_id', 'lecturer_id', 'academic_term_id', 'class_name', 'method'])
->withCount('enrollments')
->with(['course:id,code,name,department_id', 'lecturer.user.profile', 'academicTerm:id,name,semester,start_date,end_date'])
->when($search, fn ($q) => $q->whereHas('course', fn ($q) => $q->where('name', 'like', "%{$search}%")->orWhere('code', 'like', "%{$search}%")))
->when($search, fn ($q) => $q->where('class_name', 'like', "%{$search}%")
->orWhereHas('course', fn ($q) => $q->where('name', 'like', "%{$search}%")->orWhere('code', 'like', "%{$search}%")))
->when($academicTermId, fn ($q) => $q->where('academic_term_id', $academicTermId))
->when($method, fn ($q) => $q->where('method', $method))
->latest()
@ -38,6 +39,7 @@ public function update(CourseClass $courseClass, array $data): CourseClass
$courseClass->course_id = $data['course_id'];
$courseClass->lecturer_id = $data['lecturer_id'];
$courseClass->academic_term_id = $data['academic_term_id'];
$courseClass->class_name = $data['class_name'] ?? null;
$courseClass->method = $data['method'] ?? null;
$courseClass->update();

1
app/Services/Admin/Users/LecturerService.php
View File

@ -18,7 +18,6 @@ public function getAllForSelect(): Collection
->with([
'user:id,username',
'user.profile:id,user_id,full_name',
'departments:id,name',
])
->get();
}

1
database/migrations/2026_08_21_000002_create_course_classes_table.php
View File

@ -14,6 +14,7 @@ public function up(): void
$table->foreignId('course_id')->constrained()->cascadeOnDelete();
$table->foreignId('lecturer_id')->constrained()->cascadeOnDelete();
$table->foreignId('academic_term_id')->constrained()->cascadeOnDelete();
$table->string('class_name', 50)->nullable();
$table->enum('method', ClassMethod::values())->nullable()->default(ClassMethod::Hybrid->value);
$table->timestamps();
$table->softDeletes();

2
database/seeders/CourseClassSeeder.php
View File

@ -14,6 +14,7 @@ public function run(): void
'course_id' => 1,
'lecturer_id' => 1,
'academic_term_id' => 2,
'class_name' => 'SI-5A',
'method' => 'hybrid',
'created_at' => '2026-01-10 08:00:00',
'updated_at' => '2026-01-10 08:00:00',
@ -22,6 +23,7 @@ public function run(): void
'course_id' => 2,
'lecturer_id' => 2,
'academic_term_id' => 2,
'class_name' => 'TI-3A',
'method' => 'offline',
'created_at' => '2026-01-10 08:00:00',
'updated_at' => '2026-01-10 08:00:00',

20
resources/js/components/app-sidebar.tsx
View File

@ -107,16 +107,6 @@ const data: {
},
],
},
{
label: 'Kelola',
items: [
{
name: 'Kelas Mata Kuliah',
url: courseClassesRoute.url(),
icon: School,
},
],
},
{
label: 'Kelas',
items: [
@ -147,6 +137,16 @@ const data: {
},
],
},
{
label: 'Kelola',
items: [
{
name: 'Kelas Mata Kuliah',
url: courseClassesRoute.url(),
icon: School,
},
],
},
{
label: 'Pengumuman',
items: [

8
resources/js/pages/admin/academic-classes/assignments/columns.tsx
View File

@ -28,7 +28,7 @@ export function createAssignmentColumns(
),
},
{
accessorKey: 'course_class.course.name',
accessorKey: 'course_class.class_name',
header: () => <span>Kelas</span>,
cell: ({ row }) => {
const courseClass = row.original.course_class;
@ -37,7 +37,11 @@ export function createAssignmentColumns(
return '-';
}
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const label = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${label}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
},
},
{

7
resources/js/pages/admin/academic-classes/assignments/index.tsx
View File

@ -34,6 +34,7 @@ import { createAssignmentColumns } from './columns';
type CourseClassOption = {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
};
@ -53,7 +54,11 @@ type Props = {
};
function courseClassLabel(courseClass: CourseClassOption): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const namePart = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${namePart}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
}
export default function AssignmentIndex({

6
resources/js/pages/admin/academic-classes/assignments/submissions.tsx
View File

@ -175,7 +175,11 @@ export default function SubmissionIndex({
</CardHeader>
<CardContent className="grid gap-1 text-sm text-muted-foreground">
<p>
Kelas: {assignment.course_class?.course?.code}{' '}
Kelas:{' '}
{assignment.course_class?.class_name
? `${assignment.course_class.class_name} - `
: ''}
{assignment.course_class?.course?.code}{' '}
{assignment.course_class?.course?.name}
</p>
<p>

6
resources/js/pages/admin/academic-classes/attendances/index.tsx
View File

@ -35,7 +35,11 @@ type Props = {
};
function courseClassLabel(courseClass: AttendanceCourseClass): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const namePart = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${namePart}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
}
export default function AttendanceIndex({ sessions, courseClasses }: Props) {

6
resources/js/pages/admin/academic-classes/attendances/session.tsx
View File

@ -26,7 +26,11 @@ type Props = {
};
function courseClassLabel(courseClass: AttendanceCourseClass): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const namePart = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${namePart}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
}
export default function AttendanceSession({

3
resources/js/pages/admin/academic-classes/course-registrations/columns.tsx
View File

@ -54,6 +54,9 @@ export function createCourseRegistrationColumns(
</p>
<p className="text-xs text-muted-foreground">
{courseClass?.course?.code}
{courseClass?.class_name
? ` · ${courseClass.class_name}`
: ''}
</p>
</div>
);

3
resources/js/pages/admin/academic-classes/course-registrations/index.tsx
View File

@ -68,8 +68,9 @@ function studentLabel(student: CourseRegistrationStudent): string {
function courseClassLabel(courseClass: CourseRegistrationCourseClass): string {
const course = courseClass.course;
const suffix = courseClass.class_name ? ` (${courseClass.class_name})` : '';
return `${course?.code ?? '-'} - ${course?.name ?? 'N/A'}`;
return `${course?.code ?? '-'} - ${course?.name ?? 'N/A'}${suffix}`;
}
function lecturerLabel(lecturer: LecturerOption): string {

8
resources/js/pages/admin/academic-classes/materials/columns.tsx
View File

@ -49,7 +49,7 @@ export function createMaterialColumns(
),
},
{
accessorKey: 'course_class.course.name',
accessorKey: 'course_class.class_name',
header: () => <span>Kelas</span>,
cell: ({ row }) => {
const courseClass = row.original.course_class;
@ -58,7 +58,11 @@ export function createMaterialColumns(
return '-';
}
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const label = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${label}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
},
},
{

7
resources/js/pages/admin/academic-classes/materials/index.tsx
View File

@ -33,6 +33,7 @@ import { createMaterialColumns } from './columns';
type CourseClassOption = {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
};
@ -52,7 +53,11 @@ type Props = {
};
function courseClassLabel(courseClass: CourseClassOption): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const namePart = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${namePart}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
}
export default function MaterialIndex({

17
resources/js/pages/admin/academic-classes/schedules/index.tsx
View File

@ -19,16 +19,13 @@ import {
SelectValue,
} from '@/components/ui/select';
import { cn } from '@/lib/utils';
import {
destroy,
store,
update,
} from '@/routes/admin/academic-classes/schedules';
import { destroy, store, update } from '@/routes/admin/academic-classes/schedules';
import type { Schedule } from '@/types/schedule';
import { DayOfWeekLabels, DaysOfWeek } from '@/types/schedule';
type CourseClassOption = {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
};
@ -43,7 +40,11 @@ const UNSCHEDULED = '__unscheduled__';
const BOARD_COLUMNS = [...DaysOfWeek, UNSCHEDULED] as const;
function courseClassLabel(courseClass: CourseClassOption): string {
return `${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
const namePart = courseClass.class_name
? `${courseClass.class_name} - `
: '';
return `${namePart}${courseClass.course?.code ?? ''} ${courseClass.course?.name ?? ''}`;
}
function toTimeInput(value: string | null): string {
@ -165,6 +166,8 @@ export default function ScheduleIndex({
{courseClassLabel(
schedule.course_class ?? {
id: 0,
class_name:
null,
course: null,
},
)}
@ -250,7 +253,7 @@ export default function ScheduleIndex({
}}
title="Hapus Jadwal"
description={(schedule) =>
`Apakah Anda yakin ingin menghapus jadwal "${schedule.course_class?.course?.name ?? 'ini'}"? Tindakan ini tidak dapat dibatalkan.`
`Apakah Anda yakin ingin menghapus jadwal "${schedule.course_class?.class_name ?? schedule.course_class?.course?.name ?? 'ini'}"? Tindakan ini tidak dapat dibatalkan.`
}
onConfirm={handleDelete}
/>

9
resources/js/pages/admin/manage/course-classes/columns.tsx
View File

@ -19,6 +19,15 @@ export function createCourseClassColumns(
const { handleEdit, handleDeleteClick } = params;
return [
{
accessorKey: 'class_name',
header: () => <span>Kelas</span>,
cell: ({ row }) => (
<span className="font-medium">
{(row.getValue('class_name') as string | null) ?? '-'}
</span>
),
},
{
accessorKey: 'course.name',
header: () => <span>Mata Kuliah</span>,

4
resources/js/pages/admin/manage/course-classes/enrollments.tsx
View File

@ -119,7 +119,9 @@ export default function ClassEnrollmentIndex({
<Card>
<CardHeader>
<CardTitle>Detail Kelas Mata Kuliah</CardTitle>
<CardTitle>
{courseClass.class_name ?? courseClass.course?.name}
</CardTitle>
</CardHeader>
<CardContent className="grid gap-1 text-sm text-muted-foreground">
<p>

227
resources/js/pages/admin/manage/course-classes/index.tsx
View File

@ -10,14 +10,7 @@ import { FormDialog } from '@/components/form-dialog';
import InputError from '@/components/input-error';
import { PageHeader } from '@/components/page-header';
import { Button } from '@/components/ui/button';
import {
Combobox,
ComboboxContent,
ComboboxEmpty,
ComboboxInput,
ComboboxItem,
ComboboxList,
} from '@/components/ui/combobox';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import {
Select,
@ -41,7 +34,7 @@ type Course = { id: number; code: string; name: string; department_id: number };
type Lecturer = {
id: number;
lecturer_number: string;
departments: { id: number; name: string }[];
department_id: number;
user: { profile: { full_name: string } | null } | null;
};
type AcademicTerm = { id: number; name: string; semester: string };
@ -196,7 +189,7 @@ export default function CourseClassIndex({
<DataTable
columns={columns}
data={courseClasses.data}
searchKey="course"
searchKey="class_name"
searchPlaceholder="Cari kelas mata kuliah..."
emptyText="Belum ada data kelas mata kuliah."
pagination={pagination}
@ -222,7 +215,7 @@ export default function CourseClassIndex({
}}
title="Hapus Kelas Mata Kuliah"
description={(courseClass) =>
`Apakah Anda yakin ingin menghapus kelas "${courseClass.course?.name}"? Tindakan ini tidak dapat dibatalkan.`
`Apakah Anda yakin ingin menghapus kelas "${courseClass.class_name ?? courseClass.course?.name}"? Tindakan ini tidak dapat dibatalkan.`
}
onConfirm={handleDelete}
/>
@ -245,21 +238,18 @@ function CreateForm({
academicTerms: AcademicTerm[];
}) {
const [courseId, setCourseId] = useState('');
const [lecturer, setLecturer] = useState<Lecturer | null>(null);
const [lecturerId, setLecturerId] = useState('');
const selectedCourse = courses.find((c) => String(c.id) === courseId);
const availableLecturers = selectedCourse
? lecturers.filter((l) =>
l.departments.some(
(department) =>
department.id === selectedCourse.department_id,
),
? lecturers.filter(
(l) => l.department_id === selectedCourse.department_id,
)
: lecturers;
function reset() {
setCourseId('');
setLecturer(null);
setLecturerId('');
}
return (
@ -276,29 +266,6 @@ function CreateForm({
>
{({ errors }) => (
<div className="grid gap-4">
<div className="grid gap-2">
<Label>
Periode Akademik{' '}
<span className="text-destructive">*</span>
</Label>
<input type="hidden" name="academic_term_id" />
<Select name="academic_term_id">
<SelectTrigger className="w-full">
<SelectValue placeholder="Pilih periode akademik" />
</SelectTrigger>
<SelectContent>
{academicTerms.map((term) => (
<SelectItem
key={term.id}
value={String(term.id)}
>
{term.name}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.academic_term_id} />
</div>
<div className="grid gap-2">
<Label>
Mata Kuliah{' '}
@ -313,7 +280,7 @@ function CreateForm({
value={courseId}
onValueChange={(value) => {
setCourseId(value);
setLecturer(null);
setLecturerId('');
}}
>
<SelectTrigger className="w-full">
@ -340,47 +307,67 @@ function CreateForm({
<input
type="hidden"
name="lecturer_id"
value={lecturer?.id ?? ''}
value={lecturerId}
/>
<Combobox
items={availableLecturers}
value={lecturer}
onValueChange={setLecturer}
itemToStringLabel={(lect) =>
`${lect.user?.profile?.full_name ?? 'N/A'} - ${lect.lecturer_number}`
}
isItemEqualToValue={(a, b) => a.id === b.id}
disabled={!selectedCourse}
<Select
value={lecturerId}
onValueChange={setLecturerId}
>
<ComboboxInput
disabled={!selectedCourse}
placeholder={
selectedCourse
? 'Pilih dosen pengampu'
: 'Pilih mata kuliah terlebih dahulu'
}
className="w-full"
/>
<ComboboxContent>
<ComboboxEmpty>
Dosen tidak ditemukan.
</ComboboxEmpty>
<ComboboxList>
{availableLecturers.map((lect) => (
<ComboboxItem
key={lect.id}
value={lect}
>
{lect.user?.profile?.full_name ??
'N/A'}{' '}
- {lect.lecturer_number}
</ComboboxItem>
))}
</ComboboxList>
</ComboboxContent>
</Combobox>
<SelectTrigger className="w-full">
<SelectValue
placeholder={
selectedCourse
? 'Pilih dosen pengampu'
: 'Pilih mata kuliah terlebih dahulu'
}
/>
</SelectTrigger>
<SelectContent>
{availableLecturers.map((lect) => (
<SelectItem
key={lect.id}
value={String(lect.id)}
>
{lect.user?.profile?.full_name ?? 'N/A'}{' '}
- {lect.lecturer_number}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.lecturer_id} />
</div>
<div className="grid gap-2">
<Label>
Periode Akademik{' '}
<span className="text-destructive">*</span>
</Label>
<input type="hidden" name="academic_term_id" />
<Select name="academic_term_id">
<SelectTrigger className="w-full">
<SelectValue placeholder="Pilih periode akademik" />
</SelectTrigger>
<SelectContent>
{academicTerms.map((term) => (
<SelectItem
key={term.id}
value={String(term.id)}
>
{term.name}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.academic_term_id} />
</div>
<div className="grid gap-2">
<Label htmlFor="class_name">Nama Kelas</Label>
<Input
id="class_name"
name="class_name"
placeholder="Contoh: SI-5A"
/>
<InputError message={errors.class_name} />
</div>
<div className="grid gap-2">
<Label>Metode</Label>
<input type="hidden" name="method" />
@ -422,19 +409,14 @@ function EditForm({
const [courseId, setCourseId] = useState(
editing ? String(editing.course_id) : '',
);
const [lecturer, setLecturer] = useState<Lecturer | null>(
editing
? (lecturers.find((l) => l.id === editing.lecturer_id) ?? null)
: null,
const [lecturerId, setLecturerId] = useState(
editing ? String(editing.lecturer_id) : '',
);
const selectedCourse = courses.find((c) => String(c.id) === courseId);
const availableLecturers = selectedCourse
? lecturers.filter((l) =>
l.departments.some(
(department) =>
department.id === selectedCourse.department_id,
),
? lecturers.filter(
(l) => l.department_id === selectedCourse.department_id,
)
: lecturers;
@ -464,7 +446,7 @@ function EditForm({
value={courseId}
onValueChange={(value) => {
setCourseId(value);
setLecturer(null);
setLecturerId('');
}}
>
<SelectTrigger className="w-full">
@ -491,45 +473,28 @@ function EditForm({
<input
type="hidden"
name="lecturer_id"
value={lecturer?.id ?? ''}
value={lecturerId}
/>
<Combobox
items={availableLecturers}
value={lecturer}
onValueChange={setLecturer}
itemToStringLabel={(lect) =>
`${lect.user?.profile?.full_name ?? 'N/A'} - ${lect.lecturer_number}`
}
isItemEqualToValue={(a, b) => a.id === b.id}
disabled={!selectedCourse}
<Select
value={lecturerId}
onValueChange={setLecturerId}
>
<ComboboxInput
disabled={!selectedCourse}
placeholder={
selectedCourse
? 'Pilih dosen pengampu'
: 'Pilih mata kuliah terlebih dahulu'
}
className="w-full"
/>
<ComboboxContent>
<ComboboxEmpty>
Dosen tidak ditemukan.
</ComboboxEmpty>
<ComboboxList>
{availableLecturers.map((lect) => (
<ComboboxItem
key={lect.id}
value={lect}
>
{lect.user?.profile
?.full_name ?? 'N/A'}{' '}
- {lect.lecturer_number}
</ComboboxItem>
))}
</ComboboxList>
</ComboboxContent>
</Combobox>
<SelectTrigger className="w-full">
<SelectValue placeholder="Pilih dosen pengampu" />
</SelectTrigger>
<SelectContent>
{availableLecturers.map((lect) => (
<SelectItem
key={lect.id}
value={String(lect.id)}
>
{lect.user?.profile?.full_name ??
'N/A'}{' '}
- {lect.lecturer_number}
</SelectItem>
))}
</SelectContent>
</Select>
<InputError message={errors.lecturer_id} />
</div>
<div className="grid gap-2">
@ -557,6 +522,16 @@ function EditForm({
</Select>
<InputError message={errors.academic_term_id} />
</div>
<div className="grid gap-2">
<Label htmlFor="edit-class_name">Nama Kelas</Label>
<Input
id="edit-class_name"
name="class_name"
placeholder="Contoh: SI-5A"
defaultValue={editing.class_name ?? ''}
/>
<InputError message={errors.class_name} />
</div>
<div className="grid gap-2">
<Label>Metode</Label>
<Select

1
resources/js/types/assignment.ts
View File

@ -3,6 +3,7 @@ export type Assignment = {
course_class_id: number;
course_class: {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
} | null;
title: string;

1
resources/js/types/attendance.ts
View File

@ -9,6 +9,7 @@ export const AttendanceStatusLabels: Record<AttendanceStatus, string> = {
export type AttendanceCourseClass = {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
};

1
resources/js/types/course-class.ts
View File

@ -26,6 +26,7 @@ export type CourseClass = {
} | null;
academic_term_id: number;
academic_term: { id: number; name: string; semester: string } | null;
class_name: string | null;
method: ClassMethod | null;
enrollments_count: number;
created_at: string;

1
resources/js/types/course-registration.ts
View File

@ -21,6 +21,7 @@ export type CourseRegistrationStudent = {
export type CourseRegistrationCourseClass = {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
};

1
resources/js/types/material.ts
View File

@ -3,6 +3,7 @@ export type Material = {
course_class_id: number;
course_class: {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
} | null;
title: string;

1
resources/js/types/schedule.ts
View File

@ -25,6 +25,7 @@ export type Schedule = {
course_class_id: number;
course_class: {
id: number;
class_name: string | null;
course: { id: number; code: string; name: string } | null;
} | null;
day_of_week: string | null;