From 0aa7b4e39711b20e04347d8b721073c86d0900e3 Mon Sep 17 00:00:00 2001
From: reihanrere <reihanrere26@gmail.com>
Date: Wed, 4 Jun 2025 14:44:12 +0700
Subject: [PATCH] fixing report

---
 .../filament/pages/report-preview.blade.php   | 58 +++++++++--------
 resources/views/print/report.blade.php        | 62 +++++++++++--------
 routes/web.php                                |  2 +-
 3 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/resources/views/filament/pages/report-preview.blade.php b/resources/views/filament/pages/report-preview.blade.php
index 46d330b..d9b3a9d 100644
--- a/resources/views/filament/pages/report-preview.blade.php
+++ b/resources/views/filament/pages/report-preview.blade.php
@@ -28,9 +28,10 @@
                 </table>
             </div>
 
-            <div class="text-sm">
-                <table class="w-full border border-black text-sm">
+            <h1 class="font-bold">A. NILAI DAN CAPAIAN PEMBELAJARAN</h1>
 
+            <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>
@@ -75,19 +76,19 @@
                             </tr>
                             @foreach($this->table['assessments']['seni'] as $subjects => $subject)
                                 <tr>
-                                    <td class="border border-black text-center">a</td>
-                                    <td class="border border-black">{{ $subject["subject"]  }}</td>
-                                    <td class="border border-black text-center">{{ $subject["score"]  }}</td>
-                                    <td class="border border-black">
+                                    <td class="border border-black text-center" rowspan="2">a</td>
+                                    <td class="border border-black" rowspan="2">{{ $subject["subject"]  }}</td>
+                                    <td class="border border-black text-center" rowspan="2">{{ $subject["score"]  }}</td>
+                                    <td class="border border-black p-2">
                                         @if(!empty($subject["highest"]))
-                                            <div class="border border-black p-2">
-                                                {{ $subject["highest"] }}
-                                            </div>
+                                            {{ $subject["highest"] }}
                                         @endif
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="border border-black p-2">
                                         @if(!empty($subject["lower"]))
-                                            <div class="border border-black p-2">
-                                                {{ $subject["lower"] }}
-                                            </div>
+                                            {{ $subject["lower"] }}
                                         @endif
                                     </td>
                                 </tr>
@@ -99,9 +100,9 @@
                     </tbody>
                 </table>
 
-                <h4 class="font-semibold mt-6 mb-2">Muatan Lokal</h4>
-                <table class="w-full border border-black text-sm">
+                <h1 class="font-bold mt-6">B. MUATAN LOKAL</h1>
 
+                <table class="w-full border border-black text-sm mt-3">
                     <thead>
                         <tr class="">
                             <th class="border border-black w-8">No</th>
@@ -115,19 +116,19 @@
                     @if(!empty($this->table['assessments']['muatan lokal']))
                         @foreach($this->table['assessments']['muatan lokal'] as $subjects => $subject)
                             <tr>
-                                <td class="border border-black text-center">{{ $i }}</td>
-                                <td class="border border-black">{{ $subject["subject"]  }}</td>
-                                <td class="border border-black text-center">{{ $subject["score"]  }}</td>
-                                <td class="border border-black">
+                                <td class="border border-black text-center" rowspan="2">{{ $i }}</td>
+                                <td class="border border-black" rowspan="2">{{ $subject["subject"]  }}</td>
+                                <td class="border border-black text-center" rowspan="2">{{ $subject["score"]  }}</td>
+                                <td class="border border-black p-2">
                                     @if(!empty($subject["highest"]))
-                                        <div class="border border-black p-2">
-                                            {{ $subject["highest"] }}
-                                        </div>
+                                        {{ $subject["highest"] }}
                                     @endif
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="border border-black p-2">
                                     @if(!empty($subject["lower"]))
-                                        <div class="border border-black p-2">
-                                            {{ $subject["lower"] }}
-                                        </div>
+                                        {{ $subject["lower"] }}
                                     @endif
                                 </td>
                             </tr>
@@ -139,7 +140,9 @@
                     </tbody>
                 </table>
 
-                <table style="table-layout: fixed" class="w-full border border-black text-sm mb-6 mt-6">
+                <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-3">
                     <thead>
                         <tr class="">
                             <th class="border border-black w-8">No</th>
@@ -177,8 +180,9 @@
                     </tbody>
                 </table>
 
-                {{-- Table Ketidakhadiran --}}
-                <table class="border text-sm mt-6">
+                <h1 class="font-bold mt-6">D. KETIDAKHADIRAN</h1>
+
+                <table class="border text-sm mt-3 w-72">
                     <tr>
                         <td class="border text-center" colspan="2">Ketidakhadiran</td>
                     </tr>
diff --git a/resources/views/print/report.blade.php b/resources/views/print/report.blade.php
index bcb01c5..7848816 100644
--- a/resources/views/print/report.blade.php
+++ b/resources/views/print/report.blade.php
@@ -126,7 +126,8 @@
     @php
         $i = 1;
     @endphp
