README.md

@@ -1,5 +1,2 @@
 # sistem-akademik
  Sistem Akademik untuk SDN Cinere 01
-
-# Version
-1.1

app/Filament/Pages/ReportPreview.php

@@ -4,7 +4,6 @@ namespace App\Filament\Pages;
 
 use App\Models\AcademicYear;
 use App\Models\Assessment;
-use App\Models\AssessmentLearningObjective;
 use App\Models\ClassRoom;
 use App\Models\ClassSubject;
 use App\Models\CompetencyAchievement;
@@ -17,7 +16,6 @@ use App\Models\TeacherSubject;
 use Filament\Notifications\Notification;
 use Filament\Pages\Page;
 use Carbon\Carbon;
-use Illuminate\Contracts\Support\Htmlable;
 use function PHPUnit\Framework\isEmpty;
 use function Symfony\Component\String\s;
 use Barryvdh\DomPDF\Facade\Pdf;
@@ -49,8 +47,10 @@ class ReportPreview extends Page
     public function mount()
     {
         $this->loadData();
+        $this->loadAssessment();
     }
 
+
     public function saveAttendance()
     {
         $this->validate([
@@ -67,16 +67,13 @@ class ReportPreview extends Page
 
     protected function loadData() : void
     {
-        $this->student = Student::find(request()->query('studentId')) ?? 1;
+        $this->student = Student::find(request()->query('studentId'));
-
+        $this->class = ClassRoom::find(request()->query('classId'));
-        $this->class = ClassRoom::find(request()->query('classId')) ?? 1;
+        $this->academic_year = AcademicYear::find(request()->query('yearId'));
-        $this->academic_year = AcademicYear::find(request()->query('yearId')) ?? 1;
+        $this->semester = request()->query('semester');
-        $this->semester = request()->query('semester') ?? "first";
         $this->school_information = SchoolInformation::first();
 
         $this->class_name = $this->toRoman($this->class->class_level) . ' ' . $this->extractClassLetter($this->class->class_name);
-
-        $this->loadAssessment();
     }
 
     protected function loadAssessment(): void
@@ -90,6 +87,8 @@ class ReportPreview extends Page
                     ->body("The parameter '{$param}' is required.")
                     ->danger()
                     ->send();
+
+                return;
             }
         }
 
@@ -114,32 +113,17 @@ class ReportPreview extends Page
                     return null;
                 }
 
-                $assesmentLearningObjectivesLower = AssessmentLearningObjective::with('learningObjective')
+                $competencyAchievements = CompetencyAchievement::where('class_room_id', $class_id)
-                    ->where('teacher_subject_id', $as->teacherSubject->id)
+                    ->where('subject_id', $subject->id)
-                    ->where('student_id', $this->student->id)
+                    ->where('min_score', '<=', $as->score)
-                    ->where('type', 'lower')
+                    ->where('max_score', '>=', $as->score)
-                    ->get()
+                    ->first();
-                    ->pluck('learningObjective.description')
-                    ->toArray();
-
-                $joinedStringLower = $as->student->full_name . ' perlu peningkatan dalam ' . implode(', ', $assesmentLearningObjectivesLower);
-
-                $assesmentLearningObjectivesHighest = AssessmentLearningObjective::with('learningObjective')
-                    ->where('teacher_subject_id', $as->teacherSubject->id)
-                    ->where('student_id', $this->student->id)
-                    ->where('type', 'highest')
-                    ->get()
-                    ->pluck('learningObjective.description')
-                    ->toArray();
-
-                $joinedStringHighest = $as->student->full_name . ' menunjukan pemahaman dalam ' . implode(', ', $assesmentLearningObjectivesHighest);
 
                 return [
                     "score" => $as->score,
                     "subject" => $subject->name,
                     "category" => $subject->category,
-                    "lower" => $assesmentLearningObjectivesLower ? $joinedStringLower : null,
+                    "competency_achievement" => $competencyAchievements ? $this->student->full_name . '' . $competencyAchievements->description : '-',
-                    "highest" => $assesmentLearningObjectivesHighest ? $joinedStringHighest : null,
                 ];
             })
             ->filter() // Hapus null jika ada
@@ -178,17 +162,17 @@ class ReportPreview extends Page
                 ];
             })
             ->toArray();
+
         $this->table["extracurricular"] = $extracurricular;
 
         $homeRoom = HomeRoomTeacher::with(['teacher'])
             ->where('class_room_id', $this->class->id)
             ->where('academic_year_id', $this->academic_year->id)
-            ->first();
+            ->firstOrFail()
+            ->toArray();
 
-        if ($homeRoom) {
         $this->home_room_teacher = $homeRoom ?? [];
     }
-    }
 
     public function extractClassLetter($className)
     {
@@ -232,24 +216,4 @@ class ReportPreview extends Page
     {
         return false;
     }
-
-    public function getTitle(): string | Htmlable
-    {
-        return 'Pratinjau Rapor Siswa'; // Contoh jika nama laporan dinamis
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Pratinjau Rapor Siswa';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Pratinjau Rapor Siswa';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Pratinjau Rapor Siswa';
-    }
 }

app/Filament/Pages/SchoolInformation.php

@@ -12,7 +12,6 @@ use Filament\Forms\Contracts\HasForms;
 use Filament\Forms\Concerns\InteractsWithForms;
 
 use App\Models\SchoolInformation as SchoolInformationModel;
-use Illuminate\Contracts\Support\Htmlable;
 
 class SchoolInformation extends Page implements HasForms
 {
@@ -20,8 +19,8 @@ class SchoolInformation extends Page implements HasForms
 
     protected static ?string $navigationIcon = 'heroicon-o-document-text';
     protected static string $view = 'filament.pages.school-information';
-    protected static ?string $navigationGroup = 'Pengaturan';
+    protected static ?string $navigationGroup = 'Settings';
-    protected static ?int $navigationSort = 999;
+    protected static ?int $navigationSort = 999; // Biar muncul paling bawah
 
     public static function canAccess(): bool
     {
@@ -103,24 +102,4 @@ class SchoolInformation extends Page implements HasForms
             ->success()
             ->send();
     }
-
-    public function getTitle(): string | Htmlable
-    {
-        return 'Informasi Sekolah'; // Contoh jika nama laporan dinamis
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Informasi Sekolah';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Informasi Sekolah';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Informasi Sekolah';
-    }
 }

app/Filament/Pages/StudentReport.php

@@ -14,7 +14,6 @@ use App\Models\TeacherSubject;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Pages\Page;
-use Illuminate\Contracts\Support\Htmlable;
 
 class StudentReport extends Page
 {
@@ -72,7 +71,7 @@ class StudentReport extends Page
     {
         return $form->schema([
             Select::make('class_id')
-                ->label('Kelas')
+                ->label('Class')
                 ->required()
                 ->options(function () {
                     $query = ClassRoom::query();
@@ -108,7 +107,7 @@ class StudentReport extends Page
                 }),
 
             Select::make('academic_year')
-                ->label('Tahun Ajaran')
+                ->label('Academic Year')
                 ->required()
                 ->options(AcademicYear::pluck('name', 'id')->toArray())
                 ->searchable()
@@ -123,8 +122,8 @@ class StudentReport extends Page
                 ->label('Semester')
                 ->required()
                 ->options([
-                    'first' => 'Ganjil',
+                    'first' => 'First Semester',
-                    'second' => 'Genap'
+                    'second' => 'Second Semester'
                 ])
                 ->reactive()
                 ->afterStateUpdated(function ($state) {
@@ -282,24 +281,4 @@ class StudentReport extends Page
 
         $this->list = $groupedAssessment;
     }
-
-    public function getTitle(): string | Htmlable
-    {
-        return 'Rapor Siswa'; // Contoh jika nama laporan dinamis
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Rapor Siswa';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Rapor Siswa';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Rapor Siswa';
-    }
 }

app/Filament/Resources/AcademicYearResource.php

@@ -123,19 +123,4 @@ class AcademicYearResource extends Resource
                 SoftDeletingScope::class,
             ]);
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Tahun Ajaran';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Tahun Ajaran';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Tahun Ajaran';
-    }
 }

app/Filament/Resources/AcademicYearResource/Pages/CreateAcademicYear.php

@@ -13,11 +13,6 @@ class CreateAcademicYear extends CreateRecord
 {
     protected static string $resource = AcademicYearResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Tahun Ajaran Baru';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = AcademicYear::where('name', $data['name'])
@@ -26,7 +21,7 @@ class CreateAcademicYear extends CreateRecord
         if ($exists) {
             Notification::make()
                 ->title('Failed to save')
-                ->body('Data sudah ada')
+                ->body('A record already exists.')
                 ->danger()
                 ->send();
 

app/Filament/Resources/AcademicYearResource/Pages/EditAcademicYear.php

@@ -13,11 +13,6 @@ class EditAcademicYear extends EditRecord
 {
     protected static string $resource = AcademicYearResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Tahun Ajaran';
-    }
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $exists = AcademicYear::where('name', $data['name'])
@@ -26,7 +21,7 @@ class EditAcademicYear extends EditRecord
         if ($exists) {
             Notification::make()
                 ->title('Failed to save')
-                ->body('Data sudah ada')
+                ->body('A record already exists.')
                 ->danger()
                 ->send();
 

app/Filament/Resources/AcademicYearResource/Pages/ListAcademicYears.php

@@ -13,13 +13,7 @@ class ListAcademicYears extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
+            Actions\CreateAction::make(),
-                ->label('Tambah Tahun Ajaran Baru'), // Custom label untuk tombol create
         ];
     }
-
-    public function getTitle(): string
-    {
-        return 'Daftar Tahun Ajaran';
-    }
 }

app/Filament/Resources/AssessmentResource.php

@@ -164,21 +164,7 @@ class AssessmentResource extends Resource
                     ->toggleable(isToggledHiddenByDefault: true),
             ])
             ->filters([
-
+                //
-                Tables\Filters\SelectFilter::make('semester')
-                    ->label('Semester')
-                    ->options([
-                        'first' => 'Ganjil',
-                        'second' => 'Genap'
-                    ]),
-
-                Tables\Filters\SelectFilter::make('teacher_subject_id')
-                    ->label('Guru per-Mapel')
-                    ->relationship('teacherSubject', 'id')
-                    ->searchable()
-                    ->getOptionLabelFromRecordUsing(fn (TeacherSubject $record) =>
-                        $record->teacher->name . ' - ' . $record->subject->name)
-                    ->preload(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
@@ -187,6 +173,9 @@ class AssessmentResource extends Resource
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('admin') || auth()->user()->hasRole('teacher')),
                 ]),
+            ])
+            ->emptyStateActions([
+                Tables\Actions\CreateAction::make(),
             ]);
     }
 
