update

app/Helpers/custom.php

@@ -60,6 +60,39 @@ if (!function_exists('getUsulan')) {
     }
 }
 
+if (!function_exists('getNilaiAll')) {
+    /**
+     * @param $val
+     *
+     * @return string
+     */
+    function getNilaiAll($type,$sekolah_id)
+    {
+        $countSoal = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->count();
+        if($type == 'sekolah'){
+            $nilai  = Penilaian::where('ms_sekolah_id',$sekolah_id)
+            ->where('skor','!=',0)
+            ->where('tahun',date('Y'))
+            ->where('status',0) //inputan sekolah
+            ->sum('skor');
+        }elseif($type == 'kota'){
+            $nilai  = Penilaian::where('ms_sekolah_id',$sekolah_id)
+            ->where('skor','!=',0)
+            ->where('tahun',date('Y'))
+            ->where('status',1) //inputan sekolah
+            ->sum('skor');
+        }elseif($type == 'provinsi'){
+            $nilai  = Penilaian::where('ms_sekolah_id',$sekolah_id)
+            ->where('skor','!=',0)
+            ->where('tahun',date('Y'))
+            ->where('status',2) //inputan sekolah
+            ->sum('skor');
+        }
+
+        return @$nilai ? round(@$nilai) : 0;
+    }
+}
+
 if (!function_exists('getNilai')) {
     /**
      * @param $val

app/Http/Controllers/KuesionerController.php

@@ -78,6 +78,9 @@ class KuesionerController extends Controller
                 $status = '<span class="badge badge-success">Sudah Diverifikasi</span>';
             }elseif($row->status == 2){
                 $status = '<span class="badge badge-danger">Ditolak</span>';
+            }else{
+                $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
+                $status = '<span class="badge badge-warning">'.str_replace('_',' ',$log->step).'</span>';
             }
 
             $sekolah = '';

app/Http/Controllers/Modules/Usulan/CSAKController.php

@@ -97,6 +97,14 @@ class CSAKController extends Controller
                 $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
             }
 
+            $penilaian = '';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+
+            $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
+            $progress = '<span class="badge badge-warning">'.str_replace('_',' ',$log->step).'</span>';
+
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
             $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
@@ -110,6 +118,8 @@ class CSAKController extends Controller
                 'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'penghargaan'       => $penghargaan,
+                'penilaian'         => $penilaian,
+                'progress'          => $progress,
                 'action'            => $action,
             ];
 

resources/views/modules/usulan/csak/index.blade.php

@@ -142,8 +142,8 @@
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
                           <th data-field="tingkat_sekolah">Dokumen Administrasi</th>
-                          <th data-field="tingkat_sekolah">Pemenuhan Kriteria</th>
+                          <th data-field="penilaian">Pemenuhan Kriteria</th>
-                          <th data-field="tingkat_sekolah">Progress</th>
+                          <th data-field="progress">Progress</th>
                           <th data-field="tingkat_sekolah">SK</th>
                         </tr>
                       </thead>