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

---
 .../Controllers/Modules/Usulan/CSAPController.php     | 11 ++++++++++-
 resources/views/modules/usulan/csap/index.blade.php   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 2c3eed2..8254415 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -182,6 +182,14 @@ 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();
+            }
+
+            $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),
@@ -191,7 +199,8 @@ class CSAPController extends Controller
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'kecamatan'         => $row->sekolah->kecamatan->name,
                 'penilaian'         => $penilaian,
-                'progress'          => kuesionerLogStatus($row->KuesionerId),
+                'progress'          => count(@$countpenilaian).' / '.count(@$page),
+                'status'            => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
             ];
 
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index 820d44f..d4723ec 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -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>