@@ -206,19 +195,4 @@ class AssessmentResource extends Resource
             'multiple' => Pages\MultipleAssessments::route('/multiple'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Penilaian';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Penilaian';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Penilaian';
-    }
 }

app/Filament/Resources/AssessmentResource/Pages/CreateAssessment.php

@@ -12,10 +12,6 @@ class CreateAssessment extends CreateRecord
 {
     protected static string $resource = AssessmentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Penilaian';
-    }
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = Assessment::where('teacher_subject_id', $data['teacher_subject_id'])
@@ -24,8 +20,8 @@ class CreateAssessment extends CreateRecord
 
         if ($exists) {
             Notification::make()
-                ->title('Gagal menyimpan data')
+                ->title('Failed to save')
-                ->body('Data untuk kombinasi guru, mata pelajaran, dan siswa ini sudah ada.')
+                ->body('A record for this teacher, subject, and student combination already exists.')
                 ->danger()
                 ->send();
 

app/Filament/Resources/AssessmentResource/Pages/EditAssessment.php

@@ -22,7 +22,7 @@ class EditAssessment extends EditRecord
         if ($exists) {
             Notification::make()
                 ->title('Failed to save')
-                ->body('Data untuk kombinasi guru, mata pelajaran, dan siswa ini sudah ada.')
+                ->body('An assessment for this teacher, subject, and student combination already exists.')
                 ->danger()
                 ->send();
 
@@ -38,9 +38,4 @@ class EditAssessment extends EditRecord
             Actions\DeleteAction::make(),
         ];
     }
-
-    public function getTitle(): string
-    {
-        return 'Edit Penilaian';
-    }
 }

app/Filament/Resources/AssessmentResource/Pages/ListAssessments.php

