From 2dc5ce9c459247dcdf9c8c9122397b4577ede5f3 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Thu, 16 Jul 2026 14:39:18 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/Modules/Usulan/CSAKController.php | 6 +++++-
 app/Http/Controllers/Modules/Usulan/CSAPController.php | 7 +------
 resources/views/modules/kuesioner/index.blade.php      | 2 +-
 resources/views/modules/usulan/csak/index.blade.php    | 3 ++-
 resources/views/modules/usulan/csap/index.blade.php    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index 2744248..7742497 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -170,6 +170,9 @@ class CSAKController extends Controller
             $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
             $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
+            $countpenilaian  = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+            $page  = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($row->KuesionerId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
+
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
@@ -181,7 +184,8 @@ class CSAKController extends Controller
                 'kecamatan'         => $row->sekolah->kecamatan->name,
                 'penghargaan'       => $penghargaan,
                 'penilaian'         => $penilaian,
-                'progress'          => kuesionerLogStatus($row->KuesionerId),
+                'progress'          => count(@$countpenilaian).' / '.count(@$page),
+                'status'          => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
             ];
 
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 8254415..d788616 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -182,12 +182,7 @@ class CSAPController extends Controller
             $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
             $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
-            if(session('group_alias') == 'penilai_kota'){
-                $countpenilaian  = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
-            }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){
-                $countpenilaian  = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
-            }
-
+            $countpenilaian  = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
             $page  = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($row->KuesionerId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
 
             $_data[] = [
diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 03f227e..4ac20db 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -74,7 +74,7 @@
                                     <div class="w-100">
                                         <div class="form-group">
                                             <select name="progress" class="form-control select2">
-                                                <option value="">-- PILIH PROGRESS --</option>
+                                                <option value="">-- PILIH STATUS --</option>
                                                 <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
                                                 <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
                                                 <option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index 1063e57..abf2e67 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -74,7 +74,7 @@
                                     <div class="w-100">
                                         <div class="form-group">
                                             <select name="progress" class="form-control select2">
-                                                <option value="">-- PILIH PROGRESS --</option>
+                                                <option value="">-- PILIH STATUS --</option>
                                                 <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
                                                 <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
                                                 <option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
@@ -144,6 +144,7 @@
                           <!-- <th data-field="tingkat_sekolah">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
+                          <th data-field="status">Status</th>
                         </tr>
                       </thead>
                       <tbody></tbody>
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index d4723ec..0170041 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -74,7 +74,7 @@
                                     <div class="w-100">
                                         <div class="form-group">
                                             <select name="progress" class="form-control select2">
-                                                <option value="">-- PILIH PROGRESS --</option>
+                                                <option value="">-- PILIH STATUS --</option>
                                                 <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
                                                 <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
                                                 <option value="dikembalikan">Perbaikan Kuesioner Leveling</option>