-    <table>
+    <h3 style="font-weight: bold; margin-top: 1.5rem">A. NILAI DAN CAPAIAN PEMBELAJARAN</h3>
+    <table style="margin-top: 0.75rem">
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Muatan Pelajaran</th>
@@ -136,7 +137,7 @@
         @if(!empty($table['assessments']['umum']))
             @foreach($table['assessments']['umum'] as $subjects => $subject)
                     <tr>
-                        <td rowspan="2">{{ $i }}</td>
+                        <td rowspan="2" class="text-center">{{ $i }}</td>
                         <td rowspan="2">{{ $subject["subject"]  }}</td>
                         <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
                         <td class="">
@@ -162,28 +163,30 @@
 
         @if(!empty($table['assessments']['seni']))
             <tr>
-                <td>{{ $i }}</td>
+                <td class="text-center">{{ $i }}</td>
                 <td colspan="3">Seni</td>
             </tr>
             @php $charIndex = 0; @endphp
             @foreach($table['assessments']['seni'] as $subjects => $subject)
                 <tr>
-                    <td>{{ chr(97 + $charIndex) }}</td>
-                    <td>{{ $subject["subject"]  }}</td>
-                    <td class="text-center">{{ $subject["score"]  }}</td>
-                    <td class="custom-cell">
+                    <td rowspan="2" class="text-center">{{ chr(97 + $charIndex) }}</td>
+                    <td rowspan="2">{{ $subject["subject"]  }}</td>
+                    <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
+                    <td class="">
                         @if(!empty($subject["highest"]))
                             <div class="p-2">
                                 {{ $subject["highest"] }}
                             </div>
                         @endif
-                        @if(!empty($subject["lower"]))
-                            <div class="p-2">
-                                {{ $subject["lower"] }}
-                            </div>
-                        @endif
                     </td>
                 </tr>
+                <tr>
+                    @if(!empty($subject["lower"]))
+                        <div class="p-2">
+                            {{ $subject["lower"] }}
+                        </div>
+                    @endif
+                </tr>
                 @php
                     $i++;
                 @endphp
@@ -192,8 +195,8 @@
 
     </table>
 
-    <br><strong>Muatan Lokal</strong>
-    <table>
+    <h3 style="font-weight: bold; margin-top: 1.5rem">B. MUATAN LOKAL</h3>
+    <table style="margin-top: 0.75rem">
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Muatan Pelajaran</th>
@@ -203,22 +206,24 @@
         @if(!empty($table['assessments']['muatan lokal']))
             @foreach($table['assessments']['muatan lokal'] as $subjects => $subject)
                 <tr>
-                    <td>{{ $i }}</td>
-                    <td>{{ $subject["subject"]  }}</td>
-                    <td class="text-center">{{ $subject["score"]  }}</td>
+                    <td rowspan="2" class="text-center">{{ $i }}</td>
+                    <td rowspan="2">{{ $subject["subject"]  }}</td>
+                    <td rowspan="2" class="text-center">{{ $subject["score"]  }}</td>
                     <td class="">
                         @if(!empty($subject["highest"]))
                             <div class="p-2">
                                 {{ $subject["highest"] }}
                             </div>
                         @endif
-                        @if(!empty($subject["lower"]))
-                            <div class="p-2">
-                                {{ $subject["lower"] }}
-                            </div>
-                        @endif
                     </td>
                 </tr>
+                <tr>
+                    @if(!empty($subject["lower"]))
+                        <div class="p-2">
+                            {{ $subject["lower"] }}
+                        </div>
+                    @endif
+                </tr>
                 @php
                     $i++;
                 @endphp
@@ -226,7 +231,8 @@
         @endif
     </table>
 
-    <table>
+    <h3 style="font-weight: bold; margin-top: 1.5rem">C. EKSTRAKURIKULER</h3>
+    <table style="margin-top: 0.75rem">
         <tr>
             <th style="width: 2rem">No</th>
             <th style="width: 185px">Ekstrakurikuler</th>
@@ -259,15 +265,17 @@
         @endif
     </table>
 
-    <table class="no-full">
+    <h3 style="font-weight: bold; margin-top: 1.5rem">D. KETIDAKHADIRAN</h3>
+
+    <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>Izin</td><td>: {{ $izin ?? 0 }} hari</td></tr>
-        <tr><td>Tanpa Keterangan</td><td>: {{ $tanpa_keterangan ?? 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>Tanpa Keterangan</td><td> {{ $tanpa_keterangan ?? 0 }} hari</td></tr>
     </table>
 
     <br>
diff --git a/routes/web.php b/routes/web.php
index 6c55e9b..d245698 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\ReportPDFController;
 
 Route::get('/', function () {
-    return view('welcome');
+    return redirect('/admin/login');
 });
 
 Route::get('/report-pdf', [ReportPDFController::class, 'reportPDF'])->name('report.pdf');