@@ -13,10 +13,6 @@ class ListAssessments extends ListRecords
 {
     protected static string $resource = AssessmentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Penilaian';
-    }
     protected function getTableQuery(): Builder
     {
         $user = auth()->user();
@@ -38,9 +34,9 @@ class ListAssessments extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-//            Actions\CreateAction::make()->visible(fn () => auth()->user()->hasRole('admin')),
+            Actions\CreateAction::make()->visible(fn () => auth()->user()->hasRole('admin')),
             Actions\Action::make('multiple')
-                ->label('Tambah Penilaian')
+                ->label('Multiple Assessments')
                 ->url('assessments/multiple')
                 ->icon('heroicon-o-user-group')
                 ->visible(fn () => auth()->user()->hasRole('admin') || auth()->user()->hasRole('teacher')),

app/Filament/Resources/AssessmentResource/Pages/MultipleAssessments.php

@@ -4,18 +4,18 @@ namespace App\Filament\Resources\AssessmentResource\Pages;
 
 use App\Filament\Resources\AssessmentResource;
 use App\Models\Assessment;
-use App\Models\AssessmentLearningObjective;
 use App\Models\Attendances;
 use App\Models\ClassStudent;
 use App\Models\HomeRoomTeacher;
-use App\Models\LearningObjective;
 use Filament\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Resources\Pages\page;
+use App\Models\Student;
 use App\Models\TeacherSubject;
 use Filament\Forms;
 use Filament\Notifications\Notification;
-use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Support\Collection;
+use function Symfony\Component\Translation\t;
 
 class MultipleAssessments extends page
 {
@@ -23,11 +23,6 @@ class MultipleAssessments extends page
 
     protected static string $view = 'filament.resources.assessment-resource.pages.multiple-assessment';
 
-    public function getTitle(): string | Htmlable
-    {
-        return __('Tambah Penilaian');
-    }
-
     use Forms\Concerns\InteractsWithForms;
 
     public ?array $data = [];
@@ -39,31 +34,34 @@ class MultipleAssessments extends page
 
     public $semester = 'first';
 
-    public $learningObjectivesList = [];
-
     public function mount(): void
     {
         $this->form->fill();
     }
 
-    public function loadData($subject, $class): void
-    {
-
-        $this->learningObjectivesList = LearningObjective::with(["subject", "class"])
-            ->where('subject_id', $subject)
-            ->where('class_room_id', $class)
-            ->get()
-            ->pluck("description", "id")
-            ->toArray();
-    }
-
     protected function getFormSchema(): array
     {
         return [
             Forms\Components\Grid::make(2)
                 ->schema([
+//                    Forms\Components\Select::make('teacherSubjectId')
+//                        ->label('Teacher Subject')
+//                        ->options(
+//                            TeacherSubject::with(['teacher', 'subject', 'class', 'academicYear'])->get()->mapWithKeys(function ($item) {
+//                                return [
+//                                    $item->id => "{$item->teacher->name} - {$item->subject->name} - {$item->class->class_name}  - {$item->academicYear->name}"
+//                                ];
+//                            })->toArray()
+//                        )
+//                        ->searchable()
+//                        ->reactive()
+//                        ->afterStateUpdated(function ($state) {
+//                            $this->teacherSubjectId = $state;
+//                            $this->loadStudents();
+//                        }),
+
                     Select::make('teacherSubjectId')
-                        ->label('Guru per-Mapel')
+                        ->label('Teacher Subject')
                         ->required()
                         ->options(function () {
                             $user = auth()->user();
@@ -101,8 +99,8 @@ class MultipleAssessments extends page
                         ->required()
                         ->default('first')
                         ->options([
-                            'first' => 'Ganjil',
+                            'first' => 'First Semester',
-                            'second' => 'Genap'
+                            'second' => 'Second Semester'
                         ])
                         ->live()
                         ->afterStateUpdated(function ($state) {
@@ -124,8 +122,6 @@ class MultipleAssessments extends page
             ->where('id', $this->teacherSubjectId)
             ->firstOrFail();
 
-        $this->loadData($this->teacherSubject->subject->id, $this->teacherSubject->class->id);
-
         $classStudents = ClassStudent::where('class_room_id', $this->teacherSubject->class_id)
             ->where('academic_year_id', $this->teacherSubject->academic_year_id)
             ->with('student')
@@ -154,156 +150,57 @@ class MultipleAssessments extends page
                 }
             }
 
-            // Ambil tujuan pembelajaran tertinggi dari tabel assessment_learning_objectives
-            $highestObjectives = AssessmentLearningObjective::where('student_id', $student->id)
-                ->where('teacher_subject_id', $this->teacherSubjectId)
-                ->where('type', 'highest')
-                ->pluck('learning_objective_id')
-                ->toArray();
-
-            // Ambil tujuan pembelajaran lebih rendah dari tabel assessment_learning_objectives
-            $lowerObjectives = AssessmentLearningObjective::where('student_id', $student->id)
-                ->where('teacher_subject_id', $this->teacherSubjectId)
-                ->where('type', 'lower')
-                ->pluck('learning_objective_id')
-                ->toArray();
-
             $result[] = [
                 'id' => $student->id,
                 'name' => $student->full_name,
                 'nis' => $student->nis,
-                'nisn' => $student->nisn,
+                'score' => $existingAssessment ? $existingAssessment->score : null,
-                'gender' => $student->gender,
-                'birth_date' => $student->birth_date,
-                'score' => $existingAssessment ? $existingAssessment->score : 0,
-//                'learning_objectives' => $existingAssessment && is_array($existingAssessment->learning_objectives)
-//                    ? $existingAssessment->learning_objectives
-//                    : [],
-//                'learning_objectives_lower' => $existingAssessment && is_array($existingAssessment->learning_objectives_lower)
-//                    ? $existingAssessment->learning_objectives_lower
-//                    : [],
-                'learning_objectives' => $highestObjectives,
-                'learning_objectives_lower' => $lowerObjectives,
             ];
         }
 
         $this->students = $result;
     }
 
-    public function addLearningObjective(int $studentIndex, string $type = "highest"): void
-    {
-        if($type === "lower") {
-            if (!isset($this->students[$studentIndex]['learning_objectives_lower'])) {
-                $this->students[$studentIndex]['learning_objectives_lower'] = [];
-            }
-            $this->students[$studentIndex]['learning_objectives_lower'][] = null;
-        } else {
-            if (!isset($this->students[$studentIndex]['learning_objectives'])) {
-                $this->students[$studentIndex]['learning_objectives'] = [];
-            }
-            $this->students[$studentIndex]['learning_objectives'][] = null;
-        }
-    }
-
-    public function removeLearningObjective(int $studentIndex, int $objectiveIndex, string $type = "highest"): void
-    {
-        if ($type === "lower") {
-            if (isset($this->students[$studentIndex]['learning_objectives_lower']) && is_array($this->students[$studentIndex]['learning_objectives_lower'])) {
-                // Check if the specific objectiveIndex exists within the array
-                // This will be true for null values too, which is what we want for removal
-                if (array_key_exists($objectiveIndex, $this->students[$studentIndex]['learning_objectives_lower'])) {
-                    unset($this->students[$studentIndex]['learning_objectives_lower'][$objectiveIndex]);
-
-                    // Reindex the array to prevent gaps in keys, which can cause issues with Livewire
-                    $this->students[$studentIndex]['learning_objectives_lower'] = array_values($this->students[$studentIndex]['learning_objectives_lower']);
-                }
-            }
-        } else {
-            if (isset($this->students[$studentIndex]['learning_objectives']) && is_array($this->students[$studentIndex]['learning_objectives'])) {
-                // Check if the specific objectiveIndex exists within the array
-                // This will be true for null values too, which is what we want for removal
-                if (array_key_exists($objectiveIndex, $this->students[$studentIndex]['learning_objectives'])) {
-                    unset($this->students[$studentIndex]['learning_objectives'][$objectiveIndex]);
-
-                    // Reindex the array to prevent gaps in keys, which can cause issues with Livewire
-                    $this->students[$studentIndex]['learning_objectives'] = array_values($this->students[$studentIndex]['learning_objectives']);
-                }
-            }
-        }
-    }
-
     public function submit(): void
     {
         if (!$this->teacherSubjectId || empty($this->students)) {
             Notification::make()
                 ->title('Error')
-                ->body('Pilih guru per-mapel dan masukkan nilai siswa.')
+                ->body('Please select a teacher subject and enter student scores.')
                 ->danger()
                 ->send();
             return;
         }
 
         foreach ($this->students as $student) {
-            if (isset($student['score']) || !empty(array_filter($student['learning_objectives'] ?? [])) || !empty(array_filter($student['learning_objectives_lower'] ?? []))) {
+            if (!isset($student['score'])) continue;
+
             Assessment::updateOrCreate(
                 [
                     'student_id' => $student['id'],
                     'teacher_subject_id' => $this->teacherSubjectId,
-                        'semester' => $this->semester,
                 ],
                 [
-                        'score' => $student['score'] ?? 0,
+                    'score' => $student['score'],
+                    'semester' => $this->semester,
                 ]
             );
         }
 
-            AssessmentLearningObjective::where('student_id', $student['id'])
-                ->where('teacher_subject_id', $this->teacherSubjectId)
-                ->where('type', 'highest')
-                ->delete();
-
-            if (!empty($student['learning_objectives'])) {
-                foreach (array_filter($student['learning_objectives']) as $loId) {
-                    AssessmentLearningObjective::create([
-                        'student_id' => $student['id'],
-                        'teacher_subject_id' => $this->teacherSubjectId,
-                        'learning_objective_id' => $loId,
-                        'type' => 'highest',
-                    ]);
-                }
-            }
-
-            AssessmentLearningObjective::where('student_id', $student['id'])
-                ->where('teacher_subject_id', $this->teacherSubjectId)
-                ->where('type', 'lower')
-                ->delete();
-
-            if (!empty($student['learning_objectives_lower'])) {
-                foreach (array_filter($student['learning_objectives_lower']) as $loId) { // Filter nulls
-                    AssessmentLearningObjective::create([
-                        'student_id' => $student['id'],
-                        'teacher_subject_id' => $this->teacherSubjectId,
-                        'learning_objective_id' => $loId,
-                        'type' => 'lower',
-                    ]);
-                }
-            }
-        }
-
         Notification::make()
-            ->title('Berhasil')
+            ->title('Success')
-            ->body('Penilaian dan Tujuan Pembelajaran berhasil disimpan.')
+            ->body('Assessments saved successfully.')
             ->success()
             ->send();
     }
 
-
     protected function getHeaderActions(): array
     {
         return [
             Actions\Action::make('back')
-                ->label('Kembali ke halaman assessment')
+                ->label('Back to Assessments')
                 ->url(static::getResource()::getUrl('index')),
         ];
     }
+
 }

app/Filament/Resources/AttendancesResource.php

@@ -137,34 +137,34 @@ class AttendancesResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('student.full_name')
-                    ->label('Siswa')
+                    ->label('Student')
                     ->searchable()
                     ->sortable(),
 
                 Tables\Columns\TextColumn::make('teacherSubject.class.class_name')
-                    ->label('Kelas')
+                    ->label('Class')
                     ->searchable(),
 
                 Tables\Columns\TextColumn::make('teacherSubject.subject.name')
-                    ->label('Mapel')
+                    ->label('Subject')
                     ->searchable(),
 
                 Tables\Columns\TextColumn::make('teacherSubject.teacher.name')
-                    ->label('Guru')
+                    ->label('Teacher')
                     ->searchable(),
 
                 Tables\Columns\TextColumn::make('date')
-                    ->label('Tanggal')
+                    ->label('Date')
                     ->date('d/m/Y')
                     ->sortable(),
 
                 Tables\Columns\BadgeColumn::make('status')
                     ->label('Status')
                     ->formatStateUsing(fn (string $state): string => match ($state) {
-                        'present' => 'Hadir',
+                        'present' => 'Present',
-                        'absent' => 'Tidak Hadir',
+                        'absent' => 'Absent',
-                        'permission' => 'Izin',
+                        'permission' => 'Permission',
-                        'sick' => 'Sakit'
+                        'sick' => 'Sick'
                     })
                     ->color(fn (string $state): string => match ($state) {
                         'present' => 'success',
@@ -176,12 +176,12 @@ class AttendancesResource extends Resource
                 Tables\Columns\TextColumn::make('semester')
                     ->label('Semester')
                     ->formatStateUsing(fn (string $state): string => match ($state) {
-                        'first' => 'Ganjil',
+                        'first' => 'First Semester',
-                        'second' => 'Genap'
+                        'second' => 'Second Semester'
                     }),
 
                 Tables\Columns\TextColumn::make('teacherSubject.academicYear.name')
-                    ->label('Tahun Ajaran')
+                    ->label('Academic Year')
                     ->searchable(),
 
                 Tables\Columns\TextColumn::make('recorder.name')
@@ -192,21 +192,20 @@ class AttendancesResource extends Resource
                 Tables\Filters\SelectFilter::make('status')
                     ->label('Status')
                     ->options([
-                        'present' => 'Hadir',
+                        'present' => 'Present',
-                        'absent' => 'Tidak Hadir',
+                        'absent' => 'Absent',
-                        'permission' => 'Izin',
+                        'permission' => 'Permission',
-                        'sick' => 'Sakit'
+                        'sick' => 'Sick'
                     ]),
 
                 Tables\Filters\SelectFilter::make('semester')
                     ->label('Semester')
                     ->options([
-                        'first' => 'Ganjil',
+                        'first' => 'First Semester',
-                        'second' => 'Genap'
+                        'second' => 'Second Semester'
                     ]),
 
                 Tables\Filters\Filter::make('date')
-                    ->label('Tanggal')
                     ->form([
                         Forms\Components\DatePicker::make('date_from')
                             ->label('From'),
@@ -226,7 +225,7 @@ class AttendancesResource extends Resource
                     }),
 
                 Tables\Filters\SelectFilter::make('teacher_subject_id')
-                    ->label('Guru per-Mapel')
+                    ->label('Teacher Subject')
                     ->relationship('teacherSubject', 'id')
                     ->searchable()
                     ->getOptionLabelFromRecordUsing(fn (TeacherSubject $record) =>
@@ -244,13 +243,17 @@ class AttendancesResource extends Resource
                     Tables\Actions\DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('admin') || auth()->user()->hasRole('teacher')),
                 ]),
             ])
-//            ->defaultSort('teacherSubject.academicYear.name', 'desc')
+            ->defaultSort('date', 'desc')
             ->groups([
-                Tables\Grouping\Group::make('teacherSubject.subject.name')
+                Tables\Grouping\Group::make('date')
-                    ->label('Mapel')
+                    ->label('Date')
+                    ->date()
                     ->collapsible(),
-                Tables\Grouping\Group::make('teacherSubject.class.class_name')
+                Tables\Grouping\Group::make('teacherSubject.subject.name')
-                    ->label('Kelas')
+                    ->label('Subjects')
+                    ->collapsible(),
+                Tables\Grouping\Group::make('semester')
+                    ->label('Semester')
                     ->collapsible(),
             ]);
     }
@@ -271,19 +274,4 @@ class AttendancesResource extends Resource
             'multiple' => Pages\MultipleAttendances::route('/multiple'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Absensi';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Absensi';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Absensi';
-    }
 }

app/Filament/Resources/AttendancesResource/Pages/CreateAttendances.php

@@ -12,11 +12,6 @@ class CreateAttendances extends CreateRecord
 {
     protected static string $resource = AttendancesResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Absensi';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = Assessment::where('teacher_subject_id', $data['teacher_subject_id'])

app/Filament/Resources/AttendancesResource/Pages/EditAttendances.php

@@ -13,11 +13,6 @@ class EditAttendances extends EditRecord
 {
     protected static string $resource = AttendancesResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Absensi';
-    }
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $exists = Attendances::where('teacher_subject_id', $data['teacher_subject_id'])

app/Filament/Resources/AttendancesResource/Pages/ListAttendances.php

@@ -13,11 +13,6 @@ class ListAttendances extends ListRecords
 {
     protected static string $resource = AttendancesResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Absensi';
-    }
-
     protected function getTableQuery(): ?Builder
     {
         $user = auth()->user();
@@ -39,9 +34,9 @@ class ListAttendances extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
-//            Actions\CreateAction::make()->visible(fn () => auth()->user()->hasRole('admin')),
+            Actions\CreateAction::make()->visible(fn () => auth()->user()->hasRole('admin')),
             Actions\Action::make('multiple')
-                ->label('Tambah Absensi')
+                ->label('Multiple Attendance')
                 ->url('attendances/multiple')
                 ->icon('heroicon-o-user-group')
                 ->visible(fn () => auth()->user()->hasRole('admin') || auth()->user()->hasRole('teacher')),

app/Filament/Resources/AttendancesResource/Pages/MultipleAttendances.php

@@ -47,7 +47,7 @@ class MultipleAttendances extends Page
         return $form
             ->schema([
                 Select::make('teacher_subject_id')
-                    ->label('Guru per-Mapel')
+                    ->label('Teacher Subject')
                     ->required()
                     ->options(function () {
                         $user = auth()->user();
@@ -84,7 +84,7 @@ class MultipleAttendances extends Page
                     }),
 
                 DatePicker::make('date')
-                    ->label('Tanggal Absensi')
+                    ->label('Attendance Date')
                     ->required()
                     ->default(now())
                     ->live()
@@ -97,8 +97,8 @@ class MultipleAttendances extends Page
                     ->label('Semester')
                     ->required()
                     ->options([
-                        'first' => 'Ganjil',
+                        'first' => 'First Semester',
-                        'second' => 'Genap'
+                        'second' => 'Second Semester'
                     ])
                     ->live()
                     ->afterStateUpdated(function ($state) {
@@ -195,7 +195,7 @@ class MultipleAttendances extends Page
         });
 
         Notification::make()
-            ->title('Absensi berhasil disimpan!')
+            ->title('Attendance saved successfully ' . $this->teacherSubject->id)
             ->success()
             ->send();
 
@@ -206,7 +206,7 @@ class MultipleAttendances extends Page
     {
         return [
             Actions\Action::make('back')
-                ->label('Kembali ke halaman absensi')
+                ->label('Back to Attendances')
                 ->url(static::getResource()::getUrl('index')),
         ];
     }

app/Filament/Resources/ClassRoomResource.php

@@ -105,19 +105,4 @@ class ClassRoomResource extends Resource
             'edit' => Pages\EditClassRoom::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Kelas';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Kelas';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Kelas';
-    }
 }

app/Filament/Resources/ClassRoomResource/Pages/CreateClassRoom.php

@@ -9,9 +9,4 @@ use Filament\Resources\Pages\CreateRecord;
 class CreateClassRoom extends CreateRecord
 {
     protected static string $resource = ClassRoomResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Kelas';
-    }
 }

app/Filament/Resources/ClassRoomResource/Pages/EditClassRoom.php

@@ -10,10 +10,6 @@ class EditClassRoom extends EditRecord
 {
     protected static string $resource = ClassRoomResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Kelas';
-    }
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ClassRoomResource/Pages/ListClassRooms.php

@@ -10,11 +10,6 @@ class ListClassRooms extends ListRecords
 {
     protected static string $resource = ClassRoomResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Kelas';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ClassStudentResource.php

@@ -111,19 +111,4 @@ class ClassStudentResource extends Resource
             'edit' => Pages\EditClassStudent::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Kelas per-Siswa';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Kelas per-Siswa';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Kelas per-Siswa';
-    }
 }

app/Filament/Resources/ClassStudentResource/Pages/CreateClassStudent.php

@@ -13,11 +13,6 @@ class CreateClassStudent extends CreateRecord
 {
     protected static string $resource = ClassStudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Kelas per-Siswa';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = ClassStudent::where('class_room_id', $data['class_room_id'])

app/Filament/Resources/ClassStudentResource/Pages/EditClassStudent.php

@@ -12,11 +12,6 @@ class EditClassStudent extends EditRecord
 {
     protected static string $resource = ClassStudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Kelas per-Siswa';
-    }
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $exists = ClassStudent::where('class_room_id', $data['class_room_id'])

app/Filament/Resources/ClassStudentResource/Pages/ListClassStudents.php

@@ -10,11 +10,6 @@ class ListClassStudents extends ListRecords
 {
     protected static string $resource = ClassStudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Kelas per-Siswa';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ClassSubjectResource.php

@@ -80,19 +80,4 @@ class ClassSubjectResource extends Resource
             'edit' => Pages\EditClassSubject::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Mata Pelajaran per-Kelas';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Mata Pelajaran per-Kelas';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Mata Pelajaran per-Kelas';
-    }
 }

app/Filament/Resources/ClassSubjectResource/Pages/CreateClassSubject.php

@@ -12,11 +12,6 @@ class CreateClassSubject extends CreateRecord
 {
     protected static string $resource = ClassSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Mata Pelajaran per-Kelas';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = ClassSubject::where('class_room_id', $data['class_room_id'])

app/Filament/Resources/ClassSubjectResource/Pages/EditClassSubject.php

@@ -10,11 +10,6 @@ class EditClassSubject extends EditRecord
 {
     protected static string $resource = ClassSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Mata Pelajaran per-Kelas';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ClassSubjectResource/Pages/ListClassSubjects.php

@@ -10,11 +10,6 @@ class ListClassSubjects extends ListRecords
 {
     protected static string $resource = ClassSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Mata Pelajaran per-Kelas';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/CompetencyAchievementResource.php

@@ -124,9 +124,4 @@ class CompetencyAchievementResource extends Resource
             'edit' => Pages\EditCompetencyAchievement::route('/{record}/edit'),
         ];
     }
-
-    public static function shouldRegisterNavigation(): bool
-    {
-        return false;
-    }
 }

app/Filament/Resources/ExtracurricularAssessmentResource.php

@@ -148,47 +148,4 @@ class ExtracurricularAssessmentResource extends Resource
             'edit' => Pages\EditExtracurricularAssessment::route('/{record}/edit'),
         ];
     }
