From 5b1d90b273fbbbb6cbb0c01da8b3864c5b39c75c Mon Sep 17 00:00:00 2001
From: Zhaqian Rouf Alfauzi <zhaqianroufa@gmail.com>
Date: Wed, 12 Feb 2025 16:42:17 +0700
Subject: [PATCH] [add] All 2603 to 2780

---
 app/Exceptions/Handler.php                    | 13 ++++
 app/Http/Controllers/HitungController.php     | 12 ++--
 .../views/pages/admin/add-santri.blade.php    | 60 +++++++++----------
 .../views/pages/admin/class-result.blade.php  |  4 +-
 .../views/pages/admin/data-santri.blade.php   |  6 +-
 .../views/pages/admin/train-data.blade.php    |  2 +-
 resources/views/pages/auth/login.blade.php    |  2 +-
 resources/views/pages/auth/register.blade.php | 31 ++++++++--
 .../views/pages/santri/counting.blade.php     | 57 ++++++++++++------
 .../views/pages/santri/dashboard.blade.php    | 60 +++++++++++++++++++
 .../views/pages/santri/history.blade.php      | 59 +++++++++++++++++-
 .../views/partial/headbar-admin.blade.php     |  2 +-
 12 files changed, 242 insertions(+), 66 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 56af264..0a1a2c5 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -27,4 +27,17 @@ public function register(): void
             //
         });
     }
+
+    public function render($request, Throwable $exception)
+{
+    if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
+        $statusCode = $exception->getStatusCode();
+        if (view()->exists("errors.{$statusCode}")) {
+            return response()->view("errors.{$statusCode}", [], $statusCode);
+        }
+    }
+
+    return parent::render($request, $exception);
+}
+
 }
diff --git a/app/Http/Controllers/HitungController.php b/app/Http/Controllers/HitungController.php
index e1ba18a..fc16399 100644
--- a/app/Http/Controllers/HitungController.php
+++ b/app/Http/Controllers/HitungController.php
@@ -31,7 +31,7 @@ public function processCounting(Request $request)
         $request->validate([
             'year'    => 'required|integer',
             'alquran' => 'required|integer|min:0|max:606',   // maksimal 606 halaman
-            'alhadis' => 'required|integer|min:0|max:1997',  // maksimal 1997 halaman
+            'alhadis' => 'required|integer|min:0|max:2174',  // maksimal 2174 halaman
         ]);
 
         // Buat objek Carbon dari "1 Januari [tahun angkatan]"
@@ -46,19 +46,19 @@ public function processCounting(Request $request)
         $n = 0;
         $status = 'Tidak Tercapai';
 
