From ce194889a0a81ca9b7f51626074e555cbaa9feb7 Mon Sep 17 00:00:00 2001
From: DimazzP <pratamadimas473@gmail.com>
Date: Mon, 30 Oct 2023 15:28:47 +0700
Subject: [PATCH] Perbaikan Dashboard & Hasil (Admin)

---
 .../Controllers/AdminBackend/AdminResultController.php   | 9 ++++++++-
 app/Models/Hasil.php                                     | 5 +++++
 resources/views/admin_backend/admin_dashboard.blade.php  | 6 +++---
 resources/views/admin_backend/admin_result.blade.php     | 3 +++
 resources/views/backend/users_questionnaire.blade.php    | 2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AdminBackend/AdminResultController.php b/app/Http/Controllers/AdminBackend/AdminResultController.php
index 6cb9310..46c70ab 100644
--- a/app/Http/Controllers/AdminBackend/AdminResultController.php
+++ b/app/Http/Controllers/AdminBackend/AdminResultController.php
@@ -14,12 +14,19 @@ class AdminResultController extends Controller
 {
     public function index()
     {
-        $results = Hasil::with('user')->get();
+        $results = Hasil::with('user')->with('periode')->get();
         $results = $results->map(function ($result) {
             $result->formatted_created_at = Carbon::parse($result->created_at)->format('M d, Y');
+            if ($result->periode->semester == 1) {
+                $result->periode->semester = 'Ganjil';
+            } else {
+                $result->periode->semester = 'Genap';
+            }
             return $result;
         });
 
+
+
         return view('admin_backend.admin_result', compact('results'));
     }
 
diff --git a/app/Models/Hasil.php b/app/Models/Hasil.php
index 5909a1f..55dc900 100644
--- a/app/Models/Hasil.php
+++ b/app/Models/Hasil.php
@@ -30,4 +30,9 @@ public function user()
     {
         return $this->belongsTo(User::class, 'id_user');
     }
+
+    public function periode()
+    {
+        return $this->belongsTo(Periode::class, 'id_periode');
+    }
 }
diff --git a/resources/views/admin_backend/admin_dashboard.blade.php b/resources/views/admin_backend/admin_dashboard.blade.php
index ff3aea3..7e74aba 100644
--- a/resources/views/admin_backend/admin_dashboard.blade.php
+++ b/resources/views/admin_backend/admin_dashboard.blade.php
@@ -41,7 +41,7 @@
                                 show: false
                                 }
                             },
-                            labels: ['High', 'Medium', 'Low'],
+                            labels: kmClass,
                             colors: ['#00e396', '#F8DC1A', '#FA240C']
                             }).render();
                         });
@@ -67,7 +67,7 @@
                                 return item.total;
                             });
                             new ApexCharts(document.querySelector("#rmPieChart"), {
-                            series: [13, 43, 22],
+                            series: rmTotal,
                             chart: {
                                 height: 350,
                                 type: 'pie',
@@ -75,7 +75,7 @@
                                 show: false
                                 }
                             },
-                            labels: ['High', 'Medium', 'Low'],
+                            labels: rmClass,
                             colors: ['#00e396', '#F8DC1A', '#FA240C']
                             }).render();
                         });
diff --git a/resources/views/admin_backend/admin_result.blade.php b/resources/views/admin_backend/admin_result.blade.php
index a856f72..202b4fa 100644
--- a/resources/views/admin_backend/admin_result.blade.php
+++ b/resources/views/admin_backend/admin_result.blade.php
@@ -5,12 +5,14 @@
             <h4 style="font-weight: bold">Hasil Kategori Metakognitif</h4>
             <p class="text-secondary fs-6">Lorem ipsum dolor sit amet consectetur, adipisicing elit. Explicabo, tempora.</p>
         </div>
+
         <div class="table-responsive">
             <table class="table">
                 <thead class="table-light">
                     <th>NAMA</th>
                     <th>ANGKATAN</th>
                     <th>TANGGAL</th>
+                    <th>Periode</th>
                     <th>KM</th>
                     <th>RM</th>
                     <th>ACTION</th>
@@ -21,6 +23,7 @@
                             <td style="font-weight: bold">{{ $result->user->nama_lengkap }}</td>
                             <td>{{ $result->user->angkatan }}</td>
                             <td>{{ $result->formatted_created_at }}</td>
+                            <td>{{ $result->periode->semester.' '.$result->periode->tahun }}</td>
                             <td>{{ $result->km_class }}</td>
                             <td>{{ $result->rm_class }}</td>
                             <td><a href="{{ route('adminResult.show', ['admin_result' => $result->id]) }}" class="btn btn-primary btn-sm">Download</a></td>
diff --git a/resources/views/backend/users_questionnaire.blade.php b/resources/views/backend/users_questionnaire.blade.php
index 2079b54..8c63efc 100644
--- a/resources/views/backend/users_questionnaire.blade.php
+++ b/resources/views/backend/users_questionnaire.blade.php
@@ -35,7 +35,7 @@
                             <input value="2" type="radio" class="form-check-input" id="radio2{{ $kuesioner->id }}" name="optionsGroup{{ $kuesioner->id }}">
                             <label class="form-check-label pe-1 pe-sm-5 ps-1" for="radio2{{ $kuesioner->id }}">2</label>
         
-                            <input value="3" type="radio" class="form-check-input" id="radio3{{ $kuesioner->id }}" name="optionsGroup{{ $kuesioner->id }}" checked>
+                            <input value="3" type="radio" class="form-check-input" id="radio3{{ $kuesioner->id }}" name="optionsGroup{{ $kuesioner->id }}">
                             <label class="form-check-label pe-1 pe-sm-5 ps-1" for="radio3{{ $kuesioner->id }}">3</label>
         
                             <input value="4" type="radio" class="form-check-input" id="radio4{{ $kuesioner->id }}" name="optionsGroup{{ $kuesioner->id }}">