-
-    public static function canAccess(): bool
-    {
-        $user = auth()->user();
-
-        if ($user->hasRole('parent')) {
-            return true;
-        }
-
-        $isHomeRoomTeacher = HomeRoomTeacher::where('teacher_id', $user->id)->exists();
-
-        return $user->can('page_SchoolInformation') || $isHomeRoomTeacher;
-    }
-
-    public static function shouldRegisterNavigation(): bool
-    {
-        $user = auth()->user();
-
-        if ($user->hasRole('parent')) {
-            return true;
-        }
-
-        // Untuk teacher (wali kelas)
-        $isHomeRoomTeacher = HomeRoomTeacher::where('teacher_id', $user->id)->exists();
-
-        // Atau punya permission khusus
-        return $user->can('page_SchoolInformation') || $isHomeRoomTeacher;
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Penilaian Ektrakurikuler';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Penilaian Ektrakurikuler';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Penilaian Ektrakurikuler';
-    }
 }

app/Filament/Resources/ExtracurricularAssessmentResource/Pages/CreateExtracurricularAssessment.php

@@ -9,9 +9,4 @@ use Filament\Resources\Pages\CreateRecord;
 class CreateExtracurricularAssessment extends CreateRecord
 {
     protected static string $resource = ExtracurricularAssessmentResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Penilaian Ektrakurikuler';
-    }
 }

app/Filament/Resources/ExtracurricularAssessmentResource/Pages/EditExtracurricularAssessment.php

@@ -10,11 +10,6 @@ class EditExtracurricularAssessment extends EditRecord
 {
     protected static string $resource = ExtracurricularAssessmentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Penilaian Ektrakurikuler';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ExtracurricularAssessmentResource/Pages/ListExtracurricularAssessments.php

@@ -13,11 +13,6 @@ class ListExtracurricularAssessments extends ListRecords
 {
     protected static string $resource = ExtracurricularAssessmentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Penilaian Ektrakurikuler';
-    }
-
     protected function getTableQuery() : Builder
     {
         $user = auth()->user();

app/Filament/Resources/ExtracurricularResource.php

@@ -24,12 +24,12 @@ class ExtracurricularResource extends Resource
         return $form
             ->schema([
                 Forms\Components\TextInput::make('name')
-                    ->label('Nama')
+                    ->label('Name')
                     ->required()
                     ->maxLength(255),
 
                 Forms\Components\Textarea::make('description')
-                    ->label('Deskripsi')
+                    ->label('Description')
                     ->maxLength(1000)
                     ->rows(4),
             ]);
@@ -40,12 +40,12 @@ class ExtracurricularResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('name')
-                    ->label('Nama')
+                    ->label('Name')
                     ->searchable()
                     ->sortable(),
 
                 Tables\Columns\TextColumn::make('description')
-                    ->label('Deskripsi')
+                    ->label('Description')
                     ->limit(50),
 
                 Tables\Columns\TextColumn::make('created_at')
@@ -53,6 +53,7 @@ class ExtracurricularResource extends Resource
                     ->dateTime('d M Y'),
             ])
             ->filters([
+                // Tambahkan filter jika perlu
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
@@ -81,19 +82,4 @@ class ExtracurricularResource extends Resource
             'edit' => Pages\EditExtracurricular::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Ektrakurikuler';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Ektrakurikuler';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Ektrakurikuler';
-    }
 }

app/Filament/Resources/ExtracurricularResource/Pages/CreateExtracurricular.php

@@ -9,9 +9,4 @@ use Filament\Resources\Pages\CreateRecord;
 class CreateExtracurricular extends CreateRecord
 {
     protected static string $resource = ExtracurricularResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Ektrakuriler';
-    }
 }

app/Filament/Resources/ExtracurricularResource/Pages/EditExtracurricular.php

@@ -10,11 +10,6 @@ class EditExtracurricular extends EditRecord
 {
     protected static string $resource = ExtracurricularResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Ektrakuriler';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/ExtracurricularResource/Pages/ListExtracurriculars.php

@@ -10,15 +10,10 @@ class ListExtracurriculars extends ListRecords
 {
     protected static string $resource = ExtracurricularResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Ektrakuriler';
-    }
-
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()->label('Tambah Ekstrakurikuler'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/HomeRoomTeacherResource.php

@@ -108,19 +108,4 @@ class HomeRoomTeacherResource extends Resource
             'edit' => Pages\EditHomeRoomTeacher::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Guru Wali Kelas';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Guru Wali Kelas';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Guru Wali Kelas';
-    }
 }

app/Filament/Resources/HomeRoomTeacherResource/Pages/CreateHomeRoomTeacher.php

@@ -13,11 +13,6 @@ class CreateHomeRoomTeacher extends CreateRecord
 {
     protected static string $resource = HomeRoomTeacherResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Guru Wali Kelas';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = HomeRoomTeacher::where('class_room_id', $data['class_room_id'])

app/Filament/Resources/HomeRoomTeacherResource/Pages/EditHomeRoomTeacher.php

@@ -13,12 +13,6 @@ class EditHomeRoomTeacher extends EditRecord
 {
     protected static string $resource = HomeRoomTeacherResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Guru Wali Kelas';
-    }
-
-
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $exists = HomeRoomTeacher::where('class_room_id', $data['class_room_id'])

app/Filament/Resources/HomeRoomTeacherResource/Pages/ListHomeRoomTeachers.php

@@ -10,11 +10,6 @@ class ListHomeRoomTeachers extends ListRecords
 {
     protected static string $resource = HomeRoomTeacherResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Guru Wali Kelas';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/LearningObjectiveResource.php

@@ -1,148 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Filament\Resources\LearningObjectiveResource\Pages;
-use App\Filament\Resources\LearningObjectiveResource\RelationManagers;
-use App\Models\ClassRoom; // Import ClassRoom model
-use App\Models\LearningObjective;
-use App\Models\Subject;    // Import Subject model
-use Filament\Forms;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-
-class LearningObjectiveResource extends Resource
-{
-    protected static ?string $model = LearningObjective::class;
-
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static ?string $navigationGroup = 'Academic Setup';
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Select::make('class_room_id')
-                    ->label('Class Room')
-                    ->required()
-                    ->options(ClassRoom::pluck('class_name', 'id')->toArray())
-                    ->searchable()
-                    ->native(false),
-
-                Select::make('subject_id')
-                    ->label('Mata Pelajaran')
-                    ->relationship('subject', 'name')
-                    ->required(),
-
-                // Textarea for description
-                Forms\Components\Textarea::make('description')
-                    ->rows(5)
-                    ->cols(10)
-                    ->required()
-                    ->maxLength(65535), // Max length for TEXT type in database
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                // Display related Class Room name
-                Tables\Columns\TextColumn::make('class.class_name')
-                    ->label('Kelas')
-                    ->searchable()
-                    ->sortable(),
-
-                // Display related Subject name
-                Tables\Columns\TextColumn::make('subject.name')
-                    ->label('Mapel')
-                    ->searchable()
-                    ->sortable(),
-
-                // Display description, truncate for brevity in table
-                Tables\Columns\TextColumn::make('description')
-                    ->label('Deskripsi')
-                    ->searchable()
-                    ->limit(50) // Limit text length in table
-                    ->tooltip(fn (LearningObjective $record): string => $record->description) // Show full text on hover
-                    ->sortable(),
-
-                // Standard timestamp columns
-                Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('deleted_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true), // Show deleted_at if soft deletes are used
-            ])
-            ->filters([
-                // TrashedFilter works with SoftDeletes trait on the model
-                Tables\Filters\TrashedFilter::make(),
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(), // For soft deleting records
-                Tables\Actions\RestoreAction::make(), // For restoring soft-deleted records
-                Tables\Actions\ForceDeleteAction::make(), // For permanently deleting records
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                    Tables\Actions\ForceDeleteBulkAction::make(),
-                    Tables\Actions\RestoreBulkAction::make(),
-                ]),
-            ]);
-    }
-
-    public static function getRelations(): array
-    {
-        return [
-            // Define any relation managers here if needed
-        ];
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListLearningObjectives::route('/'),
-            'create' => Pages\CreateLearningObjective::route('/create'),
-            'edit' => Pages\EditLearningObjective::route('/{record}/edit'),
-        ];
-    }
-
-    public static function getEloquentQuery(): Builder
-    {
-
-        return parent::getEloquentQuery()
-         ->withoutGlobalScopes([
-             SoftDeletingScope::class,
-         ]);
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Tujuan Pembelajaran';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Tujuan Pembelajaran';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Tujuan Pembelajaran';
-    }
-}