-        // 1) Jika jumlah halaman (y) >= 2603, langsung "Tercapai"
-        if ($y >= 2603) {
+        // 1) Jika jumlah halaman (y) >= 2780, langsung "Tercapai"
+        if ($y >= 2780) {
             $n = 100;  // Anda dapat mengganti nilai sesuai kebutuhan
             $status = 'Tercapai';
         }
-        // 2) Jika y < 2603 dan x > 0, hitung kecepatan pencapaian
+        // 2) Jika y < 2780 dan x > 0, hitung kecepatan pencapaian
         elseif ($x > 0) {
             $userSpeed   = $y / $x;
-            $targetSpeed = 2603 / 1095;
+            $targetSpeed = 2780 / 1095;
             $n = ($userSpeed / $targetSpeed) * 100;
             $status = $n >= 100 ? 'Tercapai' : 'Tidak Tercapai';
         }
-        // 3) Jika x == 0 dan y < 2603, nilai default tetap 0 dengan status "Tidak Tercapai"
+        // 3) Jika x == 0 dan y < 2780, nilai default tetap 0 dengan status "Tidak Tercapai"
 
         // Simpan data ke database
         Riwayat::create([
diff --git a/resources/views/pages/admin/add-santri.blade.php b/resources/views/pages/admin/add-santri.blade.php
index 87fdcbe..1fc3c60 100644
--- a/resources/views/pages/admin/add-santri.blade.php
+++ b/resources/views/pages/admin/add-santri.blade.php
@@ -45,16 +45,15 @@
                                             <td>{{ $index + 1 }}</td>
                                             <td>{{ $santri->name }}</td>
                                             <td>{{ $santri->email }}</td>
-                                            <td>{{ $santri->asal_daerah }}</td>
+                                            <td>{{ $santri->asal_daerah == 'dalamProvinsi' ? 'Dalam Daerah' : 'Luar Provinsi' }}</td>
                                             <td>{{ $santri->jenis_kelamin }}</td>
                                             <td>
-                                                <form action="{{ route('santri.delete', $santri->id) }}" method="POST"
-                                                    onsubmit="return confirmDelete({{ $santri->id }})">
+                                                <!-- Tombol Delete dengan Form -->
+                                                <form action="{{ route('santri.delete', $santri->id) }}" method="POST" class="delete-form">
                                                     @csrf
                                                     @method('DELETE')
-                                                    <button class="btn btn-danger btn-sm" type="button"
-                                                        onclick="confirmDelete({{ $santri->id }})">
-                                                        <i class='bx bx-trash'></i>
+                                                    <button type="button" class="btn btn-danger btn-sm btn-delete">
+                                                        <i class='bx bx-trash'></i> Hapus
                                                     </button>
                                                 </form>
                                             </td>
@@ -64,16 +63,13 @@
                                 </table>
                             </div>
 
-                            <!-- DataTables CSS & JS -->
-                            <!-- SweetAlert2 CSS & JS -->
-                            <link rel="stylesheet"
-                                href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.css">
-                            <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.js">
-                            </script>
-                            <link rel="stylesheet"
-                                href="https://cdn.datatables.net/1.13.6/css/jquery.dataTables.min.css">
+                            <!-- DataTables & SweetAlert2 -->
+                            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.css">
+                            <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.19/dist/sweetalert2.min.js"></script>
+                            <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/jquery.dataTables.min.css">
                             <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
                             <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
+
                             <script>
                                 $(document).ready(function () {
                                     $('#addSantriTable').DataTable({
@@ -91,27 +87,31 @@
                                     });
                                 });
 
-                                function confirmDelete(santriId) {
-                                    Swal.fire({
-                                        title: 'Yakin ingin menghapus Santri ini?',
-                                        text: 'Data yang dihapus tidak bisa dikembalikan!',
-                                        icon: 'warning',
-                                        showCancelButton: true,
-                                        confirmButtonText: 'Ya, hapus!',
-                                        cancelButtonText: 'Batal',
-                                        reverseButtons: true
-                                    }).then((result) => {
-                                        if (result.isConfirmed) {
-                                            // Submit the form if confirmed
-                                            document.getElementById('deleteSantriForm' + santriId).submit();
-                                        }
+                                document.querySelectorAll('.btn-delete').forEach(button => {
+                                    button.addEventListener('click', function() {
+                                        let form = this.closest('form');
+
+                                        Swal.fire({
+                                            title: 'Yakin ingin menghapus Santri ini?',
+                                            text: 'Data yang dihapus tidak bisa dikembalikan!',
+                                            icon: 'warning',
+                                            showCancelButton: true,
+                                            confirmButtonText: 'Ya, hapus!',
+                                            cancelButtonText: 'Batal',
+                                            reverseButtons: true
+                                        }).then((result) => {
+                                            if (result.isConfirmed) {
+                                                form.submit();
+                                            }
+                                        });
                                     });
-                                }
+                                });
                             </script>
+
                         </div>
                     </div>
                 </div>
             </div>
         </div>
 </main>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/pages/admin/class-result.blade.php b/resources/views/pages/admin/class-result.blade.php
index 47c808c..2d83942 100644
--- a/resources/views/pages/admin/class-result.blade.php
+++ b/resources/views/pages/admin/class-result.blade.php
@@ -92,9 +92,9 @@
                                         @endif
                                     </td>
                                     <td>{{ $item->tahun_angkatan }}</td>
-                                    <td>{{ number_format(($item->alhadis / 1997) * 100, 2) }}%</td>
+                                    <td>{{ number_format(($item->alhadis / 2174) * 100, 2) }}%</td>
                                     <td>{{ number_format(($item->alquran / 606) * 100, 2) }}%</td>
-                                    <td>{{ number_format(((($item->alhadis / 1997) * 100) + (($item->alquran / 606) *
+                                    <td>{{ number_format(((($item->alhadis / 2174) * 100) + (($item->alquran / 606) *
                                         100)) / 2, 2) }}%</td>
                                     <td>{{ $item->status }}</td>
                                     <td>
diff --git a/resources/views/pages/admin/data-santri.blade.php b/resources/views/pages/admin/data-santri.blade.php
index 0b0fa69..b6bb58b 100644
--- a/resources/views/pages/admin/data-santri.blade.php
+++ b/resources/views/pages/admin/data-santri.blade.php
@@ -79,7 +79,7 @@
                                             <td>{{ $item->alquran }}</td>
                                             <td>{{ number_format(($item->alquran / 606) * 100, 2) }}%</td>
                                             <td>{{ $item->alhadis }}</td>
-                                            <td>{{ number_format(($item->alhadis / 1997) * 100, 2) }}%</td>
+                                            <td>{{ number_format(($item->alhadis / 2174) * 100, 2) }}%</td>
                                             <td>{{ number_format($item->nilai_n, 2) }}</td>
                                             <td>{{ $item->status }}</td>
                                             <td>
@@ -165,7 +165,7 @@
                                             <td>{{ $item->alquran }}</td>
                                             <td>{{ number_format(($item->alquran / 606) * 100, 2) }}%</td>
                                             <td>{{ $item->alhadis }}</td>
-                                            <td>{{ number_format(($item->alhadis / 1997) * 100, 2) }}%</td>
+                                            <td>{{ number_format(($item->alhadis / 2174) * 100, 2) }}%</td>
                                             <td>{{ number_format($item->nilai_n, 2) }}</td>
                                             <td>{{ $item->status }}</td>
                                             <td>
@@ -254,7 +254,7 @@
                                             <td>{{ $item->alquran }}</td>
                                             <td>{{ number_format(($item->alquran / 606) * 100, 2) }}%</td>
                                             <td>{{ $item->alhadis }}</td>
-                                            <td>{{ number_format(($item->alhadis / 1997) * 100, 2) }}%</td>
+                                            <td>{{ number_format(($item->alhadis / 2174) * 100, 2) }}%</td>
                                             <td>{{ number_format($item->nilai_n, 2) }}</td>
                                             <td>{{ $item->status }}</td>
                                             <td>
diff --git a/resources/views/pages/admin/train-data.blade.php b/resources/views/pages/admin/train-data.blade.php
index 5ebc471..03339f2 100644
--- a/resources/views/pages/admin/train-data.blade.php
+++ b/resources/views/pages/admin/train-data.blade.php
@@ -101,7 +101,7 @@ class="btn btn-warning w-100 d-flex align-items-center justify-content-center ga
                                             </td>
                                             <td>{{ $item->tahun_angkatan }}</td>
                                             <td>
-                                                {{ $item->alhadis >= 1997 ? 'Khatam' : 'Belum Khatam' }}
+                                                {{ $item->alhadis >= 2174 ? 'Khatam' : 'Belum Khatam' }}
                                             </td>
                                             <td>
                                                 {{ $item->alquran >= 606 ? 'Khatam' : 'Belum Khatam' }}
diff --git a/resources/views/pages/auth/login.blade.php b/resources/views/pages/auth/login.blade.php
index 20520d2..ad96d52 100644
--- a/resources/views/pages/auth/login.blade.php
+++ b/resources/views/pages/auth/login.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app-none')
 <title>Login | SR Klasifikasi</title>
 @section('content')
-
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 <section class="section register min-vh-100 d-flex flex-column align-items-center justify-content-center py-4">
     <div class="container">
         <div class="row justify-content-center">
diff --git a/resources/views/pages/auth/register.blade.php b/resources/views/pages/auth/register.blade.php
index fcf6530..b0dae8c 100644
--- a/resources/views/pages/auth/register.blade.php
+++ b/resources/views/pages/auth/register.blade.php
@@ -36,7 +36,7 @@
                         @endif
 
                         <form class="row g-3 needs-validation" action="{{ route('register.post') }}" method="POST"
-                            novalidate id="registerForm">
+                            novalidate>
                             @csrf
                             <div class="col-12">
                                 <label for="nameSantri" class="form-label">Nama</label>
@@ -59,8 +59,8 @@
                             <div class="col-12">
                                 <label for="passwordSantri" class="form-label">Password</label>
                                 <div class="input-group">
-                                    <input type="password" name="password" class="form-control" id="passwordSantri"
-                                        required>
+                                <input type="password" name="password" class="form-control" id="passwordSantri"
+                                    required>
                                     <span class="input-group-text toggle-password" data-target="passwordSantri">
                                         <i class="bx bx-hide"></i>
                                     </span>
@@ -101,7 +101,7 @@
                             </div>
 
                             <div class="col-12">
-                                <button class="btn btn-primary w-100" type="submit">Daftar</button>
+                                <button class="btn btn-primary w-100" type="submit" id="btnRegister" disabled>Daftar</button>
                             </div>
 
                             <div class="col-12 d-flex justify-content-center">
@@ -118,8 +118,31 @@
     </div>
 </section>
 
+<!-- SweetAlert2 -->
 <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
 <script>
+    document.addEventListener("DOMContentLoaded", function() {
+        const nisInput = document.getElementById("NISSantri");
+        const btnRegister = document.getElementById("btnRegister");
+
+        nisInput.addEventListener("input", function() {
+            let nisValue = this.value.trim();
+
+            if (nisValue.length > 0 && !/^([IA])/i.test(nisValue)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Data Tidak Valid',
+                    confirmButtonColor: '#d33'
+                });
+
+                this.value = "";  // Kosongkan input NIS
+                btnRegister.disabled = true;  // Nonaktifkan tombol daftar
+            } else {
+                btnRegister.disabled = false;  // Aktifkan tombol daftar jika valid
+            }
+        });
+    });
     document.addEventListener("DOMContentLoaded", function () {
         // Show/Hide Password
         document.querySelectorAll(".toggle-password").forEach(button => {
diff --git a/resources/views/pages/santri/counting.blade.php b/resources/views/pages/santri/counting.blade.php
index 3fec3ea..0b1dccb 100644
--- a/resources/views/pages/santri/counting.blade.php
+++ b/resources/views/pages/santri/counting.blade.php
@@ -49,8 +49,8 @@
                                 name="alquran" value="{{ old('alquran') }}" max="606" required>
                         </div>
                         <div class="col-md-6">
-                            <input type="number" class="form-control" placeholder="Jumlah Al-Hadis Isi : Max 1997"
-                                name="alhadis" value="{{ old('alhadis') }}" max="1997" required>
+                            <input type="number" class="form-control" placeholder="Jumlah Al-Hadis Isi : Max 2174"
+                                name="alhadis" value="{{ old('alhadis') }}" max="2174" required>
                         </div>
                         <div class="text-center">
                             <button type="submit" class="btn btn-primary">Hitung & Simpan</button>
@@ -83,7 +83,7 @@
                                 <td>{{ $latest->alhadis }}</td>
                             </tr>
                             <tr>
-                                <th><i class="bx bx-line-chart"></i> Nilai (n)</th>
+                                <th><i class="bx bx-line-chart"></i>Angka Capaian</th>
                                 <td>
                                     <strong>
                                         {{ number_format($latest->nilai_n, 2) }}%
@@ -97,11 +97,11 @@
                             $now = \Carbon\Carbon::today();
                             $x = $start->diffInDays($now);
                             $y = $latest->alquran + $latest->alhadis;
-                            $targetSpeed = 2603 / 1095;
+                            $targetSpeed = 2780 / 1095;
 
                             // Hitung nilai kecepatan (nCheck) sebagai persentase
                             $nCheck = 0;
-                            if ($y >= 2603) {
+                            if ($y >= 2780) {
                             $nCheck = 100;
                             } elseif ($x > 0) {
                             $userSpeed = $y / $x;
@@ -111,7 +111,7 @@
                             // Tentukan status detail untuk target keseluruhan
                             $detailStatus = '';
                             $badgeClass = '';
-                            if ($y >= 2603) {
+                            if ($y >= 2780) {
                             $detailStatus = "Sesuai Target (Halaman penuh)";
                             $badgeClass = 'bg-success';
                             } elseif ($x == 0) {
@@ -132,20 +132,11 @@
 
                                 // Hitung kekurangan halaman untuk Quran dan Hadis
                                 $quranShort = $latest->alquran < 606 ? (606 - $latest->alquran) : 0;
-                                    $hadisShort = $latest->alhadis < 1997 ? (1997 - $latest->alhadis) : 0;
+                                    $hadisShort = $latest->alhadis < 2174 ? (2174 - $latest->alhadis) : 0;
                                         $quranStatus = $latest->alquran >= 606 ? 'Khatam' : 'Belum Khatam';
-                                        $hadisStatus = $latest->alhadis >= 1997 ? 'Khatam' : 'Belum Khatam';
+                                        $hadisStatus = $latest->alhadis >= 2174 ? 'Khatam' : 'Belum Khatam';
                                         @endphp
 
-                                        <tr>
-                                            <th><i class="bx bx-info-circle"></i> Status Detail</th>
-                                            <td>
-                                                <span class="badge {{ $badgeClass }}">
-                                                    {{ $detailStatus }}
-                                                </span>
-                                            </td>
-                                        </tr>
-
                                         {{-- Kolom tambahan: Status Quran --}}
                                         <tr>
                                             <th><i class="bx bx-book"></i> Status Quran</th>
@@ -173,6 +164,38 @@
                                                 @endif
                                             </td>
                                         </tr>
+                                        
+                                        @php
+                                        $totalHalaman = 2780;
+                                        $halamanDikerjakan = $latest->alquran + $latest->alhadis;
+                                        $sisaHalaman = max(0, $totalHalaman - $halamanDikerjakan);
+                                        $targetPerHari = 2.38;
+                                        $estimasiHari = ceil($sisaHalaman / $targetPerHari);
+
+                                        // Estimasi tanggal lulus
+                                        $estimasiTanggal = now()->addDays($estimasiHari)->format('d-m-Y');
+
+                                        $statusKhatam = $halamanDikerjakan >= $totalHalaman ? "Sudah Khatam" : "Belum Khatam";
+                                        @endphp
+
+                                        <tr>
+                                            <th><i class="bx bx-hourglass"></i> Perkiraan Lulus</th>
+                                            <td>
+                                                <span class="badge bg-primary">
+                                                    {{ $estimasiHari }} hari lagi ({{ $estimasiTanggal }})
+                                                </span>
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <th><i class="bx bx-info-circle"></i> Status Detail</th>
+                                            <td>
+                                                <span class="badge {{ $badgeClass }}">
+                                                    {{ $detailStatus }}
+                                                </span>
+                                            </td>
+                                        </tr>
+                                        
                                         <tr>
                                             <th><i class='bx bx-calculator'></i> Hasil</th>
                                             <td>
diff --git a/resources/views/pages/santri/dashboard.blade.php b/resources/views/pages/santri/dashboard.blade.php
index fba42cd..2b6e68d 100644
--- a/resources/views/pages/santri/dashboard.blade.php
+++ b/resources/views/pages/santri/dashboard.blade.php
@@ -13,6 +13,10 @@
         box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
     }
 
+    .time-text{
+        color:#012970;
+    }
+
     .verification-card .card-icon {
         width: 50px;
         height: 50px;
@@ -22,6 +26,28 @@
         box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
     }
 
+
+
+    .estimation-card {
+        background-color: #f8f9fa;
+        border-left: 5px solid #8B07FFFF;
+        transition: transform 0.3s ease, box-shadow 0.3s ease;
+    }
+
+    .estimation-card:hover {
+        transform: scale(1.02);
+        box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+    }
+
+    .estimation-card .card-icon {
+        width: 50px;
+        height: 50px;
+        background-color: #8B07FFFF;
+        color: white;
+        font-size: 1.8rem;
+        box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+    }
+
     .qr-container {
         display: none;
         text-align: center;
@@ -92,6 +118,40 @@
             </div>
         </div>
 
+        <div class="col-12">
+            <div class="card info-card estimation-card">
+                <div class="card-body">
+                    <h5 class="card-title">Estimasi Lulus</h5>
+                    <div class="d-flex align-items-center">
+                        <div class="card-icon rounded-circle d-flex align-items-center justify-content-center">
+                            <i class='bx bx-calendar-check'></i>
+                        </div>
+                        <div class="ps-3">
+                            @php
+                            $totalHalaman = 2780;
+                            $halamanDikerjakan = $latestRiwayat ? ($latestRiwayat->alquran + $latestRiwayat->alhadis) : 0;
+                            $sisaHalaman = max(0, $totalHalaman - $halamanDikerjakan);
+                            $targetPerHari = 2.38;
+                            $estimasiHari = ceil($sisaHalaman / $targetPerHari);
+                            $estimasiTanggal = now()->addDays($estimasiHari)->format('d-m-Y');
+                            @endphp
+
+                            @if($halamanDikerjakan >= $totalHalaman)
+                            <h4 class=" fw-bold time-text">Sudah Lulus 🎉</h4>
+                            @else
+                            <h4 class="fw-bold time-text">
+                                {{ $estimasiHari }} Hari Lagi
+                            </h4>
+                            <p class="text-muted">Perkiraan <b>{{ $estimasiTanggal }}</b></p>
+                            @endif
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Akhir Kartu Estimasi Lulus -->
+
+
         <div class="col-12 dashboard">
             <div class="row">
                 <div class="col-xxl-12 col-md-12">
diff --git a/resources/views/pages/santri/history.blade.php b/resources/views/pages/santri/history.blade.php
index 507d072..5cdc8f0 100644
--- a/resources/views/pages/santri/history.blade.php
+++ b/resources/views/pages/santri/history.blade.php
@@ -23,7 +23,33 @@
                         {{ session('success') }}
                     </div>
                     @endif
-
+                    <div class="col-12 d-md-flex gap-2">
+                        <div class="col-4">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h5 class="card-title text-center">Perkembangan Capaian</h5>
+                                    <div id="chartNilaiN" style="height: 350px;"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-4">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h5 class="card-title text-center">Perkembangan Al-Qur'an</h5>
+                                    <div id="chartQuran" style="height: 350px;"></div>
+                                </div>
+                            </div>
+        
+                        </div>
+                        <div class="col-4">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h5 class="card-title text-center">Perkembangan Al-Hadis</h5>
+                                    <div id="chartHadis" style="height: 350px;"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="card">
                         <div class="card-body">
                             <h5 class="card-title">Riwayat Hitung</h5>
@@ -174,5 +200,36 @@
          // Tampilkan modal
          $('#sendModal').modal('show');
     });
+
+    document.addEventListener("DOMContentLoaded", function () {
+        var categories = {!! json_encode($riwayat->pluck('created_at')->map(function($date) { return \Carbon\Carbon::parse($date)->format('Y-m-d'); })->toArray()) !!};
+
+        // Grafik Perkembangan Al-Qur'an
+        new ApexCharts(document.querySelector("#chartQuran"), {
+            chart: { type: 'area', height: 350, zoom: { enabled: true } },
+            colors: ['#007bff'], 
+            series: [{ name: "Al-Qur'an", data: {!! json_encode($riwayat->pluck('alquran')->toArray()) !!} }],
+            xaxis: { categories: categories},
+            yaxis: { title: { text: 'Jumlah Halaman' } }
+        }).render();
+
+        // Grafik Perkembangan Al-Hadis
+        new ApexCharts(document.querySelector("#chartHadis"), {
+            chart: { type: 'area', height: 350, zoom: { enabled: true } },
+            colors: ['#28a745'],
+            series: [{ name: "Al-Hadis", data: {!! json_encode($riwayat->pluck('alhadis')->toArray()) !!} }],
+            xaxis: { categories: categories},
+            yaxis: { title: { text: 'Jumlah Hadis' } }
+        }).render();
+
+        // Grafik Perkembangan Nilai N
+        new ApexCharts(document.querySelector("#chartNilaiN"), {
+            chart: { type: 'area', height: 350, zoom: { enabled: true } },
+            colors: ['#ffc107'],
+            series: [{ name: "Nilai N", data: {!! json_encode($riwayat->pluck('nilai_n')->map(function($value) { return number_format($value, 2); })->toArray()) !!} }],
+            xaxis: { categories: categories},
+            yaxis: { title: { text: 'Nilai' } }
+        }).render();
+    });
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/partial/headbar-admin.blade.php b/resources/views/partial/headbar-admin.blade.php
index 229ed3f..9ccd2a8 100644
--- a/resources/views/partial/headbar-admin.blade.php
+++ b/resources/views/partial/headbar-admin.blade.php
@@ -36,7 +36,7 @@
                                     </tr>
                                     <tr>
                                         <td><i class="bi bi-book-half text-warning"></i> <b>Hadis</b></td>
-                                        <td>1997 Halaman</td>
+                                        <td>2174 Halaman</td>
                                     </tr>
                                 </tbody>
                             </table>