Compare commits
2 Commits
1e30a74072
...
62da33936b
| Author | SHA1 | Date | |
|---|---|---|---|
| 62da33936b | |||
|
0fbd3cc247 |
@ -64,6 +64,12 @@ public function rules(): array
|
||||
'integer',
|
||||
'digits:4',
|
||||
],
|
||||
'current_semester' => [
|
||||
'required',
|
||||
'integer',
|
||||
'min:1',
|
||||
'max:14',
|
||||
],
|
||||
'academic_advisor_id' => [
|
||||
'required',
|
||||
'integer',
|
||||
|
||||
@ -14,7 +14,7 @@ class StudentService
|
||||
{
|
||||
public function getAllForSelect(?string $status = null): Collection
|
||||
{
|
||||
return Student::select(['id', 'user_id', 'student_number', 'department_id'])
|
||||
return Student::select(['id', 'user_id', 'student_number', 'department_id', 'current_semester'])
|
||||
->with([
|
||||
'user:id,username',
|
||||
'user.profile:id,user_id,full_name',
|
||||
@ -53,7 +53,7 @@ private function filteredQuery(string $search, ?string $gender, ?int $department
|
||||
return User::select(['id', 'username', 'email', 'is_active'])
|
||||
->with([
|
||||
'profile:id,user_id,full_name,phone_number,gender,birth_place,birth_date,address',
|
||||
'student:id,user_id,student_number,department_id,enrollment_year,status',
|
||||
'student:id,user_id,student_number,department_id,enrollment_year,current_semester,status',
|
||||
'student.department:id,name',
|
||||
])
|
||||
->whereHas('roles', fn ($q) => $q->where('name', 'mahasiswa'))
|
||||
@ -93,6 +93,7 @@ public function create(array $data): User
|
||||
'student_number' => $data['student_number'],
|
||||
'department_id' => $data['department_id'],
|
||||
'enrollment_year' => $data['enrollment_year'],
|
||||
'current_semester' => $data['current_semester'],
|
||||
'academic_advisor_id' => $data['academic_advisor_id'],
|
||||
'status' => 'active',
|
||||
]);
|
||||
@ -122,6 +123,7 @@ public function update(User $user, array $data): User
|
||||
'student_number' => $data['student_number'],
|
||||
'department_id' => $data['department_id'],
|
||||
'enrollment_year' => $data['enrollment_year'],
|
||||
'current_semester' => $data['current_semester'],
|
||||
'academic_advisor_id' => $data['academic_advisor_id'],
|
||||
]);
|
||||
});
|
||||
|
||||
@ -15,6 +15,7 @@ public function up(): void
|
||||
$table->string('student_number', 10)->unique();
|
||||
$table->foreignId('department_id')->constrained()->cascadeOnDelete();
|
||||
$table->integer('enrollment_year');
|
||||
$table->unsignedTinyInteger('current_semester')->default(1);
|
||||
$table->foreignId('academic_advisor_id')->nullable()->constrained('lecturers')->nullOnDelete();
|
||||
$table->enum('status', StudentStatus::values())->nullable()->default(StudentStatus::Active->value);
|
||||
$table->timestamps();
|
||||
|
||||
@ -34,6 +34,7 @@ public function run(): void
|
||||
'student_number' => '23010001',
|
||||
'department_id' => 1,
|
||||
'enrollment_year' => 2023,
|
||||
'current_semester' => 5,
|
||||
'academic_advisor_id' => null,
|
||||
'status' => StudentStatus::Active,
|
||||
],
|
||||
@ -54,6 +55,7 @@ public function run(): void
|
||||
'student_number' => '23020002',
|
||||
'department_id' => 1,
|
||||
'enrollment_year' => 2023,
|
||||
'current_semester' => 5,
|
||||
'academic_advisor_id' => null,
|
||||
'status' => StudentStatus::Active,
|
||||
],
|
||||
@ -74,6 +76,7 @@ public function run(): void
|
||||
'student_number' => '24010003',
|
||||
'department_id' => 1,
|
||||
'enrollment_year' => 2024,
|
||||
'current_semester' => 3,
|
||||
'academic_advisor_id' => null,
|
||||
'status' => StudentStatus::Active,
|
||||
],
|
||||
@ -94,6 +97,7 @@ public function run(): void
|
||||
'student_number' => '24020004',
|
||||
'department_id' => 1,
|
||||
'enrollment_year' => 2024,
|
||||
'current_semester' => 3,
|
||||
'academic_advisor_id' => null,
|
||||
'status' => StudentStatus::Active,
|
||||
],
|
||||
|
||||
@ -15,6 +15,7 @@ export type Student = {
|
||||
student_number: string;
|
||||
department: { name: string } | null;
|
||||
enrollment_year: number;
|
||||
current_semester: number;
|
||||
status: string | null;
|
||||
} | null;
|
||||
};
|
||||
@ -77,6 +78,11 @@ export function createStudentColumns(
|
||||
header: () => <span>Angkatan</span>,
|
||||
cell: ({ row }) => row.original.student?.enrollment_year ?? '-',
|
||||
},
|
||||
{
|
||||
accessorKey: 'student.current_semester',
|
||||
header: () => <span>Semester</span>,
|
||||
cell: ({ row }) => row.original.student?.current_semester ?? '-',
|
||||
},
|
||||
{
|
||||
accessorKey: 'student.status',
|
||||
header: () => <span>Status</span>,
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
import { Form, Head, Link } from '@inertiajs/react';
|
||||
import { format } from 'date-fns';
|
||||
import { ArrowLeft, Save } from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
import { DatePicker } from '@/components/date-picker';
|
||||
import InputError from '@/components/input-error';
|
||||
import { PageHeader } from '@/components/page-header';
|
||||
@ -29,6 +25,10 @@ import {
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { index, store } from '@/routes/admin/users/students';
|
||||
import { formatDepartmentLabel } from '@/types/department';
|
||||
import { Form, Head, Link } from '@inertiajs/react';
|
||||
import { format } from 'date-fns';
|
||||
import { ArrowLeft, Save } from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
|
||||
type Department = { id: number; name: string; degree_level: string | null };
|
||||
type Lecturer = {
|
||||
@ -216,9 +216,9 @@ export default function StudentCreate({ departments, lecturers }: Props) {
|
||||
value={
|
||||
birthDate
|
||||
? format(
|
||||
birthDate,
|
||||
'yyyy-MM-dd',
|
||||
)
|
||||
birthDate,
|
||||
'yyyy-MM-dd',
|
||||
)
|
||||
: ''
|
||||
}
|
||||
/>
|
||||
@ -301,75 +301,97 @@ export default function StudentCreate({ departments, lecturers }: Props) {
|
||||
message={errors.department_id}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="enrollment_year">
|
||||
Tahun Masuk{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<Input
|
||||
id="enrollment_year"
|
||||
name="enrollment_year"
|
||||
type="number"
|
||||
placeholder="Contoh: 2024"
|
||||
/>
|
||||
<InputError
|
||||
message={errors.enrollment_year}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label>
|
||||
Dosen Wali{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<input
|
||||
type="hidden"
|
||||
name="academic_advisor_id"
|
||||
value={advisor?.id ?? ''}
|
||||
/>
|
||||
<Combobox
|
||||
items={lecturers}
|
||||
value={advisor}
|
||||
onValueChange={setAdvisor}
|
||||
itemToStringLabel={(lect) =>
|
||||
`${lect.user?.profile?.full_name ?? 'N/A'} - ${lect.lecturer_number}`
|
||||
}
|
||||
isItemEqualToValue={(a, b) =>
|
||||
a.id === b.id
|
||||
}
|
||||
>
|
||||
<ComboboxInput
|
||||
placeholder="Pilih dosen wali"
|
||||
className="w-full"
|
||||
<div className="grid gap-4 md:col-span-2 md:grid-cols-3">
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="enrollment_year">
|
||||
Tahun Masuk{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<Input
|
||||
id="enrollment_year"
|
||||
name="enrollment_year"
|
||||
type="number"
|
||||
placeholder="Contoh: 2024"
|
||||
/>
|
||||
<ComboboxContent>
|
||||
<ComboboxEmpty>
|
||||
Dosen tidak ditemukan.
|
||||
</ComboboxEmpty>
|
||||
<ComboboxList>
|
||||
{(lect: Lecturer) => (
|
||||
<ComboboxItem
|
||||
key={lect.id}
|
||||
value={lect}
|
||||
>
|
||||
{lect.user?.profile
|
||||
?.full_name ??
|
||||
'N/A'}{' '}
|
||||
-{' '}
|
||||
{
|
||||
lect.lecturer_number
|
||||
}
|
||||
</ComboboxItem>
|
||||
)}
|
||||
</ComboboxList>
|
||||
</ComboboxContent>
|
||||
</Combobox>
|
||||
<InputError
|
||||
message={errors.academic_advisor_id}
|
||||
/>
|
||||
<InputError
|
||||
message={errors.enrollment_year}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="current_semester">
|
||||
Semester Berjalan{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<Input
|
||||
id="current_semester"
|
||||
name="current_semester"
|
||||
type="number"
|
||||
min={1}
|
||||
max={14}
|
||||
defaultValue={1}
|
||||
placeholder="Contoh: 1"
|
||||
/>
|
||||
<InputError
|
||||
message={errors.current_semester}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label>
|
||||
Dosen Wali{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<input
|
||||
type="hidden"
|
||||
name="academic_advisor_id"
|
||||
value={advisor?.id ?? ''}
|
||||
/>
|
||||
<Combobox
|
||||
items={lecturers}
|
||||
value={advisor}
|
||||
onValueChange={setAdvisor}
|
||||
itemToStringLabel={(lect) =>
|
||||
`${lect.user?.profile?.full_name ?? 'N/A'} - ${lect.lecturer_number}`
|
||||
}
|
||||
isItemEqualToValue={(a, b) =>
|
||||
a.id === b.id
|
||||
}
|
||||
>
|
||||
<ComboboxInput
|
||||
placeholder="Pilih dosen wali"
|
||||
className="w-full"
|
||||
/>
|
||||
<ComboboxContent>
|
||||
<ComboboxEmpty>
|
||||
Dosen tidak ditemukan.
|
||||
</ComboboxEmpty>
|
||||
<ComboboxList>
|
||||
{(lect: Lecturer) => (
|
||||
<ComboboxItem
|
||||
key={lect.id}
|
||||
value={lect}
|
||||
>
|
||||
{lect.user?.profile
|
||||
?.full_name ??
|
||||
'N/A'}{' '}
|
||||
-{' '}
|
||||
{
|
||||
lect.lecturer_number
|
||||
}
|
||||
</ComboboxItem>
|
||||
)}
|
||||
</ComboboxList>
|
||||
</ComboboxContent>
|
||||
</Combobox>
|
||||
<InputError
|
||||
message={errors.academic_advisor_id}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
import { Form, Head, Link } from '@inertiajs/react';
|
||||
import { format } from 'date-fns';
|
||||
import { ArrowLeft, Save } from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
import { DatePicker } from '@/components/date-picker';
|
||||
import InputError from '@/components/input-error';
|
||||
import { PageHeader } from '@/components/page-header';
|
||||
@ -29,6 +25,10 @@ import {
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { index, update } from '@/routes/admin/users/students';
|
||||
import { formatDepartmentLabel } from '@/types/department';
|
||||
import { Form, Head, Link } from '@inertiajs/react';
|
||||
import { format } from 'date-fns';
|
||||
import { ArrowLeft, Save } from 'lucide-react';
|
||||
import { useState } from 'react';
|
||||
|
||||
type Department = { id: number; name: string; degree_level: string | null };
|
||||
type Lecturer = {
|
||||
@ -53,6 +53,7 @@ type User = {
|
||||
student_number: string;
|
||||
department_id: number;
|
||||
enrollment_year: number;
|
||||
current_semester: number;
|
||||
academic_advisor_id: number;
|
||||
} | null;
|
||||
};
|
||||
@ -348,6 +349,7 @@ export default function StudentEdit({ user, departments, lecturers }: Props) {
|
||||
message={errors.department_id}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-4 md:col-span-2 md:grid-cols-3">
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="enrollment_year">
|
||||
Tahun Masuk{' '}
|
||||
@ -368,6 +370,28 @@ export default function StudentEdit({ user, departments, lecturers }: Props) {
|
||||
message={errors.enrollment_year}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="current_semester">
|
||||
Semester Berjalan{' '}
|
||||
<span className="text-red-500">
|
||||
*
|
||||
</span>
|
||||
</Label>
|
||||
<Input
|
||||
id="current_semester"
|
||||
name="current_semester"
|
||||
type="number"
|
||||
min={1}
|
||||
max={14}
|
||||
defaultValue={
|
||||
user.student
|
||||
?.current_semester ?? 1
|
||||
}
|
||||
/>
|
||||
<InputError
|
||||
message={errors.current_semester}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label>
|
||||
Dosen Wali{' '}
|
||||
@ -421,6 +445,7 @@ export default function StudentEdit({ user, departments, lecturers }: Props) {
|
||||
message={errors.academic_advisor_id}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
|
||||
@ -53,6 +53,7 @@ export type Student = {
|
||||
student_number: string;
|
||||
department: Department | null;
|
||||
enrollment_year: number;
|
||||
current_semester: number;
|
||||
academic_advisor: Lecturer | null;
|
||||
status: StudentStatus;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user