app/Filament/Resources/LearningObjectiveResource/Pages/CreateLearningObjective.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\LearningObjectiveResource\Pages;
-
-use App\Filament\Resources\LearningObjectiveResource;
-use Filament\Actions;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateLearningObjective extends CreateRecord
-{
-    protected static string $resource = LearningObjectiveResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Tujuan Pembelajaran Baru';
-    }
-}

app/Filament/Resources/LearningObjectiveResource/Pages/EditLearningObjective.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\LearningObjectiveResource\Pages;
-
-use App\Filament\Resources\LearningObjectiveResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditLearningObjective extends EditRecord
-{
-    protected static string $resource = LearningObjectiveResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Edit Tujuan Pembelajaran';
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make(),
-            Actions\ForceDeleteAction::make(),
-            Actions\RestoreAction::make(),
-        ];
-    }
-}

app/Filament/Resources/LearningObjectiveResource/Pages/ListLearningObjectives.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\LearningObjectiveResource\Pages;
-
-use App\Filament\Resources\LearningObjectiveResource;
-use App\Models\Attendances;
-use App\Models\HomeRoomTeacher;
-use App\Models\LearningObjective;
-use App\Models\TeacherSubject;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-use Illuminate\Database\Eloquent\Builder;
-
-class ListLearningObjectives extends ListRecords
-{
-    protected static string $resource = LearningObjectiveResource::class;
-
-    protected function getTableQuery(): ?Builder
-    {
-        $user = auth()->user();
-
-        if ($user->hasRole('teacher')) {
-
-            $homeRoomClassIds = HomeRoomTeacher::where('teacher_id', $user->id)
-                ->pluck('class_room_id')
-                ->toArray();
-
-            return LearningObjective::with(["subject", "class"])
-                ->whereIn('class_room_id', $homeRoomClassIds);
-        }
-
-        return LearningObjective::query();
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make()->label('Tambah Tujuan Pembelajaran Baru'),
-        ];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Daftar Tujuan Pembelajaran';
-    }
-}

app/Filament/Resources/StudentResource.php

@@ -36,12 +36,12 @@ class StudentResource extends Resource
                             ->maxLength(20),
 
                         Forms\Components\TextInput::make('full_name')
-                            ->label('Nama Lengkap')
+                            ->label('Full Name')
                             ->required()
                             ->maxLength(100),
 
                         Forms\Components\Select::make('gender')
-                            ->label('Jenis Kelamin')
+                            ->label('Gender')
                             ->options([
                                 'L' => 'L',
                                 'P' => 'P',
@@ -49,36 +49,36 @@ class StudentResource extends Resource
                             ->required(),
 
                         Forms\Components\DatePicker::make('birth_date')
-                            ->label('Tanggal Lahir')
+                            ->label('Birth Date')
                             ->required(),
 
                         Forms\Components\TextInput::make('birth_place')
-                            ->label('Tempat Lahir')
+                            ->label('Birth Place')
                             ->required()
                             ->maxLength(100),
 
                         Forms\Components\TextInput::make('phone')
-                            ->label('Nomor Telepon')
+                            ->label('Phone')
                             ->maxLength(15),
 
                         Forms\Components\TextInput::make('email')
-                            ->label("Email Orang Tua")
+                            ->label("Parent's Email")
                             ->email()
                             ->required()
                             ->maxLength(100),
 
                         Forms\Components\TextInput::make('parent_name')
-                            ->label("Nama Orang Tua")
+                            ->label("Parent's Name")
                             ->required()
                             ->maxLength(100),
 
                         Forms\Components\TextInput::make('parent_phone')
-                            ->label("Nomor Telepon Orang Tua")
+                            ->label("Parent's Phone")
                             ->required()
                             ->maxLength(15),
 
                         Forms\Components\Select::make('religion')
-                        ->label('Agama')
+                        ->label('Religion')
                         ->options([
                             'islam' => 'Islam',
                             'hindu' => 'Hindu',
@@ -88,7 +88,7 @@ class StudentResource extends Resource
                         ]),
 
                         Forms\Components\Textarea::make('address')
-                            ->label('Alamat')
+                            ->label('Address')
                             ->rows(1),
 
                     ])
@@ -104,21 +104,21 @@ class StudentResource extends Resource
                     ->label('NIS')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('full_name')
-                    ->label('Nama')
+                    ->label('Name')
                     ->searchable()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('gender')
-                    ->label('Jenis Kelamin')
+                    ->label('Gender')
                     ->sortable(),
                 Tables\Columns\TextColumn::make('birth_place')
-                    ->label('Tempat Lahir'),
+                    ->label('Birth Place'),
                 Tables\Columns\TextColumn::make('birth_date')
-                    ->label('Tanggal Lahir')
+                    ->label('Birth Date')
                     ->date(),
                 Tables\Columns\TextColumn::make('parent_name')
-                    ->label("Nama Orang Tua"),
+                    ->label("Parent's Name"),
                 Tables\Columns\TextColumn::make('religion')
-                    ->label("Agama")
+                    ->label("Religion")
                     ->formatStateUsing(fn (string $state): string => strtoupper($state))
                     ->badge(),
                 Tables\Columns\TextColumn::make('created_at')
@@ -158,19 +158,4 @@ class StudentResource extends Resource
             'edit' => Pages\EditStudent::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Siswa';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Siswa';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Siswa';
-    }
 }

app/Filament/Resources/StudentResource/Pages/CreateStudent.php

@@ -15,11 +15,6 @@ class CreateStudent extends CreateRecord
 {
     protected static string $resource = StudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Siswa';
-    }
-
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $parentRole = Role::where('name', 'parent')->first();

app/Filament/Resources/StudentResource/Pages/EditStudent.php

@@ -4,7 +4,6 @@ namespace App\Filament\Resources\StudentResource\Pages;
 
 use App\Filament\Resources\StudentResource;
 use App\Models\User;
-use Carbon\Carbon;
 use Filament\Actions;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
@@ -14,31 +13,16 @@ class EditStudent extends EditRecord
 {
     protected static string $resource = StudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Siswa';
-    }
     protected function mutateFormDataBeforeSave(array $data): array
     {
         $parentRole = Role::where('name', 'parent')->first();
 
-        $birthDate = Carbon::parse($data['birth_date']);
-        $password = $birthDate->format('dmY') . $data['nis'];
-
-        $user = User::where('email', $data['email'])->first();
-
-        $dataSubmit = [
-            'name' => $data['parent_name'],
-            'phone' => $data['parent_phone'],
-        ];
-
-        if (!$user) {
-            $dataSubmit['password'] = bcrypt($password);
-        }
-
         $parentUser = User::updateOrCreate(
             ['email' => $data['email']],
-            $dataSubmit,
+            [
+                'name' => $data['parent_name'],
+                'phone' => $data['parent_phone'],
+            ]
         );
 
         // Pastikan user memiliki role parent

app/Filament/Resources/StudentResource/Pages/ListStudents.php

@@ -11,10 +11,6 @@ class ListStudents extends ListRecords
 {
     protected static string $resource = StudentResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Siswa';
-    }
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/SubjectResource.php

@@ -26,16 +26,13 @@ class SubjectResource extends Resource
         return $form
             ->schema([
                 Forms\Components\TextInput::make('name')
-                    ->label('Nama Mapel')
                     ->required()
                     ->maxLength(255),
 
                 Forms\Components\Toggle::make('is_religious')
-                    ->label('Religious')
                     ->required(),
 
                 Forms\Components\Select::make('category')
-                    ->label('Kategori')
                     ->options([
                         'umum' => 'Umum',
                         'muatan lokal' => 'Muatan Lokal',
@@ -51,13 +48,13 @@ class SubjectResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('name')
-                    ->label("Nama")
+                    ->label("Name")
                     ->searchable(),
                 Tables\Columns\IconColumn::make('is_religious')
                     ->label("Is Religious")
                     ->boolean(),
                 Tables\Columns\TextColumn::make('category')
-                    ->label("Kategori")
+                    ->label("Category")
                     ->sortable(),
                 Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
@@ -99,19 +96,4 @@ class SubjectResource extends Resource
             'edit' => Pages\EditSubject::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Mata Pelajaran';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Mata Pelajaran';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Mata Pelajaran';
-    }
 }

app/Filament/Resources/SubjectResource/Pages/CreateSubject.php

@@ -9,10 +9,4 @@ use Filament\Resources\Pages\CreateRecord;
 class CreateSubject extends CreateRecord
 {
     protected static string $resource = SubjectResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Mata Pelajaran';
-    }
-
 }

app/Filament/Resources/SubjectResource/Pages/EditSubject.php

@@ -10,11 +10,6 @@ class EditSubject extends EditRecord
 {
     protected static string $resource = SubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Mata Pelajaran';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/SubjectResource/Pages/ListSubjects.php

@@ -10,15 +10,10 @@ class ListSubjects extends ListRecords
 {
     protected static string $resource = SubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Mata Pelajaran';
-    }
-
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()->label('Tambah Mata Pelajaran'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/TeacherSubjectResource.php

@@ -143,19 +143,4 @@ class TeacherSubjectResource extends Resource
             'edit' => Pages\EditTeacherSubject::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Guru per-Mapel';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Guru per-Mapel';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Guru per-Mapel';
-    }
 }

app/Filament/Resources/TeacherSubjectResource/Pages/CreateTeacherSubject.php

@@ -12,10 +12,6 @@ class CreateTeacherSubject extends CreateRecord
 {
     protected static string $resource = TeacherSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Tambah Guru per-Mapel';
-    }
     protected function mutateFormDataBeforeCreate(array $data): array
     {
         $exists = TeacherSubject::where('teacher_id', $data['teacher_id'])

app/Filament/Resources/TeacherSubjectResource/Pages/EditTeacherSubject.php

@@ -10,11 +10,6 @@ class EditTeacherSubject extends EditRecord
 {
     protected static string $resource = TeacherSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Edit Guru per-Mapel';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/TeacherSubjectResource/Pages/ListTeacherSubjects.php

@@ -10,11 +10,6 @@ class ListTeacherSubjects extends ListRecords
 {
     protected static string $resource = TeacherSubjectResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Guru per-Mapel';
-    }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/UserResource.php

@@ -27,12 +27,10 @@ class UserResource extends Resource
         return $form
             ->schema([
                 Forms\Components\TextInput::make('name')
-                    ->label('Nama Pengguna')
                     ->required()
                     ->maxLength(255),
 
                 Forms\Components\TextInput::make('email')
-                    ->label('Email')
                     ->email()
                     ->required()
                     ->maxLength(255),
@@ -45,7 +43,6 @@ class UserResource extends Resource
                     ->maxLength(255),
 
                 Forms\Components\Select::make('role')
-                    ->label('Role')
                     ->relationship('roles', 'name')
                     ->preload()
                     ->searchable()
@@ -56,22 +53,18 @@ class UserResource extends Resource
                     ->maxLength(255),
 
                 Forms\Components\Select::make('gender')
-                    ->label('Jenis Kelamin')
                     ->options([
                         'L' => 'L',
                         'P' => 'P',
                     ]),
 
-                Forms\Components\DatePicker::make('birth_date')
+                Forms\Components\DatePicker::make('birth_date'),
-                    ->label('Tanggal Lahir'),
 
                 Forms\Components\TextInput::make('phone')
-                    ->label('Nomor Telepon')
                     ->tel()
                     ->maxLength(255),
 
                 Forms\Components\Textarea::make('address')
-                    ->label('Alamat')
                     ->columnSpanFull(),
             ]);
     }
@@ -81,22 +74,17 @@ class UserResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('name')
-                    ->label('Nama')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('email')
-                    ->label('Email')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('nip')
                     ->label('NIP')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('gender')
-                    ->label('Jenis Kelamin')
                     ->formatStateUsing(fn (string $state): string => ucfirst($state)),
                 Tables\Columns\TextColumn::make('birth_date')
-                    ->label('Tanggal Lahir')
                     ->date(),
                 Tables\Columns\TextColumn::make('phone')
-                    ->label('Nomor Telepon')
                     ->searchable(),
                 Tables\Columns\TextColumn::make('roles.name')
                     ->searchable()
@@ -141,19 +129,4 @@ class UserResource extends Resource
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
     }
-
-    public static function getNavigationLabel(): string
-    {
-        return 'Pengguna';
-    }
-
-    public static function getBreadcrumb(): string
-    {
-        return 'Pengguna';
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return 'Pengguna';
-    }
 }

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -9,9 +9,4 @@ use Filament\Resources\Pages\CreateRecord;
 class CreateUser extends CreateRecord
 {
     protected static string $resource = UserResource::class;
-
-    public function getTitle(): string
-    {
-        return 'Tambah Penilaian';
-    }
 }

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -16,9 +16,4 @@ class EditUser extends EditRecord
             Actions\DeleteAction::make(),
         ];
     }
-
-    public function getTitle(): string
-    {
-        return 'Edit Pengguna';
-    }
 }

app/Filament/Resources/UserResource/Pages/ListUsers.php

@@ -10,15 +10,10 @@ class ListUsers extends ListRecords
 {
     protected static string $resource = UserResource::class;
 
-    public function getTitle(): string
-    {
-        return 'Daftar Pengguna';
-    }
-
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()->label('Tambah Pengguna'),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Http/Controllers/ReportPDFController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Models\AcademicYear;
 use App\Models\Assessment;
-use App\Models\AssessmentLearningObjective;
 use App\Models\ClassRoom;
 use App\Models\CompetencyAchievement;
 use App\Models\ExtracurricularAssessment;
@@ -106,32 +105,17 @@ class ReportPDFController extends Controller
                     return null;
                 }
 
-                $assesmentLearningObjectivesLower = AssessmentLearningObjective::with('learningObjective')
+                $competencyAchievements = CompetencyAchievement::where('class_room_id', $class_id)
-                    ->where('teacher_subject_id', $as->teacherSubject->id)
+                    ->where('subject_id', $subject->id)
-                    ->where('student_id', $this->student->id)
+                    ->where('min_score', '<=', $as->score)
-                    ->where('type', 'lower')
+                    ->where('max_score', '>=', $as->score)
-                    ->get()
+                    ->first();
-                    ->pluck('learningObjective.description')
-                    ->toArray();
-
-                $joinedStringLower = $as->student->full_name . ' perlu peningkatan dalam ' . implode(', ', $assesmentLearningObjectivesLower);
-
-                $assesmentLearningObjectivesHighest = AssessmentLearningObjective::with('learningObjective')
-                    ->where('teacher_subject_id', $as->teacherSubject->id)
-                    ->where('student_id', $this->student->id)
-                    ->where('type', 'highest')
-                    ->get()
-                    ->pluck('learningObjective.description')
-                    ->toArray();
-
-                $joinedStringHighest = $as->student->full_name . ' menunjukan pemahaman dalam ' . implode(', ', $assesmentLearningObjectivesHighest);
 
                 return [
                     "score" => $as->score,
                     "subject" => $subject->name,
                     "category" => $subject->category,
-                    "lower" => $assesmentLearningObjectivesLower ? $joinedStringLower : null,
+                    "competency_achievement" => $competencyAchievements ? $this->student->full_name . ' ' . $competencyAchievements->description : '-',
-                    "highest" => $assesmentLearningObjectivesHighest ? $joinedStringHighest : null,
                 ];
             })
             ->filter() // Hapus null jika ada
@@ -176,12 +160,11 @@ class ReportPDFController extends Controller
         $homeRoom = HomeRoomTeacher::with(['teacher'])
             ->where('class_room_id', $this->class->id)
             ->where('academic_year_id', $this->academic_year->id)
-            ->first();
+            ->firstOrFail()
+            ->toArray();
 
-        if ($homeRoom) {
         $this->home_room_teacher = $homeRoom ?? [];
     }
-    }
 
     protected function validateParameters(array $params, array $allowedParams): void
     {

app/Models/AssessmentLearningObjective.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class AssessmentLearningObjective extends Model
-{
-    protected $fillable = [
-        'teacher_subject_id',
-        'student_id',
-        'learning_objective_id',
-        'type',
-    ];
-
-    public function teacherSubject(): BelongsTo
-    {
-        return $this->belongsTo(TeacherSubject::class);
-    }
-
-    public function student(): BelongsTo
-    {
-        return $this->belongsTo(Student::class);
-    }
-
-    public function learningObjective(): BelongsTo
-    {
-        return $this->belongsTo(LearningObjective::class);
-    }
-}

app/Models/ClassRoom.php

@@ -25,11 +25,6 @@ class ClassRoom extends Model
         return $this->hasMany(Student::class);
     }
 
-    public function learningObjectives()
-    {
-        return $this->hasMany(LearningObjective::class);
-    }
-
     public function teacherAssignments(): HasMany
     {
         return $this->hasMany(TeacherSubject::class);

app/Models/LearningObjective.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class LearningObjective extends Model
-{
-    use SoftDeletes;
-
-    protected $fillable = ['class_room_id', 'subject_id', 'description'];
-
-    public function subject(): BelongsTo
-    {
-        return $this->belongsTo(Subject::class, 'subject_id');
-    }
-
-    public function class(): BelongsTo
-    {
-        return $this->belongsTo(ClassRoom::class, 'class_room_id');
-    }
-
-    public function assessmentLearningObjective()
-    {
-        return $this->hasMany(AssessmentLearningObjective::class);
-    }
-
-}

app/Models/Student.php

@@ -30,9 +30,4 @@ class Student extends Model
     {
         return $this->hasMany(ClassStudent::class);
     }
-
-    public function assessmentLearningObjective()
-    {
-        return $this->hasMany(AssessmentLearningObjective::class);
-    }
 }

app/Models/Subject.php

@@ -14,11 +14,6 @@ class Subject extends Model
         return $this->hasMany(SubjectScope::class);
     }
 
-    public function learningObjectives()
-    {
-        return $this->hasMany(LearningObjective::class);
-    }
-
     public function teacherAssignments(): HasMany
     {
         return $this->hasMany(TeacherSubject::class);

app/Models/TeacherSubject.php

@@ -30,11 +30,6 @@ class TeacherSubject extends Model
         return $this->hasMany(Attendances::class);
     }
 
-    public function assessmentLearningObjective()
-    {
-        return $this->hasMany(AssessmentLearningObjective::class);
-    }
-
     public function academicYear() : BelongsTo
     {
         return $this->belongsTo(AcademicYear::class, 'academic_year_id');

app/Models/User.php

@@ -3,15 +3,13 @@
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Filament\Models\Contracts\FilamentUser;
-use Filament\Panel;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Authenticatable implements FilamentUser
+class User extends Authenticatable
 {
     /** @use HasFactory<\Database\Factories\UserFactory> */
     use HasFactory, Notifiable, HasRoles;
@@ -64,9 +62,4 @@ class User extends Authenticatable implements FilamentUser
     {
         return $this->hasMany(HomeRoomTeacher::class, 'teacher_id');
     }
-
-    public function canAccessPanel(Panel $panel): bool
-    {
-        return true;
-    }
 }

app/Policies/LearningObjectivePolicy.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Models\LearningObjective;
-use App\Models\User;
-use Illuminate\Auth\Access\Response;
-
-class LearningObjectivePolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        return $user->can('view_any_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, LearningObjective $learningObjective): bool
-    {
-        return $user->can('view_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        return $user->can('create_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, LearningObjective $learningObjective): bool
-    {
-        return $user->can('update_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, LearningObjective $learningObjective): bool
-    {
-        return $user->can('delete_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, LearningObjective $learningObjective): bool
-    {
-        return $user->can('restore_learning::objective');
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, LearningObjective $learningObjective): bool
-    {
-        return $user->can('force_delete_learning::objective');
-    }
-}

database/migrations/2025_05_30_063144_create_learning_objectives_table.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('learning_objectives', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('class_room_id')->constrained('class_rooms')->cascadeOnDelete();
-            $table->foreignId('subject_id')->constrained('subjects')->cascadeOnDelete();
-            $table->text('description');
-            $table->timestamps();
-
-            $table->softDeletes();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('learning_objectives');
-    }
-};

database/migrations/2025_05_30_171406_create_assessment_learning_objectives_table.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('assessment_learning_objectives', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('teacher_subject_id')->constrained('teacher_subjects')->onDelete('cascade');
-            $table->foreignId('student_id')->constrained('students')->onDelete('cascade');
-            $table->foreignId('learning_objective_id')->constrained('learning_objectives')->onDelete('cascade');
-            $table->enum('type', ['highest', 'lower']);
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('assessment_learning_objectives');
-    }
-};

database/seeders/DatabaseSeeder.php

@@ -16,11 +16,11 @@ class DatabaseSeeder extends Seeder
             SubjectSeeder::class,
             ClassRoomSeeder::class,
             AcademicYearSeeder::class,
-//            StudentSeeder::class,
+            StudentSeeder::class,
             ExtracurricularSeeder::class,
-//            ClassSubjectSeeder::class,
+            ClassSubjectSeeder::class,
-//            ClassStudentSeeder::class,
+            ClassStudentSeeder::class,
-//            HomeRoomTeacherSeeder::class,
+            HomeRoomTeacherSeeder::class,
             SchoolInformationSeeder::class,
         ]);
     }

resources/views/filament/pages/report-preview.blade.php

@@ -28,10 +28,9 @@
                 </table>
             </div>
 
-            <h1 class="font-bold">A. NILAI DAN CAPAIAN PEMBELAJARAN</h1>
+            <div class="text-sm">
-
-            <div class="text-sm mt-3">
                 <table class="w-full border border-black text-sm">
+
                     <thead>
                         <tr class="">
                             <th class="border border-black w-8">No</th>
@@ -48,21 +47,10 @@
                         @if(!empty($this->table['assessments']['umum']))
                             @foreach($this->table['assessments']['umum'] as $subjects => $subject)
                                 <tr>
-                                    <td class="border border-black text-center" rowspan="2">{{ $i }}</td>
+                                    <td class="border border-black text-center">{{ $i }}</td>
-                                    <td class="border border-black" rowspan="2">{{ $subject["subject"]  }}</td>
+                                    <td class="border border-black">{{ $subject["subject"]  }}</td>
-                                    <td class="border border-black text-center" rowspan="2">{{ $subject["score"]  }}</td>
+                                    <td class="border border-black text-center">{{ $subject["score"]  }}</td>
-                                    <td class="border border-black p-2">
+                                    <td class="border border-black">{{ $subject["competency_achievement"] }}</td>
-                                       @if(!empty($subject["highest"]))
-                                            {{ $subject["highest"] }}
-                                       @endif
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="border border-black p-2">
-                                        @if(!empty($subject["lower"]))
-                                            {{ $subject["lower"] }}
-                                        @endif
-                                    </td>
                                 </tr>
                                 @php
                                     $i++;
@@ -76,21 +64,10 @@
                             </tr>
                             @foreach($this->table['assessments']['seni'] as $subjects => $subject)
                                 <tr>
-                                    <td class="border border-black text-center" rowspan="2">a</td>
+                                    <td class="border border-black text-center">a</td>
-                                    <td class="border border-black" rowspan="2">{{ $subject["subject"]  }}</td>
+                                    <td class="border border-black">{{ $subject["subject"]  }}</td>
-                                    <td class="border border-black text-center" rowspan="2">{{ $subject["score"]  }}</td>
+                                    <td class="border border-black text-center">{{ $subject["score"]  }}</td>
-                                    <td class="border border-black p-2">
+                                    <td class="border border-black">{{ $subject["competency_achievement"] }}</td>
-                                        @if(!empty($subject["highest"]))
-                                            {{ $subject["highest"] }}
-                                        @endif
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="border border-black p-2">
-                                        @if(!empty($subject["lower"]))
-                                            {{ $subject["lower"] }}
-                                        @endif
-                                    </td>
                                 </tr>
                                 @php
                                     $i++;
@@ -100,9 +77,9 @@
                     </tbody>
                 </table>
 
-                <h1 class="font-bold mt-6">B. MUATAN LOKAL</h1>
+                <h4 class="font-semibold mt-6 mb-2">Muatan Lokal</h4>
+                <table class="w-full border border-black text-sm">
 
-                <table class="w-full border border-black text-sm mt-3">
                     <thead>
                         <tr class="">
                             <th class="border border-black w-8">No</th>
@@ -116,21 +93,10 @@
                     @if(!empty($this->table['assessments']['muatan lokal']))
                         @foreach($this->table['assessments']['muatan lokal'] as $subjects => $subject)
                             <tr>
-                                <td class="border border-black text-center" rowspan="2">{{ $i }}</td>
+                                <td class="border border-black text-center">{{ $i }}</td>
-                                <td class="border border-black" rowspan="2">{{ $subject["subject"]  }}</td>
+                                <td class="border border-black">{{ $subject["subject"]  }}</td>
-                                <td class="border border-black text-center" rowspan="2">{{ $subject["score"]  }}</td>
+                                <td class="border border-black text-center">{{ $subject["score"]  }}</td>
-                                <td class="border border-black p-2">
+                                <td class="border border-black">{{ $subject["competency_achievement"] }}</td>
-                                    @if(!empty($subject["highest"]))
-                                        {{ $subject["highest"] }}
-                                    @endif
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="border border-black p-2">
-                                    @if(!empty($subject["lower"]))
-                                        {{ $subject["lower"] }}
-                                    @endif
-                                </td>
                             </tr>
                             @php
                                 $i++;
@@ -140,9 +106,7 @@
                     </tbody>
                 </table>
 
-                <h1 class="font-bold mt-6">C. EKSTRAKURIKULER</h1>
+                <table style="table-layout: fixed" class="w-full border border-black text-sm mb-6 mt-6">
-
-                <table style="table-layout: fixed" class="w-full border border-black text-sm mb-6 mt-3">
                     <thead>
                         <tr class="">
                             <th class="border border-black w-8">No</th>
@@ -180,9 +144,8 @@
                     </tbody>
                 </table>
 
-                <h1 class="font-bold mt-6">D. KETIDAKHADIRAN</h1>
+                {{-- Table Ketidakhadiran --}}
-
+                <table class="border text-sm mt-6">
-                <table class="border text-sm mt-3 w-72">
                     <tr>
                         <td class="border text-center" colspan="2">Ketidakhadiran</td>
                     </tr>

resources/views/filament/pages/school-information.blade.php

@@ -7,7 +7,7 @@
                 type="submit"
                 class="inline-flex items-center px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500"
             >
-                Simpan
+                Save
             </button>
         </div>
     </form>

resources/views/filament/resources/assessment-resource/pages/multiple-assessment.blade.php

@@ -4,131 +4,32 @@
 
         @if($this->teacherSubjectId)
             <div class="mt-6 space-y-4">
+                <h3 class="text-lg font-medium">Multiple Assessment</h3>
 
                 <div class="space-y-2">
                     @foreach($this->students as $index => $student)
-                        {{-- Each student card is now an accordion item --}}
+                        <div class="flex items-center p-3 border rounded-lg">
-                        <div x-data="{ open: false }" class="border rounded-lg overflow-hidden shadow-sm">
+                            <div class="flex-1">
-                            {{-- Accordion Header: Displays essential student info and acts as toggle --}}
+                                <p class="font-medium">{{ $student['name'] ?? "" }}</p>
-                            <div @click="open = !open" class="flex items-center p-3 cursor-pointer bg-gray-50 hover:bg-gray-100 transition duration-150 ease-in-out">
+                                <p class="text-sm text-gray-500">{{ $student['nis'] ?? "" }}</p>
-                                <div class="w-full flex">
-                                    <div class="flex-1 grid grid-cols-1 xl:grid-cols-4 gap-4">
-                                        <div class="flex flex-col">
-                                            <p class="text-xs text-gray-500">NISN</p>
-                                            <p class="font-medium text-sm">{{ $student['nisn'] ?? "" }}</p>
                             </div>
-                                        <div class="flex flex-col">
+                            <div class="w-32">
-                                            <p class="text-xs text-gray-500">NIS</p>
-                                            <p class="font-medium text-sm">{{ $student['nis'] ?? "" }}</p>
-                                        </div>
-                                        <div class="flex flex-col col-span-1">
-                                            <p class="text-xs text-gray-500">Nama</p>
-                                            <p class="font-medium text-sm">{{ $student['name'] ?? "" }}</p>
-                                        </div>
-                                        <div class="flex flex-col">
-                                            <p class="text-xs text-gray-500">Jenis Kelamin</p>
-                                            <p class="font-medium text-sm">{{ $student['gender'] === "L" ? "Laki-laki" : "Perempuan" ?? "" }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="w-32"> {{-- Make input full width on small screens, then fixed width --}}
                                 <x-filament::input
                                     type="number"
                                     :value="$student['score'] ?? null"
                                     wire:model.defer="students.{{ $index }}.score"
-                                            placeholder="Nilai"
+                                    placeholder="Score"
                                     min="0"
                                     max="100"
-                                            class="text-base" {{-- Adjust input text size --}}
                                 />
                             </div>
                         </div>
-                                {{-- Chevron icon to indicate expand/collapse state --}}
-                                <x-heroicon-s-chevron-down class="w-5 h-5 text-gray-500 transform transition-transform duration-200" x-bind:class="{ 'rotate-180': open }" />
-                            </div>
-
-                            {{-- Accordion Body: Contains the score input field --}}
-                            <div x-show="open" x-collapse.duration.300ms class="p-3 bg-white border-t border-gray-200">
-                                <div class="w-full flex flex-col gap-2">
-                                    <span class="text-lg font-bold">Input Penilaian Sumatif</span>
-                                    <div class="w-full flex flex-col gap-2">
-                                        <div class="w-full flex justify-between items-center">
-                                            <span class="text-sm">Tujuan Pembelajaran Tertinggi</span>
-                                            <x-filament::button type="button" color="primary" wire:click="addLearningObjective({{ $index }})">
-                                                Add
-                                            </x-filament::button>
-                                        </div>
-                                        @foreach($student['learning_objectives'] as $objectiveIndex => $objectiveId)
-                                            <div class="w-full flex gap-8 mt-3 items-center">
-                                                <x-filament::input.wrapper class="w-full">
-                                                    <x-filament::input.select wire:model="students.{{ $index }}.learning_objectives.{{ $objectiveIndex }}">
-                                                        <option value="">Pilih Tujuan Pembelajaran</option>
-                                                        @foreach($this->learningObjectivesList as $idLearningObjective => $description)
-                                                            {{-- Check if this option is already selected by ANY of the student's learning objective inputs --}}
-                                                            @php
-                                                                $isAlreadySelected = in_array($idLearningObjective, $student['learning_objectives']);
-                                                                $isCurrentOption = ($objectiveId == $idLearningObjective);
-                                                            @endphp
-
-                                                            <option
-                                                                value="{{ $idLearningObjective }}"
-                                                                @if($isCurrentOption) selected @endif
-                                                                @if($isAlreadySelected && !$isCurrentOption) disabled @endif
-                                                            >
-                                                                {{ $description }}
-                                                            </option>
-                                                        @endforeach
-                                                    </x-filament::input.select>
-                                                </x-filament::input.wrapper>
-                                                <x-filament::button type="button" color="danger" wire:click="removeLearningObjective({{ $index }}, {{ $objectiveIndex }})">
-                                                    Delete
-                                                </x-filament::button>
-                                            </div>
-                                        @endforeach
-                                    </div>
-                                    <div class="w-full flex flex-col gap-2 mt-3">
-                                        <div class="w-full flex justify-between items-center">
-                                            <span class="text-sm">Tujuan Pembelajaran Terendah</span>
-                                            <x-filament::button type="button" color="primary" wire:click="addLearningObjective({{ $index }}, 'lower')">
-                                                Add
-                                            </x-filament::button>
-                                        </div>
-                                        @foreach($student['learning_objectives_lower'] as $objectiveIndex => $objectiveId)
-                                            <div class="w-full flex gap-8 mt-3 items-center">
-                                                <x-filament::input.wrapper class="w-full">
-                                                    <x-filament::input.select wire:model="students.{{ $index }}.learning_objectives_lower.{{ $objectiveIndex }}">
-                                                        <option value="">Pilih Tujuan Pembelajaran</option>
-                                                        @foreach($this->learningObjectivesList as $idLearningObjective => $description)
-                                                            {{-- Check if this option is already selected by ANY of the student's learning objective inputs --}}
-                                                            @php
-                                                                $isAlreadySelected = in_array($idLearningObjective, $student['learning_objectives_lower']);
-                                                                $isCurrentOption = ($objectiveId == $idLearningObjective);
-                                                            @endphp
-
-                                                            <option
-                                                                value="{{ $idLearningObjective }}"
-                                                                @if($isCurrentOption) selected @endif
-                                                                @if($isAlreadySelected && !$isCurrentOption) disabled @endif
-                                                            >
-                                                                {{ $description }}
-                                                            </option>
-                                                        @endforeach
-                                                    </x-filament::input.select>
-                                                </x-filament::input.wrapper>
-                                                <x-filament::button type="button" color="danger" wire:click="removeLearningObjective({{ $index }}, {{ $objectiveIndex }}, 'lower')">
-                                                    Delete
-                                                </x-filament::button>
-                                            </div>
-                                        @endforeach
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                     @endforeach
                 </div>
 
                 <div class="mt-4">
                     <x-filament::button type="submit" color="primary">
-                        Simpan
+                        Save Assessments
                     </x-filament::button>
                 </div>
             </div>

resources/views/filament/resources/attendances-resource/pages/multiple-attendances.blade.php

@@ -4,19 +4,20 @@
 
         @if($this->attendanceDate && $this->teacherSubjectId)
             <div class="mt-6 space-y-4">
-                <div class="flex items-center justify-end">
+                <div class="flex items-center justify-between">
+                    <h3 class="text-lg font-medium">Student Attendance</h3>
                     <div class="flex gap-2 space-x-2">
                         <x-filament::button type="button" wire:click="markAll('present')" color="success">
-                            Tandai Semua Hadir
+                            Mark All Present
                         </x-filament::button>
                         <x-filament::button type="button" wire:click="markAll('absent')" color="danger">
-                            Tandai Semua Tidak Hadir
+                            Mark All Absent
                         </x-filament::button>
                         <x-filament::button type="button" wire:click="markAll('sick')" color="warning">
-                            Tandai Semua Sakit
+                            Mark All Sick
                         </x-filament::button>
-                        <x-filament::button type="button" wire:click="markAll('permission')" color="info">
+                        <x-filament::button type="button" wire:click="markAll('permission')" color="warning">
-                            Tandai Semua Izin
+                            Mark All Permission
                         </x-filament::button>
                     </div>
                 </div>
@@ -35,7 +36,7 @@
                                     color="{{ $student['status'] === 'present' ? 'success' : 'gray' }}"
                                     size="sm"
                                 >
-                                    Hadir
+                                    Present
                                 </x-filament::button>
                                 <x-filament::button
                                     type="button"
@@ -43,7 +44,7 @@
                                     color="{{ $student['status'] === 'absent' ? 'danger' : 'gray' }}"
                                     size="sm"
                                 >
-                                    Tidak Hadir
+                                    Absent
                                 </x-filament::button>
                                 <x-filament::button
                                     type="button"
@@ -51,7 +52,7 @@
                                     color="{{ $student['status'] === 'sick' ? 'warning' : 'gray' }}"
                                     size="sm"
                                 >
-                                    Sakit
+                                    Sick
                                 </x-filament::button>
                                 <x-filament::button
                                     type="button"
@@ -59,7 +60,7 @@
                                     color="{{ $student['status'] === 'permission' ? 'warning' : 'gray' }}"
                                     size="sm"
                                 >
-                                    Izin
+                                    Permission
                                 </x-filament::button>
                             </div>
                         </div>
@@ -67,7 +68,7 @@
                 </div>
 
                 <x-filament::button type="submit" class="w-full">
-                    Simpan Absensi
+                    Save Attendance
                 </x-filament::button>
             </div>
         @endif

resources/views/print/report.blade.php

@@ -34,13 +34,10 @@
             border: 1px solid #000;
         }
 
-        td:not(.custom-cell), th {
+        td, th {
             padding: 6px;
-            vertical-align: top;
-        }
 
-        td.custom-cell {
+            vertical-align: top;
-            padding: 0;
         }
 
         .no-border {
@@ -79,14 +76,6 @@
             width: 200px;
             margin-top: 30px;
         }
-
-        .p-2 {
-            padding:.5rem
-        }
-
-        .capaian-kompetensi-cell div:not(:last-child) {
-            margin-bottom: 0.5em; /* Memberi sedikit jarak antar baris */
-        }
     </style>
 </head>
 <body>
@@ -126,8 +115,7 @@
     @php
         $i = 1;
     @endphp
-    <h3 style="font-weight: bold; margin-top: 1.5rem">A. NILAI DAN CAPAIAN PEMBELAJARAN</h3>
+    <table>
-    <table style="margin-top: 0.75rem">
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Muatan Pelajaran</th>
@@ -137,23 +125,10 @@
         @if(!empty($table['assessments']['umum']))
             @foreach($table['assessments']['umum'] as $subjects => $subject)
                     <tr>
-                        <td rowspan="2" class="text-center">{{ $i }}</td>
+                        <td>{{ $i }}</td>
-                        <td rowspan="2">{{ $subject["subject"]  }}</td>
+                        <td>{{ $subject["subject"]  }}</td>
-                        <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
+                        <td class="text-center">{{ $subject["score"]  }}</td>
-                        <td class="">
+                        <td>{{ $subject["competency_achievement"] }}</td>
-                            @if(!empty($subject["highest"]))
-                                <div class="p-2">
-                                    {{ $subject["highest"] }}
-                                </div>
-                            @endif
-                        </td>
-                    </tr>
-                    <tr>
-                        @if(!empty($subject["lower"]))
-                            <div class="p-2">
-                                {{ $subject["lower"] }}
-                            </div>
-                        @endif
                     </tr>
                 @php
                     $i++;
@@ -163,29 +138,16 @@
 
         @if(!empty($table['assessments']['seni']))
             <tr>
-                <td class="text-center">{{ $i }}</td>
+                <td>{{ $i }}</td>
                 <td colspan="3">Seni</td>
             </tr>
             @php $charIndex = 0; @endphp
             @foreach($table['assessments']['seni'] as $subjects => $subject)
                 <tr>
-                    <td rowspan="2" class="text-center">{{ chr(97 + $charIndex) }}</td>
+                    <td>{{ chr(97 + $charIndex) }}</td>
-                    <td rowspan="2">{{ $subject["subject"]  }}</td>
+                    <td>{{ $subject["subject"]  }}</td>
-                    <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
+                    <td class="text-center">{{ $subject["score"]  }}</td>
-                    <td class="">
+                    <td>{{ $subject["competency_achievement"] }}</td>
-                        @if(!empty($subject["highest"]))
-                            <div class="p-2">
-                                {{ $subject["highest"] }}
-                            </div>
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    @if(!empty($subject["lower"]))
-                        <div class="p-2">
-                            {{ $subject["lower"] }}
-                        </div>
-                    @endif
                 </tr>
                 @php
                     $i++;
@@ -195,8 +157,8 @@
 
     </table>
 
-    <h3 style="font-weight: bold; margin-top: 1.5rem">B. MUATAN LOKAL</h3>
+    <br><strong>Muatan Lokal</strong>
-    <table style="margin-top: 0.75rem">
+    <table>
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Muatan Pelajaran</th>
@@ -206,23 +168,10 @@
         @if(!empty($table['assessments']['muatan lokal']))
             @foreach($table['assessments']['muatan lokal'] as $subjects => $subject)
                 <tr>
-                    <td rowspan="2" class="text-center">{{ $i }}</td>
+                    <td>{{ $i }}</td>
-                    <td rowspan="2">{{ $subject["subject"]  }}</td>
+                    <td>{{ $subject["subject"]  }}</td>
-                    <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
+                    <td class="text-center">{{ $subject["score"]  }}</td>
-                    <td class="">
+                    <td>{{ $subject["competency_achievement"] }}</td>
-                        @if(!empty($subject["highest"]))
-                            <div class="p-2">
-                                {{ $subject["highest"] }}
-                            </div>
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    @if(!empty($subject["lower"]))
-                        <div class="p-2">
-                            {{ $subject["lower"] }}
-                        </div>
-                    @endif
                 </tr>
                 @php
                     $i++;
@@ -231,8 +180,7 @@
         @endif
     </table>
 
-    <h3 style="font-weight: bold; margin-top: 1.5rem">C. EKSTRAKURIKULER</h3>
+    <table>
-    <table style="margin-top: 0.75rem">
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Ekstrakurikuler</th>
@@ -265,17 +213,15 @@
         @endif
     </table>
 
-    <h3 style="font-weight: bold; margin-top: 1.5rem">D. KETIDAKHADIRAN</h3>
+    <table class="no-full">
-
-    <table class="no-full" style="margin-top: 0.75rem">
         <tr>
             <td colspan="2" style="text-align: center">
                 Ketidakhadiran
             </td>
         </tr>
-        <tr><td>Sakit</td><td> {{ $sakit ?? 0 }} hari</td></tr>
+        <tr><td>Sakit</td><td>: {{ $sakit ?? 0 }} hari</td></tr>
-        <tr><td>Izin</td><td> {{ $izin ?? 0 }} hari</td></tr>
+        <tr><td>Izin</td><td>: {{ $izin ?? 0 }} hari</td></tr>
-        <tr><td>Tanpa Keterangan</td><td> {{ $tanpa_keterangan ?? 0 }} hari</td></tr>
+        <tr><td>Tanpa Keterangan</td><td>: {{ $tanpa_keterangan ?? 0 }} hari</td></tr>
     </table>
 
     <br>

routes/web.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\ReportPDFController;
 
 Route::get('/', function () {
-    return redirect('/admin/login');
+    return view('welcome');
 });
 
 Route::get('/report-pdf', [ReportPDFController::class, 'reportPDF'])->name('report.pdf');