update

app/Helpers/custom.php

@@ -3,12 +3,13 @@
 use App\Models\Master\MasterMenu;
 use App\Models\Master\MasterAccessMenu;
 use App\Models\Kuesioner;
+use App\Models\KuesionerLog;
 use App\Models\Master\FormKriteria;
 use App\Models\Penilaian;
 use App\Models\User;
 use App\Models\Master\Sekolah;
 use App\Models\SK;
-use App\Models\master\MasterGroup;
+use App\Models\Master\MasterGroup;
 
 
 if (!function_exists('sekolah')) {
@@ -26,7 +27,7 @@ if (!function_exists('listSekolah')) {
             $res = [];
             $d = '';
             foreach (json_decode($sekolah) as $key => $value) {
-                $d .= '<span class="badge badge-success">'.sekolah($value)->nama_sekolah.'</span><br>';
+                $d .= '<span class="badge bg-success-light text-success">'.sekolah($value)->nama_sekolah.'</span><br>';
                 
             }
             array_push($res, $d);
@@ -213,6 +214,19 @@ if (!function_exists('getNilai')) {
         return @$nilai ? @$nilai->skor : 0;
     }
 }
+if (!function_exists('kuesionerLogStatus')) {
+    /**
+     * @param $val
+     *
+     * @return string
+     */
+    function kuesionerLogStatus($KuesionerId)
+    {
+        $log  = KuesionerLog::where('kuesioner_id',$KuesionerId)->orderBy('KuesionerLogId','DESC')->first();
+        $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+        return $progress;
+    }
+}
 
 if (!function_exists('status_kuesioner')) {
     /**
@@ -225,14 +239,15 @@ if (!function_exists('status_kuesioner')) {
         //0 = Belum di Verifikasi Dinas
         //1 = Sudah Diusulkan Oleh Dinas atau Sudin
         //2 = Approve Dokumen
-        //3 = Ditolak Dokumen
+        //3 = Kirim Ke Penilai Kota ( Proses Penilaian )
-        
+        //4 = Selesai Penilaian Kota
-        //1 = Sudah di Verifikasi Dinas -> Hold Menunggu Usulan
+        //5 = Dikembalikan Penilaian Kota ke Sekolah
-        //2 = Ditolak Oleh Dinas
+        //6 = Selesai Penilaian Provinsi
-        //3 = selesai kelengkapan data
+        //7 = Dikembalikan Penilaian Provinsi ke Kota
-        //4 = Validasi Diteruskan
+        //8 = Selesai Penilaian Nasional
-        //5 = Validasi Dikembalikan
+        //9 = Selesai Penilaian Mandiri
-        //6 = Terbit SK
+        //10 = Selesai Final
+        //11 = Terbit SK
     }
 }
 
@@ -640,12 +655,16 @@ if (!function_exists('formKriteria')) {
     function formKriteria($page_number,$sekolah_id = null)
     {
         $kriteria = FormKriteria::where('page_number',$page_number)->get();
+
         $html = '';
         if(@$sekolah_id){
             $idSekolah = @$sekolah_id;
         }else{
             $idSekolah = session('sekolah_id');
         }
+
+        $kuesioner = Kuesioner::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->first();
+
         foreach($kriteria as $keyKriteria => $data){
 
             if(session('group_alias') == 'sekolah'){
@@ -695,7 +714,7 @@ if (!function_exists('formKriteria')) {
                             $key = 'number_'.$keyKriteria.'_'.$keyOption;
 
                             $html .= '<div class="custom-control custom-checkbox m-2">';
-                                $html .= '<input type="checkbox" '.(@$value ? in_array($dataOption, @$value) ? 'checked' : '' : '').' class="custom-control-input is-required" id="'.$key.'" value="'.$dataOption.'" name="input_'.$data->key.'[]">';
+                                $html .= '<input type="checkbox" '.(@$value ? in_array($dataOption, (is_array(@$value) ? @$value : array(@$value))) ? 'checked' : '' : '').' class="custom-control-input is-required" id="'.$key.'" value="'.$dataOption.'" name="input_'.$data->key.'[]">';
                                 $html .= '<label class="custom-control-label" for="'.$key.'">'.$dataOption.'</label>';
                             $html .= '</div>';
                         }
@@ -794,6 +813,17 @@ if (!function_exists('formKriteria')) {
                     $html .= '</div>';
                 $html .= '</div>';
             $html .= '</div>';
+
+            if($kuesioner->status == 5){
+                $catatan = Penilaian::where('key','catatan')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first();
+                $html .= '<div class="card mb-2 removeFormKriteria">';
+                    // $html .= '<input type="hidden" name="key" value="'.encode_id($page_number).'">';
+                    $html .= '<div class="card-body">';
+                        $html .= '<h6><b>Catatan</b></h6>';
+                        $html .= '<p>'.json_decode($catatan->value).'</p>';
+                    $html .= '</div>';
+                $html .= '</div>';
+            }
         }else{
 
             $html .= '<div class="card mb-2 removeFormKriteria">';

app/Http/Controllers/AjaxController.php

@@ -60,7 +60,7 @@ class AjaxController extends Controller
     }
     public function getSekolahSK(Request $request)
     {
-        $kuesioner = Kuesioner::where('level',($request->data-1))->where('tahun',date('Y'))->where('status',4)->get();
+        $kuesioner = Kuesioner::where('level',($request->data-1))->where('tahun',date('Y'))->where('status',10)->get();
         $data = [];
         foreach ($kuesioner as $key => $value) {
             $data[$key]['id'] = encode_id($value->ms_sekolah_id);

app/Http/Controllers/HomeController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Models\Kuesioner;
+use App\Models\KuesionerLog;
 use App\Models\ProfileSekolah;
 use App\Models\Master\FormKriteria;
 use App\Models\Penilaian;
@@ -44,6 +45,7 @@ class HomeController extends Controller
             $data['page']       = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->count(); 
             $data['penilaian']  = Penilaian::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->count(); 
             $data['sk']         = SK::where('tahun',date('Y'))->where('sekolah','like','%'.session('sekolah_id').'%')->first();
+            $data['log']  = KuesionerLog::where('kuesioner_id',@$data['kuesioner']->KuesionerId)->orderBy('created_at','DESC')->first();
 
             return view($this->template.'.sekolah', $data);
         }else{
@@ -53,10 +55,10 @@ class HomeController extends Controller
             $data['total_usulan_nasional']  = Kuesioner::where('tahun',date('Y'))->where('level',2)->count();
             $data['total_usulan_mandiri']   = Kuesioner::where('tahun',date('Y'))->where('level',3)->count();
 
-            $data['total_sekolah_kab']       = Kuesioner::where('tahun',date('Y'))->where('level',0)->where('status',6)->count();
+            $data['total_sekolah_kab']       = Kuesioner::where('tahun',date('Y'))->where('level',0)->where('status',11)->count();
-            $data['total_sekolah_prov']      = Kuesioner::where('tahun',date('Y'))->where('level',1)->where('status',6)->count();
+            $data['total_sekolah_prov']      = Kuesioner::where('tahun',date('Y'))->where('level',1)->where('status',11)->count();
-            $data['total_sekolah_nasional']  = Kuesioner::where('tahun',date('Y'))->where('level',2)->where('status',6)->count();
+            $data['total_sekolah_nasional']  = Kuesioner::where('tahun',date('Y'))->where('level',2)->where('status',11)->count();
-            $data['total_sekolah_mandiri']   = Kuesioner::where('tahun',date('Y'))->where('level',3)->where('status',6)->count();
+            $data['total_sekolah_mandiri']   = Kuesioner::where('tahun',date('Y'))->where('level',3)->where('status',11)->count();
             $data['route']                  = 'modules';
             return view($this->template.'.admin', $data);
         }
@@ -71,17 +73,17 @@ class HomeController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             if(($row->level+1) == 1){
-                $jenis_usulan = 'Adiwiyata Kab/Kota';
+                $jenis_usulan = '<span class="badge bg-success-light text-success">Adiwiyata Kab/Kota</span>';
             }elseif(($row->level+1) == 2){
-                $jenis_usulan = 'Adiwiyata Provinsi';
+                $jenis_usulan = '<span class="badge bg-primary-light text-primary">Adiwiyata Provinsi</span>';
             }elseif(($row->level+1) == 3){
-                $jenis_usulan = 'Adiwiyata Nasional';
+                $jenis_usulan = '<span class="badge bg-info-light text-info">Adiwiyata Nasional</span>';
             }elseif(($row->level+1) == 4){
-                $jenis_usulan = 'Adiwiyata Mandiri';
+                $jenis_usulan = '<span class="badge bg-warning-light text-warning">Adiwiyata Mandiri</span>';
             }
 
             if($row->level == 0){

app/Http/Controllers/KuesionerController.php

@@ -73,28 +73,28 @@ class KuesionerController extends Controller
 
             $status = '';
             if($row->status == 0){
-                $status = '<span class="badge badge-info">Belum Diverifikasi</span>';
+                $status = '<span class="badge bg-info-light text-info">Belum Diverifikasi</span>';
             }elseif($row->status == 1){
-                $status = '<span class="badge badge-success">Sudah Diverifikasi</span>';
+                $status = '<span class="badge bg-success-light text-success">Sudah Diverifikasi</span>';
             }elseif($row->status == 2){
-                $status = '<span class="badge badge-danger">Ditolak</span>';
+                $status = '<span class="badge bg-danger-light text-danger">Ditolak</span>';
             }else{
                 $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
-                $status = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+                $status = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
             }
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary mt-1">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary mt-1">'.@$row->profile->status_sekolah.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-secondary text-left mt-1">'.@$row->profile->alamat_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-secondary text-secondary text-left mt-1">'.@$row->profile->alamat_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'alamat_sekolah'    => $row->sekolah->alamat_sekolah,
                 'tingkat_sekolah'   => $row->sekolah->tingkat->name,
@@ -365,6 +365,7 @@ class KuesionerController extends Controller
             $insert->pihak_kegiatan_lingkungan = json_encode(@$pihakKegiatanFormatted);
             $insert->tahun                     = date('Y');
             $insert->link_sk_adiwiyata         = @$request->link_sk_adiwiyata;
+            $insert->tahun_penghargaan         = @$request->tahun_penghargaan;
             $insert->tim_adiwiyata_nomor_sk    = @$request->tim_adiwiyata_nomor_sk;
             $insert->tim_adiwiyata_link        = @$request->tim_adiwiyata_link;
             $insert->save();

app/Http/Controllers/Management/UserController.php

@@ -179,7 +179,7 @@ class UserController extends Controller
         $data['title'] = $this->title;
         $data['route'] = $this->route;
         $data['keyId'] = $id;
-        $data['item'] = User::with('sekolah')->where('id',$keyId)->first();
+        $data['item'] = User::with('profile')->where('id',$keyId)->first();
         $data['group'] = MasterGroup::where('MsGroupId','!=',1)->get();
         return view($this->template.'.form',$data);
     }

app/Http/Controllers/Management/UserSekolahController.php

@@ -163,7 +163,7 @@ class UserSekolahController extends Controller
         $data['title'] = $this->title;
         $data['route'] = $this->route;
         $data['keyId'] = $id;
-        $data['item'] = User::with('sekolah')->where('id',$keyId)->first();
+        $data['item'] = User::with('profile')->where('id',$keyId)->first();
         return view($this->template.'.form',$data);
     }
 

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

@@ -105,24 +105,24 @@ class AdministrasiController extends Controller
             
             if(@$dok){
                 if(@$dok->status == 1){
-                    $labelDok = '<span class="badge badge-success">Dokumen Di Verifikasi</span>';
+                    $labelDok = '<span class="badge bg-success-light">Dokumen Di Verifikasi</span>';
                 }elseif(@$dok->status == 2){
-                    $labelDok = '<span class="badge badge-danger">Dokumen Di Tolak</span>';
+                    $labelDok = '<span class="badge bg-danger-light">Dokumen Di Tolak</span>';
                 }else{
-                    $labelDok = '<span class="badge badge-warning">Menuggu Verifikasi Dokumen</span>';
+                    $labelDok = '<span class="badge bg-warning-light">Menuggu Verifikasi Dokumen</span>';
                 }
             }else{
-                $labelDok = '<span class="badge badge-danger">Belum Upload Dokumen</span>';
+                $labelDok = '<span class="badge bg-danger-light">Belum Upload Dokumen</span>';
             }
 
             if($row->status == 0){
-                $labelDok .= '<br><span class="badge badge-danger">Menunggu Usulan Dari Dinas/Sudin</span>';
+                $labelDok .= '<br><span class="badge bg-danger-light">Menunggu Usulan Dari Dinas/Sudin</span>';
             }
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
@@ -131,10 +131,10 @@ class AdministrasiController extends Controller
                 'nama'              => $sekolah,
                 'tahun'             => $row->tahun,
                 'labelDok'          => $labelDok,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'penghargaan'       => $penghargaan,
-                'jenis_usulan'      => '<span class="badge badge-success">'.$jenis_usulan.'</span>',
+                'jenis_usulan'      => '<span class="badge bg-success-light">'.$jenis_usulan.'</span>',
                 'usulan'            => $fileUsulan,
                 'action'            => $action,
             ];

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

@@ -101,28 +101,37 @@ class CSAKController extends Controller
             }
 
             $penilaian = '';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'</span></br>';
+                $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
-            // $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+                    $penilaian .= '<div class="d-flex flex-column">';
-
+                        $penilaian .= '<span class="text-center"> Sekolah </span>';
-            $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
-            $progress = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+                    $penilaian .= '</div>';
+                $penilaian .= '</div>';
+                $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
+                    $penilaian .= '<div class="d-flex flex-column">';
+                        $penilaian .= '<span class="text-center"> Kota</span>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
+                    $penilaian .= '</div>';
+                $penilaian .= '</div>';
+            $penilaian .= '</div>';
+            // $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
-                'status_level'      => '<span style="width:100%" class="badge badge-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span style="width:100%" class="badge bg-secondary text-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
                 'penghargaan'       => $penghargaan,
                 'penilaian'         => $penilaian,
-                'progress'          => $progress,
+                'progress'          => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
             ];
 
@@ -145,21 +154,6 @@ class CSAKController extends Controller
     public function store(Request $request)
     {
         $sekolahId = decode_id($request->sekolah);
-        $dokumen = DokumenAdministrasi::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
-        
-        if((@$dokumen->nama_dalam_sk == 0) || (@$dokumen->sk_ttd == 0) || (@$dokumen->waktu_penetapan == 0)){
-            return response()->json(['status' => false,'message' => 'Data Dokumen Administrasi Belum Diisi!']);
-        }
-
-        if($request['validasi'] == 1){
-            $step = 'validasi_usulan_diteruskan';
-            $status = 4;
-        }elseif($request['validasi'] == 2){
-            $step = 'validasi_usulan_dikembalikan';
-            $status = 5;
-        }else{
-            return response()->json(['validasi' => false,'message' => 'Maaf Terjadi Kesalahan Dalam Input Data!']);
-        }
 
         $soal = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
         $penilaian  = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
@@ -168,9 +162,11 @@ class CSAKController extends Controller
             return response()->json(['validasi' => false,'message' => 'Maaf Penilaian Belum Lengkap!']);
         }
 
+        if($request['validasi'] == 1){
+
             $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
             $kuesioner->catatan_usulan  = $request['catatan_validasi'];
-        $kuesioner->status          = $status;
+            $kuesioner->status          = 10; // selesai final, karena usulannya ke kota dari yang belum ada jadi langsung selesai tidak ada naik ke provinsi
             $kuesioner->save();
 
             //kuesioner log
@@ -179,11 +175,44 @@ class CSAKController extends Controller
             $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
             $log->npsn           = $kuesioner->npsn;
             $log->ms_group_id    = session('group_id');
-        $log->step           = @$step;
+            $log->step           = 'selesai_penilaian_kota';
-        $log->status         = $status;
+            $log->status         = 4;
             $log->created_by     = auth()->user()->id;
             $log->save();
 
+            //kuesioner log final
+            $log = new KuesionerLog;
+            $log->kuesioner_id   = $kuesioner->KuesionerId;
+            $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+            $log->npsn           = $kuesioner->npsn;
+            $log->ms_group_id    = session('group_id');
+            $log->step           = 'selesai_final';
+            $log->status         = 10;
+            $log->created_by     = auth()->user()->id;
+            $log->save();
+
+        }elseif($request['validasi'] == 2){
+
+            $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+            $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+            $kuesioner->status          = 5;
+            $kuesioner->save();
+
+            //kuesioner log
+            $log = new KuesionerLog;
+            $log->kuesioner_id   = $kuesioner->KuesionerId;
+            $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+            $log->npsn           = $kuesioner->npsn;
+            $log->ms_group_id    = session('group_id');
+            $log->step           = 'dikembalikan_penilaian_kota';
+            $log->status         = 5;
+            $log->created_by     = auth()->user()->id;
+            $log->save();
+            
+        }else{
+            return response()->json(['validasi' => false,'message' => 'Maaf Terjadi Kesalahan Dalam Input Data!']);
+        }
+
         return response()->json(['status' => true,'message' => 'Berhasil update data!']);
     }
 

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

@@ -50,8 +50,8 @@ class CSAMController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,

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

@@ -50,8 +50,8 @@ class CSANController extends Controller
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,

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

@@ -6,6 +6,11 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Master\Provinsi;
 use App\Models\Kuesioner;
+use App\Models\KuesionerLog;
+use App\Models\Master\Sekolah;
+use App\Models\Master\FormKriteria;
+use App\Models\DokumenAdministrasi;
+use App\Models\Penilaian;
 
 class CSAPController extends Controller
 {
@@ -25,6 +30,52 @@ class CSAPController extends Controller
         return view($this->template.'.index',$data);
     }
 
+    public function update($id)
+    {
+        $keyId = decode_id($id);
+        $data['kuesioner']  = Kuesioner::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
+        $data['sekolah']    = Sekolah::find($keyId);
+        $data['route'] = $this->route;
+        $data['title'] = $this->title;
+        $data['page']  = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
+
+        $jumlah = json_decode($data['sekolah']->profile->data_jumlah);
+        $data['jumlah_peserta_didik']         = @$jumlah->jumlah_peserta_didik;
+        $data['jumlah_tenaga_pendidik']       = @$jumlah->jumlah_tenaga_pendidik;
+        $data['jumlah_tenaga_kependidikan']   = @$jumlah->jumlah_tenaga_kependidikan;
+        $data['jumlah_warga_sekolah_lainnya'] = @$jumlah->jumlah_warga_sekolah_lainnya;
+        $data['jumlah_biopori']               = @$jumlah->jumlah_biopori;
+        $data['jumlah_sumur_resapan']         = @$jumlah->jumlah_sumur_resapan;
+        $data['jumlah_pohon']                 = @$jumlah->jumlah_pohon;
+
+        $air = json_decode($data['sekolah']->profile->penghematan_air);
+        $data['air_sebelum_pblhs'] = @$air->air_sebelum_pblhs;
+        $data['air_setelah_pblhs'] = @$air->air_setelah_pblhs;
+
+        $listrik = json_decode($data['sekolah']->profile->penghematan_listrik);
+        $data['listrik_sebelum_pblhs'] = @$listrik->listrik_sebelum_pblhs;
+        $data['listrik_setelah_pblhs'] = @$listrik->listrik_setelah_pblhs;
+        $data['luas_ruangan_ac']       = @$listrik->luas_ruangan_ac;
+        $data['luas_ruangan_non_ac']   = @$listrik->luas_ruangan_non_ac;
+        $data['jumlah_kader']          = @$listrik->jumlah_kader;
+
+        $data['dokumen'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
+
+        return view($this->template.'.form',$data);
+    }
+    public function resume($id)
+    {
+        // permission('is_read', $this->route, 'module',true);
+
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;   
+        $keyId = decode_id($id);
+        $data['sekolah']    = Sekolah::find($keyId);
+        $data['page']  = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
+
+        return view($this->template.'.resume',$data);
+    }
+
     public function grid(Request $request)
     {
         $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC')->get();
@@ -33,7 +84,7 @@ class CSAPController extends Controller
             $action = '';
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
-                $action .= '<a href="'.url('kuesioner/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="Resume" class="btn btn-xs btn-block btn-primary"><i class="fal fa-eye text-white"></i></a>';
+                $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
             }
 
             if($row->level == 0){
@@ -48,10 +99,33 @@ class CSAPController extends Controller
                 $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
             }
 
+            $penilaian = '';
+
+            $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
+                $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
+                    $penilaian .= '<div class="d-flex flex-column">';
+                        $penilaian .= '<span class="text-center"> Sekolah </span>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
+                    $penilaian .= '</div>';
+                $penilaian .= '</div>';
+                $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
+                    $penilaian .= '<div class="d-flex flex-column">';
+                        $penilaian .= '<span class="text-center"> Kota</span>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
+                    $penilaian .= '</div>';
+                $penilaian .= '</div>';
+                $penilaian .= '<div class="text-success bg-success-light px-1 py-1 rounded w-100">';
+                    $penilaian .= '<div class="d-flex flex-column">';
+                        $penilaian .= '<span class="text-center"> Provinsi</span>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('provinsi',$row->ms_sekolah_id).'</h5>';
+                    $penilaian .= '</div>';
+                $penilaian .= '</div>';
+            $penilaian .= '</div>';
+
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
-            $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
-            $sekolah .= '<span class="badge badge-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
+            $sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span>&nbsp;';
 
             $_data[] = [
                 'no'                => $key+1,
@@ -59,7 +133,8 @@ class CSAPController extends Controller
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
                 'wilayah'           => $row->sekolah->kabupaten->name,
-                'penghargaan'       => $penghargaan,
+                'penilaian'         => $penilaian,
+                'progress'          => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
             ];
 
@@ -81,7 +156,91 @@ class CSAPController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $sekolahId = decode_id($request->sekolah);
+        if(session('group_alias') == 'penilai_kota'){
+            $status = 1;
+        }else{
+            $status = 2;
+        }
+
+        $soal = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+        $penilaian  = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->where('status',$status)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+
+        if(count($soal) != count($penilaian)){
+            return response()->json(['validasi' => false,'message' => 'Maaf Penilaian Belum Lengkap!']);
+        }
+
+        if($request['validasi'] == 1){
+
+            if(session('group_alias') == 'penilai_kota'){
+                $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+                $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+                $kuesioner->status          = 4;
+                $kuesioner->save();
+
+                //kuesioner log
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_penilaian_kota';
+                $log->status         = 4;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+            }elseif(session('group_alias') == 'penilai_provinsi'){
+                $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+                $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+                $kuesioner->status          = 10;
+                $kuesioner->save();
+
+                //kuesioner log
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_penilaian_provinsi';
+                $log->status         = 6;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+
+                //kuesioner log final
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_final';
+                $log->status         = 10;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+            }
+
+
+        }elseif($request['validasi'] == 2){
+
+            $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+            $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+            $kuesioner->status          = 5;
+            $kuesioner->save();
+
+            //kuesioner log
+            $log = new KuesionerLog;
+            $log->kuesioner_id   = $kuesioner->KuesionerId;
+            $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+            $log->npsn           = $kuesioner->npsn;
+            $log->ms_group_id    = session('group_id');
+            $log->step           = 'dikembalikan_penilaian_kota';
+            $log->status         = 5;
+            $log->created_by     = auth()->user()->id;
+            $log->save();
+            
+        }else{
+            return response()->json(['validasi' => false,'message' => 'Maaf Terjadi Kesalahan Dalam Input Data!']);
+        }
+
+        return response()->json(['status' => true,'message' => 'Berhasil update data!']);
     }
 
     /**
@@ -100,14 +259,6 @@ class CSAPController extends Controller
         //
     }
 
-    /**
-     * Update the specified resource in storage.
-     */
-    public function update(Request $request, string $id)
-    {
-        //
-    }
-
     /**
      * Remove the specified resource from storage.
      */

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

@@ -50,6 +50,7 @@ class SKController extends Controller
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
+                'nomor_sk'             => $row->nomor_sk,
                 'judul'             => $row->nama,
                 'sekolah'           => listSekolah($row->sekolah),
                 'tahun'             => $row->tahun,
@@ -85,6 +86,7 @@ class SKController extends Controller
         // dd($request->all());
         try {
             Validator::make($request->all(), [
+                'nomor_sk'             => 'max:200',
                 'judul'             => 'max:200',
                 'tanggal_penetapan' => 'date',
                 'jenis_usulan'      => 'required',
@@ -150,6 +152,7 @@ class SKController extends Controller
                 ],[
                     'tahun'             => date('Y'),
                     'nama'              => @$request->nama,
+                    'nomor_sk'          => @$request->nomor_sk,
                     'tanggal_penetapan' => $request->tanggal_penetapan,
                     'jenis_usulan'      => $request->jenis_usulan,
                     'file'              => $filePath,
@@ -163,6 +166,7 @@ class SKController extends Controller
                     'jenis_usulan'      => $request->jenis_usulan,
                 ],[
                     'tahun'             => date('Y'),
+                    'nomor_sk'          => @$request->nomor_sk,
                     'nama'              => @$request->nama,
                     'tanggal_penetapan' => $request->tanggal_penetapan,
                     'jenis_usulan'      => $request->jenis_usulan,
@@ -174,8 +178,8 @@ class SKController extends Controller
 
             foreach($request->sekolah as $sekolah){
 
-                $kuesioner = Kuesioner::where('ms_sekolah_id',decode_id($sekolah))->where('status',4)->where('tahun',date('Y'))->first();
+                $kuesioner = Kuesioner::where('ms_sekolah_id',decode_id($sekolah))->where('status',10)->where('tahun',date('Y'))->first();
-                $kuesioner->status = 6;
+                $kuesioner->status = 11;
                 $kuesioner->save();
 
                 //kuesioner log
@@ -184,8 +188,8 @@ class SKController extends Controller
                 $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
                 $log->npsn           = $kuesioner->npsn;
                 $log->ms_group_id    = session('group_id');
-                $log->step           = 'penetapan_sk';
+                $log->step           = 'terbit_sk';
-                $log->status         = 6;
+                $log->status         = 11;
                 $log->created_by     = auth()->user()->id;
                 $log->save();
             }

app/Http/Controllers/ProfileController.php

@@ -68,47 +68,52 @@ class ProfileController extends Controller
                 $action .= '<a href="'.url('profile-sekolah/update/'.encode_id($row->MsSekolahId)).'" data-toggle="tooltip" title="Edit Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-pencil text-white"></i></a>';
             }
 
-            if($row->level == 0){
-                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Belum Pernah';
-            }elseif($row->level == 1){
-                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Kab/Kota';
-            }elseif($row->level == 2){
-                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Provinsi';
-            }elseif($row->level == 3){
-                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Nasional';
-            }elseif($row->level == 4){
-                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
-            }
-
-            if(($row->level+1) == 1){
-                $jenis_usulan = 'Adiwiyata Kab/Kota';
-            }elseif(($row->level+1) == 2){
-                $jenis_usulan = 'Adiwiyata Provinsi';
-            }elseif(($row->level+1) == 3){
-                $jenis_usulan = 'Adiwiyata Nasional';
-            }elseif(($row->level+1) == 4){
-                $jenis_usulan = 'Adiwiyata Mandiri';
-            }
-
             $kuesioner  = Kuesioner::where('ms_sekolah_id',$row->MsSekolahId)->where('tahun',date('Y'))->orderBy('created_at','DESC')->first();
             $log  = KuesionerLog::where('kuesioner_id',@$kuesioner->KuesionerId)->orderBy('created_at','DESC')->first();
             if(@$log){
-                $progress = '<span class="badge badge-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+                $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
             }else{
                 $progress = '';
             }
 
+            if($kuesioner->level == 0){
+                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Belum Pernah';
+            }elseif($kuesioner->level == 1){
+                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Kab/Kota';
+            }elseif($kuesioner->level == 2){
+                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Provinsi';
+            }elseif($kuesioner->level == 3){
+                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Nasional';
+            }elseif($kuesioner->level == 4){
+                $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
+            }
+
+            if(($kuesioner->level+1) == 1){
+                $jenis_usulan = 'Adiwiyata Kab/Kota';
+            }elseif(($kuesioner->level+1) == 2){
+                $jenis_usulan = 'Adiwiyata Provinsi';
+            }elseif(($kuesioner->level+1) == 3){
+                $jenis_usulan = 'Adiwiyata Nasional';
+            }elseif(($kuesioner->level+1) == 4){
+                $jenis_usulan = 'Adiwiyata Mandiri';
+            }
+
             $penilaian = '';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge bg-secondary text-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'</span></br>';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+            if(($kuesioner->level+1) == 1){
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+            }
+            if(($kuesioner->level+1) == 2){
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
+            }
 
             $_data[] = [
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->npsn,
                 'nama'              => $row->nama_sekolah,
-                'status_level'      => '<span class="badge badge-success">Level '.levelAdiwiyata($row->npsn).'</span>',
+                'status_level'      => '<span class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->kabupaten->name,
                 'tanggal_level'     => '-',
                 'penghargaan'       => $penghargaan,

database/migrations/2025_04_17_092708_create_s_k_s_table.php

@@ -13,6 +13,7 @@ return new class extends Migration
     {
         Schema::create('sk', function (Blueprint $table) {
             $table->id('SkId');
+            $table->string('nomor_sk')->nullable();
             $table->string('nama')->nullable();
             $table->json('sekolah');
             $table->year('tahun');

public/assets/css/app.bundle.css

@@ -610,7 +610,7 @@ RESULT:
 :root {
   --theme-primary: #2164b3;
   --theme-secondary: #868e96;
-  --theme-success: #12a680;
+  --theme-success: #22c55e;
   --theme-info: #2196F3;
   --theme-warning: #ffc241;
   --theme-danger: #B82132;
@@ -631,9 +631,9 @@ RESULT:
   --theme-success-200: #4de5d5;
   --theme-success-300: #37e2d0;
   --theme-success-400: #21dfcb;
-  --theme-success-500: #12a680;
+  --theme-success-500: #22c55e;
   --theme-success-600: #1ab3a3;
-  --theme-success-700: #12a680;
+  --theme-success-700: #22c55e;
   --theme-success-800: #13867a;
   --theme-success-900: #107066;
   --theme-info-50: #9acffa;
@@ -2991,8 +2991,8 @@ html body {
         }
 
 .btn-success {
-/*  -webkit-box-shadow: #12a680;*/
+/*  -webkit-box-shadow: #22c55e;*/
-/*          box-shadow: #12a680; */
+/*          box-shadow: #22c55e; */
         }
 
 .btn-info {
@@ -3439,7 +3439,7 @@ html body {
   .chat-segment-sent.chat-end .chat-message {
     border-top-right-radius: 3px; }
   .chat-segment-sent .chat-message {
-    background: #12a680;
+    background: #22c55e;
     color: white;
     text-align: left; }
 
@@ -3752,7 +3752,7 @@ html body {
 .panel-tag {
   padding: 1rem 1rem;
   margin-bottom: 2rem;
-  border-left: 3px solid #12a680;
+  border-left: 3px solid #22c55e;
   background: #eef7fd;
   opacity: 0.8;
   font-weight: 400;
@@ -3888,7 +3888,7 @@ html body {
     .panel-toolbar .btn-panel:hover {
       opacity: 1; }
     .panel-toolbar .btn-panel[data-action="panel-collapse"], .panel-toolbar .btn-panel.js-panel-collapse {
-      background: #12a680; }
+      background: #22c55e; }
     .panel-toolbar .btn-panel[data-action="panel-fullscreen"], .panel-toolbar .btn-panel.js-panel-fullscreen {
       background: #ffc241; }
     .panel-toolbar .btn-panel[data-action="panel-close"], .panel-toolbar .btn-panel.js-panel-close {
@@ -5233,7 +5233,7 @@ span.img-share {
     top: 0;
     right: 0; }
   .status.status-success:before {
-    background: #12a680; }
+    background: #22c55e; }
   .status.status-danger:before {
     background: #B82132; }
   .status.status-warning:before {
@@ -7194,7 +7194,7 @@ html:not(.root-text-sm):not(.root-text-lg):not(.root-text-xl) [data-class="root-
     color: rgba(0, 0, 0, 0.8); }
 
 .bg-success-500 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-500:hover {
     color: white; }
@@ -7206,7 +7206,7 @@ html:not(.root-text-sm):not(.root-text-lg):not(.root-text-xl) [data-class="root-
     color: white; }
 
 .bg-success-700 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-700:hover {
     color: white; }
@@ -7239,13 +7239,13 @@ html:not(.root-text-sm):not(.root-text-lg):not(.root-text-xl) [data-class="root-
   color: #21dfcb; }
 
 .color-success-500 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-600 {
   color: #1ab3a3; }
 
 .color-success-700 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-800 {
   color: #13867a; }

public/assets/css/custom.css

@@ -0,0 +1,205 @@
+.wrap th, 
+.wrap td {
+    max-width: 100%; /* Sesuaikan max-width kolom */
+}
+.wrap td span {
+    white-space: normal !important; /* Pastikan teks bisa wrap */
+    word-wrap: break-word; /* Bungkus kata yang panjang */
+}
+.nav-link{
+        border-radius: 0px!important;
+    }
+.pageNumber{ list-style:none; padding:0px; margin: 0px;}
+    .pageNumber .page{ display: inline-block; padding: 10px;}
+    .pageNumber .page:hover,.resume:hover,.progress_usulan:hover{cursor: pointer!important;}
+    .page.active {
+        background-color: #007bff; /* Warna biru */
+        color: white;
+        font-weight: bold;
+    }
+.nav-tabs{
+	border-bottom: none;
+}
+.nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link{
+	border: none;
+	color: #4796f1!important;
+	border-bottom: 2px solid #4796f1!important;
+}
+.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus{
+	border: none;
+}
+.card{
+	border-radius: 8px!important;
+	border:none!important ;
+	box-shadow: 0px 1px 2px 0px #0000000D!important;
+}
+.liststyle{
+	list-style: none;
+	padding: 0px;
+}
+.liststyle > li{
+	padding: 2px;
+/*	background: #000;*/
+	margin: 3px;
+}
+.f20{
+	font-size: 20px;
+}
+.f12{
+	font-size: 12px;
+}
+.f14{
+	font-size: 14px;
+}
+.f16{
+	font-size: 16px;
+}
+.f18{
+	font-size: 18px;
+}
+.subheader{margin-bottom: 20px;}
+
+.table-bordered th, .table-bordered td{border: none!important;}
+.table-bordered{border: none;}
+.table-hover tbody tr:hover{box-shadow: none;}
+/* Color */
+.border-success{
+	border: 1px solid #1f6c3c!important;
+}
+.border-left-primary{
+	border-left: 5px solid #4765c0!important;
+}
+.border-left-primary-light{
+	border-left: 5px solid #dbeafe!important;
+}
+.border-primary{
+	border: 1px solid #4765c0!important;
+}
+.border-secondary{
+	border: 1px solid #D0D0D0!important;
+}
+.text-success{
+	color: #1f6c3c!important;
+}
+.text-primary{
+	color: #4765c0!important;
+}
+.bg-secondary{
+	background: #F3F4F6!important;
+}
+.border-left-success{
+	border-left: 5px solid #1f6c3c!important;
+}
+.border-left-success-light{
+	border-left: 5px solid #dcfce7!important;
+}
+.bg-success{
+	background: #1f6c3c!important;
+}
+.bg-success-light{
+	background: #dcfce7;
+}
+.bg-primary{
+	background: #4765c0!important;
+}
+.bg-primary-light{
+	background: #dbeafe;
+}
+.text-primary-light{
+	color: #dbeafe;
+}
+.border-left-white{
+	border-left: 5px solid #fff!important;
+}
+.border-left-info{
+	border-left: 5px solid #9333ea!important;
+}
+.border-left-info-light{
+	border-left: 5px solid #f3e8ff!important;
+}
+.text-info{
+	color: #9333ea!important;
+}
+.bg-info{
+	background: #9333ea!important;
+}
+.bg-info-light{
+	background: #f3e8ff;
+}
+.border-left-warning{
+	border-left: 5px solid #ca8a04!important;
+}
+.border-left-warning-light{
+	border-left: 5px solid #fef9c3!important;
+}
+.text-warning{
+	color: #ca8a04!important;
+}
+.bg-warning{
+	background: #ca8a04!important;
+}
+.bg-warning-light{
+	background: #fef9c3;
+}
+.bg-danger-light{
+	background: #fc6a6a;
+}
+.text-danger{
+	color: #7D0A0A!important;
+}
+.btn-primary{
+	background: #4765c0;
+/*	border: 1px solid #4796f1;*/
+	border: none;
+}
+.btn-success{
+	border: none;
+	background: #1f6c3c!important;
+}
+/* Color */
+
+.page-content-wrapper{
+	background: #f3f4f6!important;
+}
+.border-none{
+	border:none;
+}
+.bg-success-icon > i {
+	font-size: 16px;
+}
+
+.broder-top{
+	border-top: 1px solid #e5e7eb;
+}
+.broder-bottom{
+	border-bottom: 1px solid #e5e7eb;
+}
+.nav-menu li a > [class*="fa-"], .nav-menu li a > .ni{
+	color: #4b5563;
+}
+.nav-menu li a > .nav-link-text{
+	color: #4b5563;
+}
+.nav-menu li > ul{
+	background-color:#d1d5db;
+}
+.nav-menu li > ul li.active > a{
+	color: #4796f1;
+  	background-color: #e7f2fd;
+}
+.nav-menu li.active > a{
+	color: #4796f1;
+  	background-color: #e7f2fd;
+}
+.nav-menu li.active > a:hover span{
+	color: #4796f1;
+}
+.nav-menu li.active > a > .nav-link-text{
+	color: #4796f1;
+}
+.nav-menu li.active > a:hover i{
+	color: #4796f1!important;
+}
+.nav-menu li.active > a > [class*="fa-"], .nav-menu li a > .ni{
+	color: #4796f1;
+}

public/assets/css/datagrid/datatables/datatables.bundle.css

@@ -1204,7 +1204,7 @@ table.dataTable.dtr-inline.collapsed > tbody > tr.parent > td:first-child:before
 table.dataTable.dtr-inline.collapsed > tbody > tr.parent > th:first-child:before,
 table.dataTable.dtr-column > tbody > tr.parent td.control:before,
 table.dataTable.dtr-column > tbody > tr.parent th.control:before {
-  background-color: #12a680; }
+  background-color: #22c55e; }
 
 table.dataTable thead .sorting:before,
 table.dataTable thead .sorting_asc:before,
@@ -1375,7 +1375,7 @@ table.dataTable td.reorder {
   text-align: inherit; }
 
 tr.dt-rowReorder-moving {
-  outline: 2px solid #12a680;
+  outline: 2px solid #22c55e;
   outline-offset: -2px; }
 
 table.dt-rowReorder-float {

public/assets/css/formplugins/ion-rangeslider/ion-rangeslider.css

@@ -1103,12 +1103,12 @@ RESULT:
 .irs--modern .irs-from,
 .irs--modern .irs-to,
 .irs--modern .irs-single {
-  background-color: #12a680; }
+  background-color: #22c55e; }
 
 .irs--modern .irs-from:before,
 .irs--modern .irs-to:before,
 .irs--modern .irs-single:before {
-  border-top-color: #12a680; }
+  border-top-color: #22c55e; }
 
 .irs--modern .irs-handle > i:nth-child(1) {
   width: 8px;

public/assets/css/notifications/sweetalert2/sweetalert2.bundle.css

@@ -593,7 +593,7 @@ body.swal2-toast-column .swal2-toast {
       -webkit-box-shadow: 0 0 0 0.0625em #fff, 0 0 0 0.125em rgba(50, 100, 150, 0.4);
               box-shadow: 0 0 0 0.0625em #fff, 0 0 0 0.125em rgba(50, 100, 150, 0.4); }
   .swal2-popup.swal2-toast .swal2-success {
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .swal2-popup.swal2-toast .swal2-success [class^='swal2-success-circular-line'] {
       position: absolute;
       width: 1.6em;
@@ -1402,7 +1402,7 @@ body.swal2-no-backdrop .swal2-shown {
     .swal2-icon.swal2-question.swal2-arabic-question-mark::before {
       content: '؟'; }
   .swal2-icon.swal2-success {
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .swal2-icon.swal2-success [class^='swal2-success-circular-line'] {
       position: absolute;
       width: 3.75em;
@@ -1452,7 +1452,7 @@ body.swal2-no-backdrop .swal2-shown {
       z-index: 2;
       height: .3125em;
       border-radius: .125em;
-      background-color: #12a680; }
+      background-color: #22c55e; }
       .swal2-icon.swal2-success [class^='swal2-success-line'][class$='tip'] {
         top: 2.875em;
         left: .875em;

public/assets/css/statistics/chartist/chartist.css

@@ -402,10 +402,10 @@ $ct-donut-width: 60px !default;
   fill: #505050; }
 
 .ct-series-f .ct-point, .ct-series-f .ct-line, .ct-series-f .ct-bar, .ct-series-f .ct-slice-donut {
-  stroke: #12a680; }
+  stroke: #22c55e; }
 
 .ct-series-f .ct-slice-pie, .ct-series-f .ct-slice-donut-solid, .ct-series-f .ct-area {
-  fill: #12a680; }
+  fill: #22c55e; }
 
 .ct-series-g .ct-point, .ct-series-g .ct-line, .ct-series-g .ct-bar, .ct-series-g .ct-slice-donut {
   stroke: #2196F3; }

public/assets/css/themes/cust-theme-2.css

@@ -766,8 +766,8 @@ html body {
           box-shadow: 0 2px 6px 0 rgba(108, 117, 125, 0.5); }
 
 .btn-success {
-  -webkit-box-shadow: #12a680;
+  -webkit-box-shadow: #22c55e;
-          box-shadow: #12a680; }
+          box-shadow: #22c55e; }
 
 .btn-info {
   -webkit-box-shadow: 0 2px 6px 0 rgba(33, 150, 243, 0.5);
@@ -821,7 +821,7 @@ html body {
   background: #f1f0f0; }
 
 .chat-segment-sent .chat-message {
-  background: #12a680; }
+  background: #22c55e; }
 
 /* transparent modal */
 .modal-transparent .modal-content {
@@ -875,7 +875,7 @@ html body {
 .panel-toolbar .btn-panel {
   /* add default colors for action buttons */ }
   .panel-toolbar .btn-panel[data-action="panel-collapse"], .panel-toolbar .btn-panel.js-panel-collapse {
-    background: #12a680; }
+    background: #22c55e; }
   .panel-toolbar .btn-panel[data-action="panel-fullscreen"], .panel-toolbar .btn-panel.js-panel-fullscreen {
     background: #ffc241; }
   .panel-toolbar .btn-panel[data-action="panel-close"], .panel-toolbar .btn-panel.js-panel-close {
@@ -1010,7 +1010,7 @@ label.menu-open-button {
     background: #444444;
     border: 2px solid #fff; }
   .status.status-success:before {
-    background: #12a680; }
+    background: #22c55e; }
   .status.status-danger:before {
     background: #B82132; }
   .status.status-warning:before {
@@ -1290,7 +1290,7 @@ code {
     color: rgba(0, 0, 0, 0.8); }
 
 .bg-success-500 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-500:hover {
     color: white; }
@@ -1302,7 +1302,7 @@ code {
     color: white; }
 
 .bg-success-700 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-700:hover {
     color: white; }
@@ -1335,13 +1335,13 @@ code {
   color: #21dfcb; }
 
 .color-success-500 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-600 {
   color: #1ab3a3; }
 
 .color-success-700 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-800 {
   color: #13867a; }
@@ -1789,30 +1789,30 @@ code {
 
 .btn-success {
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
-  border-color: #12a680;
+  border-color: #22c55e;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); }
   .btn-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:focus, .btn-success.focus {
-    -webkit-box-shadow: #12a680;
+    -webkit-box-shadow: #22c55e;
-            box-shadow: #12a680; }
+            box-shadow: #22c55e; }
   .btn-success.disabled, .btn-success:disabled {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
   .show > .btn-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
     border-color: #159184; }
     .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-success.dropdown-toggle:focus {
-      -webkit-box-shadow: #12a680;
+      -webkit-box-shadow: #22c55e;
-              box-shadow: #12a680; }
+              box-shadow: #22c55e; }
 
 .btn-info {
   color: #fff;
@@ -1996,23 +1996,23 @@ code {
               box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); }
 
 .btn-outline-success {
-  color: #12a680;
+  color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-outline-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-outline-success:focus, .btn-outline-success.focus {
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5); }
   .btn-outline-success.disabled, .btn-outline-success:disabled {
-    color: #12a680;
+    color: #22c55e;
     background-color: transparent; }
   .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
   .show > .btn-outline-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-outline-success.dropdown-toggle:focus {
       -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -2140,7 +2140,7 @@ code {
   border-color: #6c757d !important; }
 
 .border-success {
-  border-color: #12a680 !important; }
+  border-color: #22c55e !important; }
 
 .border-info {
   border-color: #2196F3 !important; }
@@ -2170,7 +2170,7 @@ a.text-secondary:hover, a.text-secondary:focus {
   color: #494f54 !important; }
 
 .text-success {
-  color: #12a680 !important; }
+  color: #22c55e !important; }
 
 a.text-success:hover, a.text-success:focus {
   color: #13867a !important; }

public/assets/css/themes/cust-theme-3.css

@@ -766,8 +766,8 @@ html body {
           box-shadow: 0 2px 6px 0 rgba(108, 117, 125, 0.5); }
 
 .btn-success {
-  -webkit-box-shadow: #12a680;
+  -webkit-box-shadow: #22c55e;
-          box-shadow: #12a680; }
+          box-shadow: #22c55e; }
 
 .btn-info {
   -webkit-box-shadow: 0 2px 6px 0 rgba(33, 150, 243, 0.5);
@@ -821,7 +821,7 @@ html body {
   background: #f1f0f0; }
 
 .chat-segment-sent .chat-message {
-  background: #12a680; }
+  background: #22c55e; }
 
 /* transparent modal */
 .modal-transparent .modal-content {
@@ -875,7 +875,7 @@ html body {
 .panel-toolbar .btn-panel {
   /* add default colors for action buttons */ }
   .panel-toolbar .btn-panel[data-action="panel-collapse"], .panel-toolbar .btn-panel.js-panel-collapse {
-    background: #12a680; }
+    background: #22c55e; }
   .panel-toolbar .btn-panel[data-action="panel-fullscreen"], .panel-toolbar .btn-panel.js-panel-fullscreen {
     background: #ffc241; }
   .panel-toolbar .btn-panel[data-action="panel-close"], .panel-toolbar .btn-panel.js-panel-close {
@@ -1010,7 +1010,7 @@ label.menu-open-button {
     background: #494949;
     border: 2px solid #fff; }
   .status.status-success:before {
-    background: #12a680; }
+    background: #22c55e; }
   .status.status-danger:before {
     background: #B82132; }
   .status.status-warning:before {
@@ -1290,7 +1290,7 @@ code {
     color: rgba(0, 0, 0, 0.8); }
 
 .bg-success-500 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-500:hover {
     color: white; }
@@ -1302,7 +1302,7 @@ code {
     color: white; }
 
 .bg-success-700 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-700:hover {
     color: white; }
@@ -1335,13 +1335,13 @@ code {
   color: #21dfcb; }
 
 .color-success-500 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-600 {
   color: #1ab3a3; }
 
 .color-success-700 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-800 {
   color: #13867a; }
@@ -1789,30 +1789,30 @@ code {
 
 .btn-success {
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
-  border-color: #12a680;
+  border-color: #22c55e;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); }
   .btn-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:focus, .btn-success.focus {
-    -webkit-box-shadow: #12a680;
+    -webkit-box-shadow: #22c55e;
-            box-shadow: #12a680; }
+            box-shadow: #22c55e; }
   .btn-success.disabled, .btn-success:disabled {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
   .show > .btn-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
     border-color: #159184; }
     .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-success.dropdown-toggle:focus {
-      -webkit-box-shadow: #12a680;
+      -webkit-box-shadow: #22c55e;
-              box-shadow: #12a680; }
+              box-shadow: #22c55e; }
 
 .btn-info {
   color: #fff;
@@ -1996,23 +1996,23 @@ code {
               box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); }
 
 .btn-outline-success {
-  color: #12a680;
+  color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-outline-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-outline-success:focus, .btn-outline-success.focus {
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5); }
   .btn-outline-success.disabled, .btn-outline-success:disabled {
-    color: #12a680;
+    color: #22c55e;
     background-color: transparent; }
   .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
   .show > .btn-outline-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-outline-success.dropdown-toggle:focus {
       -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -2140,7 +2140,7 @@ code {
   border-color: #6c757d !important; }
 
 .border-success {
-  border-color: #12a680 !important; }
+  border-color: #22c55e !important; }
 
 .border-info {
   border-color: #2196F3 !important; }
@@ -2170,7 +2170,7 @@ a.text-secondary:hover, a.text-secondary:focus {
   color: #494f54 !important; }
 
 .text-success {
-  color: #12a680 !important; }
+  color: #22c55e !important; }
 
 a.text-success:hover, a.text-success:focus {
   color: #13867a !important; }

public/assets/css/themes/cust-theme-6.css

@@ -766,8 +766,8 @@ html body {
           box-shadow: 0 2px 6px 0 rgba(108, 117, 125, 0.5); }
 
 .btn-success {
-  -webkit-box-shadow: #12a680;
+  -webkit-box-shadow: #22c55e;
-          box-shadow: #12a680; }
+          box-shadow: #22c55e; }
 
 .btn-info {
   -webkit-box-shadow: 0 2px 6px 0 rgba(33, 150, 243, 0.5);
@@ -821,7 +821,7 @@ html body {
   background: #f1f0f0; }
 
 .chat-segment-sent .chat-message {
-  background: #12a680; }
+  background: #22c55e; }
 
 /* transparent modal */
 .modal-transparent .modal-content {
@@ -875,7 +875,7 @@ html body {
 .panel-toolbar .btn-panel {
   /* add default colors for action buttons */ }
   .panel-toolbar .btn-panel[data-action="panel-collapse"], .panel-toolbar .btn-panel.js-panel-collapse {
-    background: #12a680; }
+    background: #22c55e; }
   .panel-toolbar .btn-panel[data-action="panel-fullscreen"], .panel-toolbar .btn-panel.js-panel-fullscreen {
     background: #ffc241; }
   .panel-toolbar .btn-panel[data-action="panel-close"], .panel-toolbar .btn-panel.js-panel-close {
@@ -1010,7 +1010,7 @@ label.menu-open-button {
     background: #585858;
     border: 2px solid #fff; }
   .status.status-success:before {
-    background: #12a680; }
+    background: #22c55e; }
   .status.status-danger:before {
     background: #B82132; }
   .status.status-warning:before {
@@ -1290,7 +1290,7 @@ code {
     color: rgba(0, 0, 0, 0.8); }
 
 .bg-success-500 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-500:hover {
     color: white; }
@@ -1302,7 +1302,7 @@ code {
     color: white; }
 
 .bg-success-700 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-700:hover {
     color: white; }
@@ -1335,13 +1335,13 @@ code {
   color: #21dfcb; }
 
 .color-success-500 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-600 {
   color: #1ab3a3; }
 
 .color-success-700 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-800 {
   color: #13867a; }
@@ -1789,30 +1789,30 @@ code {
 
 .btn-success {
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
-  border-color: #12a680;
+  border-color: #22c55e;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); }
   .btn-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:focus, .btn-success.focus {
-    -webkit-box-shadow: #12a680;
+    -webkit-box-shadow: #22c55e;
-            box-shadow: #12a680; }
+            box-shadow: #22c55e; }
   .btn-success.disabled, .btn-success:disabled {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
   .show > .btn-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
     border-color: #159184; }
     .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-success.dropdown-toggle:focus {
-      -webkit-box-shadow: #12a680;
+      -webkit-box-shadow: #22c55e;
-              box-shadow: #12a680; }
+              box-shadow: #22c55e; }
 
 .btn-info {
   color: #fff;
@@ -1996,23 +1996,23 @@ code {
               box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); }
 
 .btn-outline-success {
-  color: #12a680;
+  color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-outline-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-outline-success:focus, .btn-outline-success.focus {
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5); }
   .btn-outline-success.disabled, .btn-outline-success:disabled {
-    color: #12a680;
+    color: #22c55e;
     background-color: transparent; }
   .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
   .show > .btn-outline-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-outline-success.dropdown-toggle:focus {
       -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -2140,7 +2140,7 @@ code {
   border-color: #6c757d !important; }
 
 .border-success {
-  border-color: #12a680 !important; }
+  border-color: #22c55e !important; }
 
 .border-info {
   border-color: #2196F3 !important; }
@@ -2170,7 +2170,7 @@ a.text-secondary:hover, a.text-secondary:focus {
   color: #494f54 !important; }
 
 .text-success {
-  color: #12a680 !important; }
+  color: #22c55e !important; }
 
 a.text-success:hover, a.text-success:focus {
   color: #13867a !important; }

public/assets/css/themes/cust-theme-7.css

@@ -766,8 +766,8 @@ html body {
           box-shadow: 0 2px 6px 0 rgba(108, 117, 125, 0.5); }
 
 .btn-success {
-  -webkit-box-shadow: #12a680;
+  -webkit-box-shadow: #22c55e;
-          box-shadow: #12a680; }
+          box-shadow: #22c55e; }
 
 .btn-info {
   -webkit-box-shadow: 0 2px 6px 0 rgba(33, 150, 243, 0.5);
@@ -821,7 +821,7 @@ html body {
   background: #f1f0f0; }
 
 .chat-segment-sent .chat-message {
-  background: #12a680; }
+  background: #22c55e; }
 
 /* transparent modal */
 .modal-transparent .modal-content {
@@ -875,7 +875,7 @@ html body {
 .panel-toolbar .btn-panel {
   /* add default colors for action buttons */ }
   .panel-toolbar .btn-panel[data-action="panel-collapse"], .panel-toolbar .btn-panel.js-panel-collapse {
-    background: #12a680; }
+    background: #22c55e; }
   .panel-toolbar .btn-panel[data-action="panel-fullscreen"], .panel-toolbar .btn-panel.js-panel-fullscreen {
     background: #ffc241; }
   .panel-toolbar .btn-panel[data-action="panel-close"], .panel-toolbar .btn-panel.js-panel-close {
@@ -1010,7 +1010,7 @@ label.menu-open-button {
     background: #4e4e4e;
     border: 2px solid #fff; }
   .status.status-success:before {
-    background: #12a680; }
+    background: #22c55e; }
   .status.status-danger:before {
     background: #b57d6a; }
   .status.status-warning:before {
@@ -1290,7 +1290,7 @@ code {
     color: rgba(0, 0, 0, 0.8); }
 
 .bg-success-500 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-500:hover {
     color: white; }
@@ -1302,7 +1302,7 @@ code {
     color: white; }
 
 .bg-success-700 {
-  background-color: #12a680;
+  background-color: #22c55e;
   color: white; }
   .bg-success-700:hover {
     color: white; }
@@ -1335,13 +1335,13 @@ code {
   color: #21dfcb; }
 
 .color-success-500 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-600 {
   color: #1ab3a3; }
 
 .color-success-700 {
-  color: #12a680; }
+  color: #22c55e; }
 
 .color-success-800 {
   color: #13867a; }
@@ -1789,30 +1789,30 @@ code {
 
 .btn-success {
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
-  border-color: #12a680;
+  border-color: #22c55e;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); }
   .btn-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:focus, .btn-success.focus {
-    -webkit-box-shadow: #12a680;
+    -webkit-box-shadow: #22c55e;
-            box-shadow: #12a680; }
+            box-shadow: #22c55e; }
   .btn-success.disabled, .btn-success:disabled {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
   .show > .btn-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
     border-color: #159184; }
     .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-success.dropdown-toggle:focus {
-      -webkit-box-shadow: #12a680;
+      -webkit-box-shadow: #22c55e;
-              box-shadow: #12a680; }
+              box-shadow: #22c55e; }
 
 .btn-info {
   color: #fff;
@@ -1996,23 +1996,23 @@ code {
               box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5); }
 
 .btn-outline-success {
-  color: #12a680;
+  color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-outline-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-outline-success:focus, .btn-outline-success.focus {
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5); }
   .btn-outline-success.disabled, .btn-outline-success:disabled {
-    color: #12a680;
+    color: #22c55e;
     background-color: transparent; }
   .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
   .show > .btn-outline-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-outline-success.dropdown-toggle:focus {
       -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -2140,7 +2140,7 @@ code {
   border-color: #6c757d !important; }
 
 .border-success {
-  border-color: #12a680 !important; }
+  border-color: #22c55e !important; }
 
 .border-info {
   border-color: #2196F3 !important; }
@@ -2170,7 +2170,7 @@ a.text-secondary:hover, a.text-secondary:focus {
   color: #494f54 !important; }
 
 .text-success {
-  color: #12a680 !important; }
+  color: #22c55e !important; }
 
 a.text-success:hover, a.text-success:focus {
   color: #13867a !important; }

public/assets/css/vendors.bundle.css

@@ -210,7 +210,7 @@ aside.page-sidebar ($nav-width, $nav-background)
   --red: #B82132;
   --orange: #ffc241;
   --yellow: #ffc241;
-  --green: #12a680;
+  --green: #22c55e;
   --teal: #20c997;
   --cyan: #17a2b8;
   --white: #fff;
@@ -218,7 +218,7 @@ aside.page-sidebar ($nav-width, $nav-background)
   --gray-dark: #495057;
   --primary: #2164b3;
   --secondary: #868e96;
-  --success: #12a680;
+  --success: #22c55e;
   --info: #2196F3;
   --warning: #ffc241;
   --danger: #B82132;
@@ -1951,7 +1951,7 @@ textarea.form-control {
   width: 100%;
   margin-top: 0.25rem;
   font-size: 80%;
-  color: #12a680; }
+  color: #22c55e; }
 
 .valid-tooltip {
   position: absolute;
@@ -1964,18 +1964,18 @@ textarea.form-control {
   font-size: 0.75rem;
   line-height: 1.47;
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
   border-radius: 5px; }
 
 .was-validated .form-control:valid, .form-control.is-valid {
-  border-color: #12a680;
+  border-color: #22c55e;
   padding-right: calc(1.47em + 1rem);
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%231dc9b7' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
   background-position: center right calc(0.3675em + 0.25rem);
   background-size: calc(0.735em + 0.5rem) calc(0.735em + 0.5rem); }
   .was-validated .form-control:valid:focus, .form-control.is-valid:focus {
-    border-color: #12a680;
+    border-color: #22c55e;
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25); }
   .was-validated .form-control:valid ~ .valid-feedback,
@@ -1988,11 +1988,11 @@ textarea.form-control {
   background-position: top calc(0.3675em + 0.25rem) right calc(0.3675em + 0.25rem); }
 
 .was-validated .custom-select:valid, .custom-select.is-valid {
-  border-color: #12a680;
+  border-color: #22c55e;
   padding-right: calc((1em + 1rem) * 3 / 4 + 1.875rem);
   background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.875rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%231dc9b7' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.875rem/calc(0.735em + 0.5rem) calc(0.735em + 0.5rem); }
   .was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
-    border-color: #12a680;
+    border-color: #22c55e;
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25); }
   .was-validated .custom-select:valid ~ .valid-feedback,
@@ -2006,7 +2006,7 @@ textarea.form-control {
   display: block; }
 
 .was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
-  color: #12a680; }
+  color: #22c55e; }
 
 .was-validated .form-check-input:valid ~ .valid-feedback,
 .was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback,
@@ -2014,9 +2014,9 @@ textarea.form-control {
   display: block; }
 
 .was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {
-  color: #12a680; }
+  color: #22c55e; }
   .was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {
-    border-color: #12a680; }
+    border-color: #22c55e; }
 
 .was-validated .custom-control-input:valid ~ .valid-feedback,
 .was-validated .custom-control-input:valid ~ .valid-tooltip, .custom-control-input.is-valid ~ .valid-feedback,
@@ -2032,10 +2032,10 @@ textarea.form-control {
           box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25); }
 
 .was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {
-  border-color: #12a680; }
+  border-color: #22c55e; }
 
 .was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {
-  border-color: #12a680; }
+  border-color: #22c55e; }
 
 .was-validated .custom-file-input:valid ~ .valid-feedback,
 .was-validated .custom-file-input:valid ~ .valid-tooltip, .custom-file-input.is-valid ~ .valid-feedback,
@@ -2043,7 +2043,7 @@ textarea.form-control {
   display: block; }
 
 .was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {
-  border-color: #12a680;
+  border-color: #22c55e;
   -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25);
           box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.25); }
 
@@ -2312,28 +2312,28 @@ fieldset:disabled a.btn {
 
 .btn-success {
   color: #fff;
-  background-color: #12a680;
+  background-color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:focus, .btn-success.focus {
-    -webkit-box-shadow: #12a680;
+    -webkit-box-shadow: #22c55e;
-            box-shadow: #12a680; }
+            box-shadow: #22c55e; }
   .btn-success.disabled, .btn-success:disabled {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
   .show > .btn-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
     border-color: #159184; }
     .btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-success.dropdown-toggle:focus {
-      -webkit-box-shadow: #12a680;
+      -webkit-box-shadow: #22c55e;
-              box-shadow: #12a680; }
+              box-shadow: #22c55e; }
 
 .btn-info {
   color: #fff;
@@ -2507,23 +2507,23 @@ fieldset:disabled a.btn {
               box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5); }
 
 .btn-outline-success {
-  color: #12a680;
+  color: #22c55e;
-  border-color: #12a680; }
+  border-color: #22c55e; }
   .btn-outline-success:hover {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
   .btn-outline-success:focus, .btn-outline-success.focus {
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
             box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5); }
   .btn-outline-success.disabled, .btn-outline-success:disabled {
-    color: #12a680;
+    color: #22c55e;
     background-color: transparent; }
   .btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
   .show > .btn-outline-success.dropdown-toggle {
     color: #fff;
-    background-color: #12a680;
+    background-color: #22c55e;
-    border-color: #12a680; }
+    border-color: #22c55e; }
     .btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
     .show > .btn-outline-success.dropdown-toggle:focus {
       -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -4276,10 +4276,10 @@ input[type="button"].btn-block {
 
 .badge-success {
   color: #fff;
-  background-color: #12a680; }
+  background-color: #22c55e; }
   a.badge-success:hover, a.badge-success:focus {
     color: #fff;
-    background-color: #12a680; }
+    background-color: #22c55e; }
   a.badge-success:focus, a.badge-success.focus {
     outline: 0;
     -webkit-box-shadow: 0 0 0 0.2rem rgba(29, 201, 183, 0.5);
@@ -5460,12 +5460,12 @@ button.bg-secondary:focus {
   background-color: #6c757d !important; }
 
 .bg-success {
-  background-color: #12a680 !important; }
+  background-color: #22c55e !important; }
 
 a.bg-success:hover, a.bg-success:focus,
 button.bg-success:hover,
 button.bg-success:focus {
-  background-color: #12a680 !important; }
+  background-color: #22c55e !important; }
 
 .bg-info {
   background-color: #2196F3 !important; }
@@ -5550,7 +5550,7 @@ button.bg-dark:focus {
   border-color: #868e96 !important; }
 
 .border-success {
-  border-color: #12a680 !important; }
+  border-color: #22c55e !important; }
 
 .border-info {
   border-color: #2196F3 !important; }
@@ -8307,7 +8307,7 @@ a.text-secondary:hover, a.text-secondary:focus {
   color: #60686f !important; }
 
 .text-success {
-  color: #12a680 !important; }
+  color: #22c55e !important; }
 
 a.text-success:hover, a.text-success:focus {
   color: #13867a !important; }
@@ -12169,8 +12169,8 @@ readers do not read off random characters that represent icons */
   font-family: 'Font Awesome 5 Pro';
   font-style: normal;
   font-weight: 300;
-  src: url("../webfonts/fa-light-300.eot");
+  src: url("../webfonts/fa-solid-900.eot");
-  src: url("../webfonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-light-300.woff2") format("woff2"), url("../webfonts/fa-light-300.woff") format("woff"), url("../webfonts/fa-light-300.ttf") format("truetype"), url("../webfonts/fa-light-300.svg#fontawesome") format("svg"); }
+  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
 
 .fal {
   font-family: 'Font Awesome 5 Pro';
@@ -12772,4 +12772,116 @@ readers do not read off random characters that represent icons */
 .ni-users:before {
   content: "\e001"; }
 
+  .gap-0 {
+  gap: 0 !important;
+}
+.gap-1 {
+  gap: 0.25rem !important;
+}
+.gap-2 {
+  gap: 0.5rem !important;
+}
+.gap-3 {
+  gap: 1rem !important;
+}
+.gap-4 {
+  gap: 1.5rem !important;
+}
+.gap-5 {
+  gap: 3rem !important;
+}
+
+.gap-sm-0 {
+    gap: 0 !important;
+  }
+  .gap-sm-1 {
+    gap: 0.25rem !important;
+  }
+  .gap-sm-2 {
+    gap: 0.5rem !important;
+  }
+  .gap-sm-3 {
+    gap: 1rem !important;
+  }
+  .gap-sm-4 {
+    gap: 1.5rem !important;
+  }
+  .gap-sm-5 {
+    gap: 3rem !important;
+  }
+.gap-md-0 {
+    gap: 0 !important;
+  }
+  .gap-md-1 {
+    gap: 0.25rem !important;
+  }
+  .gap-md-2 {
+    gap: 0.5rem !important;
+  }
+  .gap-md-3 {
+    gap: 1rem !important;
+  }
+  .gap-md-4 {
+    gap: 1.5rem !important;
+  }
+  .gap-md-5 {
+    gap: 3rem !important;
+  }
+
+  .gap-lg-0 {
+    gap: 0 !important;
+  }
+  .gap-lg-1 {
+    gap: 0.25rem !important;
+  }
+  .gap-lg-2 {
+    gap: 0.5rem !important;
+  }
+  .gap-lg-3 {
+    gap: 1rem !important;
+  }
+  .gap-lg-4 {
+    gap: 1.5rem !important;
+  }
+  .gap-lg-5 {
+    gap: 3rem !important;
+  }
+
+  .gap-xl-0 {
+    gap: 0 !important;
+  }
+  .gap-xl-1 {
+    gap: 0.25rem !important;
+  }
+  .gap-xl-2 {
+    gap: 0.5rem !important;
+  }
+  .gap-xl-3 {
+    gap: 1rem !important;
+  }
+  .gap-xl-4 {
+    gap: 1.5rem !important;
+  }
+  .gap-xl-5 {
+    gap: 3rem !important;
+  }
+
+  .gap-xxl-0 {
+    gap: 0 !important;
+  }
+  .gap-xxl-1 {
+    gap: 0.25rem !important;
+  }
+  .gap-xxl-2 {
+    gap: 0.5rem !important;
+  }
+  .gap-xxl-3 {
+    gap: 1rem !important;
+  }
+  .gap-xxl-4 {
+    gap: 1.5rem !important;
+  }
+  .gap-xxl-5 {
+    gap: 3rem !important;
+  }
 /*# sourceMappingURL=vendors.bundle.css.map */

public/assets/js/app.bundle.js

@@ -14,9 +14,9 @@ var myapp_get_color = {
 	success_200: '#4de5d5',
 	success_300: '#37e2d0',
 	success_400: '#21dfcb',
-	success_500: '#12a680',
+	success_500: '#22c55e',
 	success_600: '#1ab3a3',
-	success_700: '#12a680',
+	success_700: '#22c55e',
 	success_800: '#13867a',
 	success_900: '#107066',
 	info_50: '#9acffa',

public/assets/src/content/intel/intel_analytics_dashboard/intel_analytics_dashboard.hbs

@@ -151,7 +151,7 @@
 								</span>
 
 								<div class="ml-auto d-inline-flex align-items-center">
-									<div class="sparklines d-inline-flex" sparktype="line" sparkheight="30" sparkwidth="70" sparklinecolor="#12a680" sparkfillcolor="false" sparklinewidth="1" values="5,9,7,3,5,2,5,3,9,6"></div>
+									<div class="sparklines d-inline-flex" sparktype="line" sparkheight="30" sparkwidth="70" sparklinecolor="#22c55e" sparkfillcolor="false" sparklinewidth="1" values="5,9,7,3,5,2,5,3,9,6"></div>
 									<div class="d-inline-flex flex-column small ml-2">
 										<span class="d-inline-block badge badge-info opacity-50 text-center p-1 width-6">76%</span>
 										<span class="d-inline-block badge bg-warning-300 opacity-50 text-center p-1 width-6 mt-1">3%</span>

public/assets/src/content/settings/settings_skin_options/settings_skin_options.hbs

@@ -48,7 +48,7 @@
 				<h4 class="mb-g mt-2 text-center">
 					Skin "<strong>Hematite</strong>" <br> 
 					<small>
-						Change your variables to following: <code>$color-primary: #868e96;</code>, <code>$color-success: #12a680;</code>, <code>$color-info: #2196F3;</code>, <code>$color-warning: #ffc241;</code>, and <code>$color-danger: #b57d6a;</code>
+						Change your variables to following: <code>$color-primary: #868e96;</code>, <code>$color-success: #22c55e;</code>, <code>$color-info: #2196F3;</code>, <code>$color-warning: #ffc241;</code>, and <code>$color-danger: #b57d6a;</code>
 					</small>
 				</h4>
 				<div class="demo-window rounded mb-g shadow-1 m-auto" style="max-width:550px">
@@ -102,7 +102,7 @@
 				<h4 class="mb-g mt-2 text-center">
 					Skin "<strong>Ruby</strong>" <br> 
 					<small>
-						Change your variables to following: <code>$color-primary: #ff58a6;</code>, <code>$color-success: #12a680;</code>, <code>$color-info: #2196F3;</code>, <code>$color-warning: #ffc241;</code>, and <code>$color-danger: #B82132;</code>
+						Change your variables to following: <code>$color-primary: #ff58a6;</code>, <code>$color-success: #22c55e;</code>, <code>$color-info: #2196F3;</code>, <code>$color-warning: #ffc241;</code>, and <code>$color-danger: #B82132;</code>
 					</small>
 				</h4>
 				<div class="demo-window rounded mb-g shadow-1 m-auto" style="max-width:550px">

public/assets/src/content/statistics/statistics_peity/statistics_peity.hbs

@@ -79,7 +79,7 @@
 							</div>
 							<div class="demo d-flex justify-content-center flex-wrap d-sm-block">
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-line" data-peity='{ "fill": false, "stroke": "#12a680", "height": 40, "width": "110", "strokeWidth": 1 }'>5,3,9,6,5,9,7,3,5,2</span>
+									<span class="peity-line" data-peity='{ "fill": false, "stroke": "#22c55e", "height": 40, "width": "110", "strokeWidth": 1 }'>5,3,9,6,5,9,7,3,5,2</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
 									<span class="peity-line" data-peity='{ "fill": false, "stroke": "#B82132", "height": 40, "width": "110", "strokeWidth": 2 }'>0,-3,-6,-4,-5,-4,-7,-3,-5,-2</span>
@@ -110,11 +110,11 @@
 					<div class="panel-container show">
 						<div class="panel-content">									
 							<div class="panel-tag">
-								Example of line with filling. You can add fill by using inserting <code>data-peity='{ "fill": "#12a680" }'</code>
+								Example of line with filling. You can add fill by using inserting <code>data-peity='{ "fill": "#22c55e" }'</code>
 							</div>
 							<div class="demo d-flex justify-content-center flex-wrap d-sm-block">
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-line" data-peity='{ "fill": "#12a680", "stroke": "#12a680", "height": 40, "width": "110" }'>5,3,2,-1,-3,-2,2,3,5,2</span>
+									<span class="peity-line" data-peity='{ "fill": "#22c55e", "stroke": "#22c55e", "height": 40, "width": "110" }'>5,3,2,-1,-3,-2,2,3,5,2</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
 									<span class="peity-line" data-peity='{ "fill": "#fe6bb0", "stroke": "#B82132", "height": 40, "width": "110" }'>1,4,4,7,5,9,10,4,4,7,5,9,10</span>
@@ -156,13 +156,13 @@
 									<span class="peity-bar" data-peity='{ "fill": ["#2164b3","#2164b3","#967bbd","#2164b3"], "height": 40, "width": "110" }'>5,3,9,6,5,9,7,3,5,2</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-bar" data-peity='{ "fill": ["#2164b3","#12a680"], "height": 40, "width": "110" }'>4,-3,-6,-4,-5,-4,7,-3,-5,2</span>
+									<span class="peity-bar" data-peity='{ "fill": ["#2164b3","#22c55e"], "height": 40, "width": "110" }'>4,-3,-6,-4,-5,-4,7,-3,-5,2</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-bar" data-peity='{ "fill": ["#2164b3","#12a680"], "height": 40, "width": "110" }'>0,1,7,6,4,2,3,5,3,4</span>
+									<span class="peity-bar" data-peity='{ "fill": ["#2164b3","#22c55e"], "height": 40, "width": "110" }'>0,1,7,6,4,2,3,5,3,4</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-bar" data-peity='{ "fill": ["#12a680"], "height": 40, "width": "110" }'>0,-1,-7,-6,-4,-2,-3,-5,-3,-4</span>
+									<span class="peity-bar" data-peity='{ "fill": ["#22c55e"], "height": 40, "width": "110" }'>0,-1,-7,-6,-4,-2,-3,-5,-3,-4</span>
 								</div>
 							</div>
 						</div>
@@ -197,7 +197,7 @@
 									<span class="peity-pie" data-peity='{ "fill": ["#21dfcb","#B82132"], "height": 40, "width": "50" }'>5/10</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-pie" data-peity='{ "fill": ["#2164b3","#12a680","#2196F3","#ffc241","#fd52a3","#2164b3","#6ab8f7","#fe85be"], "height": 40, "width": "50" }'>2,3,4,7,9,10,5,6</span>
+									<span class="peity-pie" data-peity='{ "fill": ["#2164b3","#22c55e","#2196F3","#ffc241","#fd52a3","#2164b3","#6ab8f7","#fe85be"], "height": 40, "width": "50" }'>2,3,4,7,9,10,5,6</span>
 								</div>
 							</div>
 						</div>
@@ -236,7 +236,7 @@
 									<span class="peity-donut" data-peity='{ "fill": ["#21dfcb","#B82132"], "height": 40, "width": "50" }'>5/10</span>
 								</div>
 								<div class="p-3 w-auto text-center d-inline-flex border-faded">
-									<span class="peity-donut" data-peity='{ "fill": ["#2164b3","#12a680","#2196F3","#ffc241","#fd52a3","#2164b3","#6ab8f7","#fe85be"], "height": 40, "width": "50" }'>2,3,4,7,9,10,5,6</span>
+									<span class="peity-donut" data-peity='{ "fill": ["#2164b3","#22c55e","#2196F3","#ffc241","#fd52a3","#2164b3","#6ab8f7","#fe85be"], "height": 40, "width": "50" }'>2,3,4,7,9,10,5,6</span>
 								</div>
 							</div>
 						</div>
@@ -323,7 +323,7 @@
 								<span data-peity='{ "fill": ["#B82132", "#f2f2f2"], "innerRadius": 13, "radius": 37 }'>1/7</span>
 								<span data-peity='{ "fill": ["#ffc241", "#f2f2f2"], "innerRadius": 10, "radius": 30 }'>2/7</span>
 								<span data-peity='{ "fill": ["#ffdb8e", "#f2f2f2"], "innerRadius": 20, "radius": 28 }'>3/7</span>
-								<span data-peity='{ "fill": ["#12a680", "#f2f2f2"], "innerRadius": 20, "radius": 25 }'>4/7</span>
+								<span data-peity='{ "fill": ["#22c55e", "#f2f2f2"], "innerRadius": 20, "radius": 25 }'>4/7</span>
 								<span data-peity='{ "fill": ["#2196F3", "#f2f2f2"], "innerRadius": 17, "radius": 21 }'>5/7</span>
 								<span data-peity='{ "fill": ["#2164b3", "#f2f2f2"], "innerRadius": 15, "radius": 18 }'>6/7</span>
 								<span data-peity='{ "fill": ["#5d5d5d", "#f2f2f2"], "innerRadius": 13, "radius": 15 }'>7/7</span>

public/assets/src/content/statistics/statistics_sparkline/statistics_sparkline.hbs

@@ -84,7 +84,7 @@
 										sparkType="line" 
 										sparkHeight="40" 
 										sparkWidth="110" 
-										sparkLineColor="#12a680" 
+										sparkLineColor="#22c55e" 
 										sparkFillColor="false" 
 										sparkLineWidth="2" 
 										values="5,3,9,6,5,9,7,3,5,2"></span>

public/assets/src/js/_get/app.get.colors.js

@@ -14,9 +14,9 @@ var myapp_get_color = {
 	success_200: '#4de5d5',
 	success_300: '#37e2d0',
 	success_400: '#21dfcb',
-	success_500: '#12a680',
+	success_500: '#22c55e',
 	success_600: '#1ab3a3',
-	success_700: '#12a680',
+	success_700: '#22c55e',
 	success_800: '#13867a',
 	success_900: '#107066',
 	info_50: '#9acffa',

public/assets/src/scss/_modules/variables.scss

@@ -2,7 +2,7 @@
 ========================================================================== */
 /* Looks good on chrome default color profile */
 $color-primary:						#2164b3;
-$color-success:						#12a680;
+$color-success:						#22c55e;
 $color-info:						#2196F3;
 $color-warning:						#ffc241;
 $color-danger:						#B82132;

public/assets/src/scss/_themes/_modules/variables.scss

@@ -2,7 +2,7 @@
 ========================================================================== */
 /* Looks good on chrome default color profile */
 $color-primary:						#2164b3 !default;
-$color-success:						#12a680 !default;
+$color-success:						#22c55e !default;
 $color-info:						#2196F3 !default;
 $color-warning:						#ffc241 !default;
 $color-danger:						#B82132 !default;

public/assets/src/scss/_themes/cust-theme-6.scss

@@ -1,7 +1,7 @@
 /* #THEME COLOR (variable overrides)
 ========================================================================== */
 $color-primary: #dd5293;
-$color-success: #12a680; 
+$color-success: #22c55e; 
 $color-info: #2196F3;
 $color-warning: #ffc241; 
 $color-danger: #B82132;

public/assets/src/scss/_themes/cust-theme-7.scss

@@ -1,7 +1,7 @@
 /* #THEME COLOR (variable overrides)
 ========================================================================== */
 $color-primary: #868e96; 
-$color-success: #12a680; 
+$color-success: #22c55e; 
 $color-info: #2196F3; 
 $color-warning: #ffc241; 
 $color-danger: #b57d6a;

resources/views/include/breadcrumbs.blade.php

@@ -0,0 +1,13 @@
+@if(@$breadcrumbs)
+<ol class="breadcrumb page-breadcrumb">
+    @foreach($breadcrumbs as $dataBread)
+    <li class="breadcrumb-item {{@$dataBread['active'] == true ? 'active' : ''}}">
+        @if(@$dataBread['url'])
+        <a href="{{@$dataBread['url']}}">{{$dataBread['name']}}</a>
+        @else
+        {{$dataBread['name']}}
+        @endif
+    </li>
+    @endforeach
+</ol>
+@endif

resources/views/include/header.blade.php

@@ -20,7 +20,7 @@
     <div class="ml-auto d-flex">
         <div>
             <a href="#" data-toggle="dropdown" class="header-icon d-flex align-items-center justify-content-center">
-                <div class="rounded-circle bg-fusion-50 width-3 height-3 d-inline-block bg-secondary d-flex align-items-center justify-content-center">
+                <div class="rounded-circle bg-fusion-50 width-3 height-3 d-inline-block d-flex align-items-center justify-content-center">
                     <i class="fal fa-user fa-1x"></i>
                 </div>
                 <!-- <img src="{{asset('assets/img/demo/avatars/avatar-admin.png')}}" class="profile-image rounded-circle" alt="Administrator"> -->
@@ -29,7 +29,7 @@
                 <div class="dropdown-header d-flex flex-row py-4 rounded-top" style="background: #D9EAFD !important;">
                     <div class="d-flex flex-row align-items-center mt-1 mb-1 color-black">
                         <span class="mr-2">
-                            <div class="rounded-circle bg-fusion-50 width-3 height-3 d-inline-block bg-secondary d-flex align-items-center justify-content-center">
+                            <div class="rounded-circle bg-fusion-50 width-3 height-3 d-inline-block d-flex align-items-center justify-content-center">
                                 <i class="fal fa-user fa-1x"></i>
                             </div>
                             <!-- <img src="{{asset('assets/img/demo/avatars/avatar-admin.png')}}" class="rounded-circle profile-image" alt="Administrator"> -->

resources/views/include/sidebar.blade.php

@@ -1,12 +1,19 @@
 <aside class="page-sidebar">
-    <div class="page-logo">
+    <div class="page-logo broder-bottom">
-        <a href="#" class="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal" data-target="#modal-shortcut">
+        <div class="d-flex flex-row justify-content-center align-items-center">
-            <img src="https://banksampah.jakarta.go.id/images/logo-dinas.ico" alt="Logo" style="width:30px;" aria-roledescription="logo">
+            <div class="">
-            <span class="page-logo-text fw-500 mr-1">Sekolah Adiwiyata</span>
+                <!-- <a href="#" class="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal" data-target="#modal-shortcut"> -->
-        </a>
+                    <img src="https://banksampah.jakarta.go.id/images/logo-dinas.ico" alt="Logo" style="width:35px;" aria-roledescription="logo">
+                <!-- </a>  -->
+            </div>
+            <div class="">
+                <span class="page-logo-text fw-500 mr-1">Adiwiyata</span>
+                <p class="ml-2 mb-0">Provinsi DKI Jakarta</p>
+            </div>
+        </div>
     </div>
     <!-- BEGIN PRIMARY NAVIGATION -->
-    <nav id="js-primary-nav" class="primary-nav" role="navigation">
+    <nav id="js-primary-nav" class="primary-nav bg-white" role="navigation">
         <div class="nav-filter">
             <div class="position-relative">
                 <input type="text" id="nav_filter_input" placeholder="Filter menu" class="form-control" tabindex="0">
@@ -15,27 +22,6 @@
                 </a>
             </div>
         </div>
-        <style type="text/css">
-            .card-sidebar{
-                background: #D9EAFD!important;
-                padding: 20px;
-                text-align: center;
-                border-top: 1px solid #eee;
-                border-bottom: 1px solid #eee;
-            }
-        </style>
-        <div class="card-sidebar d-none">
-                <div class="rounded-circle bg-fusion-50 width-5 height-5 d-inline-block bg-secondary">
-                    <i class="fal fa-user fa-1x mt-3"></i>
-                </div>
-                <br>
-                <br>
-                <span><b>{{session('name')}}</b></span>
-                <br>
-                <span class="badge badge-success">
-                    {{session('group_name')}}
-                </span>
-        </div>
         <ul id="js-nav-menu" class="nav-menu mt-0">
             <li class="{{activeMenuClass('modules.dashboard') ? 'active' : ''}}">
                 <a href="{{url('dashboard')}}" title="Dashboard" data-filter-tags="application intel">
@@ -45,7 +31,7 @@
             </li>
 
             {!! renderMenu() !!}
-            <li>
+            <li class="broder-top">
                 <a href="{{url('logout')}}" title="Logout" data-filter-tags="application intel">
                     <i class="fal fa-sign-out"></i>
                     <span class="nav-link-text" data-i18n="nav.application_intel">Keluar</span>

resources/views/layouts/master.blade.php

@@ -23,6 +23,7 @@
         <link rel="stylesheet" href="{{asset('assets/css/sweetalert.min.css')}}">
         <link rel="stylesheet" href="{{asset('assets/css/toast.min.css')}}">
         <link rel="stylesheet" href="{{asset('assets/css/formplugins/select2/select2.bundle.css')}}">
+        <link rel="stylesheet" href="{{asset('assets/css/custom.css')}}">
         <style type="text/css">
             .table-nobordered td,.table-nobordered th{
                 border: none;
@@ -33,14 +34,7 @@
                 margin: 0px;
             }
 
-            .wrap th, 
+            
-            .wrap td {
-                max-width: 100%; /* Sesuaikan max-width kolom */
-            }
-            .wrap td span {
-                white-space: normal !important; /* Pastikan teks bisa wrap */
-                word-wrap: break-word; /* Bungkus kata yang panjang */
-            }
         </style>
         @yield('page-css')
     </head>
@@ -59,7 +53,7 @@
                     <!-- the #js-page-content id is needed for some plugins to initialize -->
                     <main id="js-page-content" role="main" class="page-content">
                         @include('include.alert')
-                        @yield('breadcrumbs')
+                        @include('include.breadcrumbs')
                         @yield('content')
                     </main>
                     <!-- this overlay is activated only when mobile menu is triggered -->

resources/views/modules/dashboard/admin.blade.php

@@ -6,98 +6,147 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> Dashboard
+        Dashboard
     </h1>
 </div>
-<div class="row">
+<div class="row mb-2">
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-primary-300 rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card border-left-primary">
-            <div class="">
+            <div class="card-body">
-                    <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
-                        {{$total_usulan_kab}}
+                    <div>
-                    </h3>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Kota</span> <br><br>
-                    <span class="m-0 l-h-n">Total Usulan Adiwiyata Kota</span>
+                        <h3 class="f20 fw-700">{{@$total_usulan_kab}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-primary"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n1" style="font-size:6rem"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-warning-300 rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card border-left-success">
-            <div class="">
+            <div class="card-body">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
-                    {{$total_usulan_prov}}
+                    <div>
-                </h3>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Provinsi</span> <br><br>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Provinsi</span>
+                        <h3 class="f20 fw-700">{{@$total_usulan_prov}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-success"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15  mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-success-200 rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card border-left-warning">
-            <div class="">
+            <div class="card-body">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
-                    {{$total_usulan_nasional}}
+                    <div>
-                </h3>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Nasional</span> <br><br>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Nasional</span>
+                        <h3 class="f20 fw-700">{{@$total_usulan_nasional}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-warning"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n5 mr-n6" style="font-size: 8rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-info-200 rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card border-left-info">
-            <div class="">
+            <div class="card-body">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row  justify-content-between align-items-center">
-                    {{$total_usulan_mandiri}}
+                    <div>
-                </h3>
+                        <span class="m-0 l-h-n">Usulan Adiwiyata Mandiri</span> <br><br>
-                <span class="m-0 l-h-n">Total Usulan Adiwiyata Mandiri</span>
+                        <h3 class="f20 fw-700">{{@$total_usulan_mandiri}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-info"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
 </div>
-<div class="row">
+<div class="row mb-2">
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-danger rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card bg-primary text-white">
-            <div class="">
+            <div class="card-body">
-                    <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row justify-content-between align-items-center">
-                        {{@$total_sekolah_kab}}
+                    <div>
-                    </h3>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Kota</span> <br><br>
-                    <span class="m-0 l-h-n">Total Sekolah Adiwiyata Kota</span>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_kab}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-primary"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n1" style="font-size:6rem"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-warning rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card bg-success text-white">
-            <div class="">
+            <div class="card-body">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row justify-content-between align-items-center">
-                    {{@$total_sekolah_prov}}
+                    <div>
-                </h3>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Provinsi</span> <br><br>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Provinsi</span>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_prov}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-success"></i>
+                        </div> 
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-sm-6 col-xl-3">
+        <div class="card bg-warning text-white">
+            <div class="card-body">
+                <div class="d-flex flex-row justify-content-between align-items-center">
+                    <div>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Nasional</span> <br><br>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_nasional}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-warning"></i>
+                        </div> 
+                    </div>
+                </div>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15  mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
     <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-success rounded overflow-hidden position-relative text-white mb-g">
+        <div class="card bg-info text-white">
-            <div class="">
+            <div class="card-body">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
+                <div class="d-flex flex-row justify-content-between align-items-center">
-                    {{@$total_sekolah_nasional}}
+                    <div>
-                </h3>
+                        <span class="m-0 l-h-n">Sekolah Adiwiyata Mandiri</span> <br><br>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Nasional</span>
+                        <h3 class="f20 fw-700">{{@$total_sekolah_mandiri}} <span class="f12 fw-300">Sekolah</span> </h3>
+                    </div>
+                    <div>
+                        <div class="p-2 bg-secondary rounded-circle">
+                            <i class="fal fa-trophy f16 text-info"></i>
                         </div> 
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n5 mr-n6" style="font-size: 8rem;"></i>
                     </div>
                 </div>
-    <div class="col-sm-6 col-xl-3">
-        <div class="p-3 bg-info rounded overflow-hidden position-relative text-white mb-g">
-            <div class="">
-                <h3 class="display-4 d-block l-h-n m-0 fw-500">
-                    {{@$total_sekolah_mandiri}}
-                </h3>
-                <span class="m-0 l-h-n">Total Sekolah Adiwiyata Mandiri</span>
             </div>
-            <i class="fal fa-trophy position-absolute pos-right pos-bottom opacity-15 mb-n1 mr-n4" style="font-size: 6rem;"></i>
         </div>
     </div>
 </div>
@@ -105,13 +154,13 @@
     
     <div class="col-lg-12">
         <div id="panel-4" class="panel">
-            <div class="panel-hdr">
-                <h2>Usulan Adiwiyata Tahun {{date('Y')}}</h2>
-            </div>
             <div class="panel-container show">
                 <div class="panel-content">
                     <div class="table-responsive">
-                        <table class="table table-bordered table-hover table-striped w-100" 
+                        <div id="toolbar">
+                            <h5 class="fw-500">Usulan Adiwiyata Tahun {{date('Y')}}</h5>
+                        </div>
+                        <table class="table w-100" 
                             data-search="true"
                             data-toggle="table"
                             data-pagination="true"
@@ -123,8 +172,8 @@
                             data-page-size="10"
                             data-id-field="id"
                             id="grid-data">
-                              <thead>
+                              <thead class="bg-primary-light text-primary">
-                                <tr class="table-primary text-white">
+                                <tr>
                                   <th data-field="no">No</th>
                                   <th data-field="npsn">NPSN</th>
                                   <th data-field="nama_sekolah">Nama Sekolah</th>

resources/views/modules/dashboard/sekolah.blade.php

@@ -1,129 +1,68 @@
 @extends('layouts.master')
 
 @section('page-css')
-<link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        padding: 10px;
-        margin: 3px;
-        border: 1px solid #ddd;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 13px;
-/*        color: #333;*/
-/*        background: #0ba360 !important;*/
-/*        padding: 10px;*/
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> Dashboard
-    </h1>
-</div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-md-12">
-        <div class="">
+        <div class="subheader">
-            <div class="">
+            <h1 class="subheader-title">
-                <div class="row">
+                Dashboard
-                    <div class="col-md-12 d-none">
+            </h1>
-                        <ul class="listItem">
-                            <li class="bg-success text-white">
-                                <h6 class="m-0">
-                                    <!-- <div class="rounded-circle bg-fusion-50 width-1 height-1 text-center d-inline-block bg-success"><i class="mt-1 fal fa-check text-white"></i></div>&nbsp; -->
-                                    Registrasi Akun
-                                </h6>
-                            </li>
-                            <li class="profile {{@$profile->data_jumlah && @$profile->penghematan_air && @$profile->penghematan_listrik ? 'bg-success text-white' : ''}}">
-                                <h6 class="m-0">
-                                    <!-- <div class="rounded-circle bg-fusion-50 width-1 height-1 text-center d-inline-block bg-success"><i class="mt-1 fal fa-check text-white"></i></div>&nbsp; -->
-                                    Melengkapi Data Profile
-                                </h6>
-                            </li>
-                            <li class="kuesioner {{@$kuesioner ? 'bg-success text-white' : ''}}">
-                                <h6 class="m-0">
-                                    <!-- <div class="rounded-circle bg-fusion-50 width-1 height-1 text-center d-inline-block bg-success"><i class="mt-1 fal fa-check text-white"></i></div>&nbsp; -->
-                                    Mengisi Kuesioner Leveling
-                                </h6>
-                            </li>
-                            <li class="{{@$kuesioner->status == 1 ? 'bg-success text-white' : ''}}">
-                                <h6 class="m-0">
-                                    <!-- <div class="rounded-circle bg-fusion-50 width-1 height-1 text-center d-inline-block bg-success"><i class="mt-1 fal fa-check text-white"></i></div>&nbsp; -->
-                                    Menunggu Diusulkan CSA
-                                </h6>
-                            </li>
-                            <li class="{{@$page == @$penilaian ? 'bg-success text-white' : ''}}">
-                                <h6 class="m-0">
-                                    <!-- <div class="rounded-circle bg-fusion-50 width-1 height-1 text-center d-inline-block bg-success"><i class="mt-1 fal fa-check text-white"></i></div>&nbsp; -->
-                                    Melengkapi Data CSA
-                                </h6>
-                            </li>
-                        </ul>
         </div>
-                    <div class="col-md-4 mt-3">
+    </div>
-                        <div class="card">
+    <div class="col-md-6 pr-0 mt-2">
+        <div class="card h-100">
             <div class="card-body">
                 <div class="row">
-                                    <div class="col-3 col-md-3 text-left">
+                    <div class="col-md-12">
-                                        <i class="fal fa-building fa-5x"></i>
+                        <div class="d-flex justify-content-between flex-row align-items-center">
-                                    </div>
+                            <div class="d-flex gap-3 justify-content-start">
-                                    <div class="col-9 col-md-9">
+                                <div class="p-3 bg-secondary rounded">
-                                        <div class="level rounded-plus bg-fusion-50 width-1 height-1 d-inline-block bg-success">
+                                    <i class="fal fa-home fa-2x"></i>
-                                            <h4>Level {{levelAdiwiyata(session('npsn'))}}</h4>
                                 </div>
+                                <div>
+                                    <h5 class="fw-700">{{session('name')}}</h5>
+                                    <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                                    <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                    <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
                                 </div>
                             </div>
                             
-                                <h4 class="mt-5"><b>{{session('name')}}</b></h4>
+                            <div class="d-flex justify-content-end">
-                                <h5 class="text-success">NPSN: {{session('npsn')}}</h5>
+                                <h6 class="rounded-plus px-2 py-1 bg-fusion-50 bg-success">Level {{levelAdiwiyata(session('npsn'))}}</h6>
-                                <span class="badge badge-primary">{{session('tingkat_sekolah')}}</span>
-                                <span class="badge badge-success">{{session('status_sekolah')}}</span>
-
-                                <div class="row">
-                                    <div class="col-md-12 text-left">
-                                        <h5 class="mt-2"><b>ALAMAT</b></h5>
-                                    </div>
-                                    <div class="col-md-12 text-left">
-                                        <p>{{session('alamat_sekolah')}}</p>
                             </div>
                         </div>
-                                <div class="row">
-                                    <div class="col-md-12 text-left">
-                                        <h5 class="mt-2"><b>KONTAK</b></h5>
                     </div>
-                                    <div class="col-md-2 text-left mb-2">
+                    <div class="col-md-6 mt-5">
-                                        <i class="fal fa-mobile fa-2x"></i>  
+                        <h6 class="fw-500">KONTAK</h6>
+                        <div class="d-flex flex-row gap-3 justify-content-start mt-3">
+                            <div>
+                                <div class="p-3 bg-secondary rounded">
+                                    <i class="fal fa-mobile f20"></i>  
                                 </div>
-                                    <div class="col-md-10 text-left">
+                            </div>
-                                        <span class="text-muted">{{session('kontak_person')}}</span> <br>
+                            <div class="d-flex flex-column align-items-left justify-content-center">
+                                <span class="text-muted">{{session('kontak_person')}}</span>
                                 <span class="text-muted">{{session('telp')}}</span>
                             </div>
                         </div>
                     </div>
+                    <div class="col-md-6 mt-5">
+                        <h6 class="fw-500">ALAMAT</h6>
+                        <p class="text-muted">{{session('alamat_sekolah')}}</p>
                     </div>
                 </div>
-                    <div class="col-md-8 mt-3">
+            </div>
-                        <div class="card">
+        </div>
+    </div>
+    <div class="col-md-6 pr-0 mt-2">
+        <div class="card h-100">
+            <div class="card-header bg-white">
+                <h5 class="fw-500 mb-0">Status Usulan</h5>
+            </div>
             <div class="card-body">
-                                <div class="mb-3">
+                <div class="">
-                                    <h4><b>Status Usulan</b></h4>
                     @if(@$kuesioner || (@$kuesioner->status == 1))
                         <?php
                             if(@$kuesioner->level == 0){
@@ -136,21 +75,49 @@
                                 $textLevel = 'Mandiri';
                             }
                         ?>
-                                        <span class="badge badge-primary">Sekolah diusulan untuk menjadi CSA (Calon Sekolah Adiwiyata) {{@$textLevel}}</span>
+                        <div class="alert bg-primary-light text-primary mb-3">
+                            Sekolah diusulan untuk menjadi CSA (Calon Sekolah Adiwiyata) {{@$textLevel}}
+                        </div>
                     @else
                         <div class="alert alert-danger">
                             Belum ada data usulan
                         </div>
                     @endif
                 </div>
-                                @if(@$sk)
+                <div>
-                                <table class="table table-bordered">
+                    <ul class="liststyle">
+                        <li>
+                            <div class="d-flex gap-2 flex-row">
+                                <div class="bg-success-light rounded-circle p-1"><i class="fal fa-check text-success"></i></div>
+                                <div>Pendaftaran</div>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="d-flex gap-2 flex-row">
+                                <div class="bg-primary-light rounded-circle p-1"><i class="fal fa-recycle text-primary"></i></div>
+                                <div>Pengajuan</div>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="d-flex gap-2 flex-row">
+                                <div class="bg-secondary rounded-circle p-1"><i class="fal fa-clock"></i></div>
+                                <div class="text-muted">Verifikasi</div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                @if(@$kuesioner)
+                <table class="table table-bordered d-none">
                     <tr class="bg-success text-white">
+                        <th><b>Status Usulan</b></th>
                         <th><b>Penghargaan Terakhir</b></th>
                         <th><b>Tanggal Penetapan SK</b></th>
                         <th><b>Lampiran SK</b></th>
                     </tr>
                     <tr>
+                        <td style="vertical-align: middle;">
+                            <span class="badge badge-warning">{{str_replace('_',' ',\Str::title($log->step))}}</span>
+                        </td>
                         <td style="vertical-align: middle;">
                             <?php
                             if(@$sk->jenis_usulan == 0){
@@ -168,13 +135,75 @@
                             {!!$penghargaan!!}
                         </td>
                         <td style="vertical-align: middle;">{{@$sk->tanggal_penetapan}}</td>
-                                        <td style="vertical-align: middle;"><a download href="'.asset('uploads/'.@$sk->file).'" class="btn btn-sm btn-warning" style="width: 100%;"><i class="fal fa-download"></i> SK Adiwiyata</a></td>
+                        <td style="vertical-align: middle;">
+                            @if(@$sk)
+                            <a download href="'.asset('uploads/'.@$sk->file).'" class="btn btn-sm btn-warning" style="width: 100%;"><i class="fal fa-download"></i> SK Adiwiyata</a>
+                            @endif
+                        </td>
                     </tr>
                 </table>
                 @endif
             </div>
         </div>
     </div>
+</div>
+<div class="row mt-2">
+    <div class="col-sm-6 col-xl-3 pr-0">
+        <div class="card border-none">
+            <div class="card-body">
+                <div class="d-flex gap-3 flex-row">
+                    <div class="p-3 bg-success-light rounded">
+                        <i class="fal fa-users f20 text-success"></i>
+                    </div>
+                    <div>
+                        <h6 class="text-muted">Jumlah Siswa</h6>
+                        <h4 class="fw-500">100</h4>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3 pr-0">
+        <div class="card border-none">
+            <div class="card-body">
+                <div class="d-flex gap-3 flex-row">
+                    <div class="p-3 bg-primary-light rounded">
+                        <i class="fal fa-users f20 text-primary"></i>
+                    </div>
+                    <div>
+                        <h6 class="text-muted">Jumlah Guru</h6>
+                        <h4 class="fw-500">100</h4>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3 pr-0">
+        <div class="card border-none">
+            <div class="card-body">
+                <div class="d-flex gap-3 flex-row">
+                    <div class="p-3 bg-info-light rounded">
+                        <i class="fal fa-list-alt f20 text-info"></i>
+                    </div>
+                    <div>
+                        <h6 class="text-muted">Pemenuhan Kriteria</h6>
+                        <h4 class="fw-500">100%</h4>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-6 col-xl-3 pr-0">
+        <div class="card border-none">
+            <div class="card-body">
+                <div class="d-flex gap-3 flex-row">
+                    <div class="p-3 bg-warning-light rounded">
+                        <i class="fal fa-list-ol f20 text-warning"></i>
+                    </div>
+                    <div>
+                        <h6 class="text-muted">Program Aktif</h6>
+                        <h4 class="fw-500">100</h4>
+                    </div>
                 </div>
             </div>
         </div>

resources/views/modules/kuesioner/form.blade.php

@@ -2,44 +2,40 @@
 
 @section('page-css')
 <link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{$nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$npsn}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{$tingkat}}</span>
+                                <span class="badge bg-success-light text-success">{{$status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($npsn)}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -55,43 +51,11 @@
             <div class="card">
                 <div class="card-body">
                     <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{@$npsn}}</h5></td>
-                                    <td rowspan="4" style="vertical-align: top;">
-                                        <div class="level rounded-plus bg-fusion-50 width-1 height-1 d-inline-block bg-success">
-                                            <h4>Level {{levelAdiwiyata(@$npsn)}}</h4>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{@$nama_sekolah}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        <span class="badge badge-primary">{{@$tingkat}}</span> 
-                                        <span class="badge badge-success">{{@$status}}</span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><p>{{@$alamat_sekolah}}</p></td>
-                                </tr>
-                            </table>
-                        </div>
                         <div class="col-md-12">
-                            <table class="table">
-                                <tr class="bg-primary text-white">
-                                    <td>Apakah Sekolah anda sudah pernah mendapatkan penghargaan adiwiyata? </td>
-                                </tr>
-                                <tr>
-                                    <td>
                             <div class="form-group">
+                                <label class="fw-500 mb-3">Apakah Sekolah anda sudah pernah mendapatkan penghargaan adiwiyata? </label>
+                                <div class="row">
+                                    <div class="col-md-6">
                                         <div class="custom-control custom-radio">
                                             <input type="radio" class="custom-control-input radioPenghargaan" value="0" {{@$kuesioner->level == 0 ? 'checked' : ''}} id="radioPenghargaanAdiwiyataBelum" required name="level">
                                             <label class="custom-control-label" for="radioPenghargaanAdiwiyataBelum">Belum</label>
@@ -104,6 +68,8 @@
                                             <input type="radio" class="custom-control-input radioPenghargaan" value="2" {{@$kuesioner->level == 2 ? 'checked' : ''}} id="radioPenghargaanAdiwiyataProvinsi" required name="level">
                                             <label class="custom-control-label" for="radioPenghargaanAdiwiyataProvinsi">Adiwiyata Provinsi</label>
                                         </div>
+                                    </div>
+                                    <div class="col-md-6">
                                         <div class="custom-control custom-radio mt-2">
                                             <input type="radio" class="custom-control-input radioPenghargaan" value="3" {{@$kuesioner->level == 3 ? 'checked' : ''}} id="radioPenghargaanAdiwiyataNasional" required name="level">
                                             <label class="custom-control-label" for="radioPenghargaanAdiwiyataNasional">Adiwiyata Nasional</label>
@@ -113,31 +79,25 @@
                                             <label class="custom-control-label" for="radioPenghargaanAdiwiyataMandiri">Adiwiyata Mandiri</label>
                                         </div>
                                     </div>
-                                    </td>
+                                </div>
-                                </tr>
+                            </div>
-
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
+                                <label class="fw-500 mb-3">Apakah sekolah anda sudah pernah mendapatkan informasi tentang Gerakan Peduli dan Berbudaya Lingkungan Hidup di Sekolah (GPBLHS) </label>
-                                    <td>Apakah sekolah anda sudah pernah mendapatkan informasi tentang Gerakan Peduli dan Berbudaya Lingkungan Hidup di Sekolah (GPBLHS) </td>
+                                <div class="form-group">
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                     <div class="custom-control custom-radio">
                                         <input type="radio" class="custom-control-input info_pblhs" id="radioGerakanPeduliBelum" value="1" {{@$kuesioner->info_pblhs == '1' ? 'checked' : ''}} name="info_pblhs">
                                         <label class="custom-control-label" for="radioGerakanPeduliBelum">Belum Pernah</label>
                                     </div>
+                                </div>
+                                <div class="form-group">
                                     <div class="custom-control custom-radio mt-2">
                                         <input type="radio" class="custom-control-input info_pblhs" id="radioGerakanPeduliSudah" value="2" {{@$kuesioner->info_pblhs == '2' ? 'checked' : ''}} name="info_pblhs">
                                         <label class="custom-control-label" for="radioGerakanPeduliSudah">Sudah Pernah</label>
                                     </div>
-                                    </td>
+                                </div>
-                                </tr>
+                            </div>
-
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <!-- Belum Pernah -->
+                                <label class="fw-500 mb-3">Apakah sekolah anda sudah membentuk Tim Adiwiyata Sekolah?</label>
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>Apakah sekolah anda sudah membentuk Tim Adiwiyata Sekolah?</td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -165,17 +125,9 @@
                                         <input class="form-control" name="tim_adiwiyata_link" value="{{@$kuesioner->tim_adiwiyata_link}}" placeholder="Masukkan link Google Drive SK Tim Adiwiyata" type="text">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                
+                                <label class="fw-500 mb-3">Jika pernah, dari media apa mendapatkannya, dan sebutkan nama instansi penyelenggaranya ?</label>
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>Jika pernah, dari media apa mendapatkannya, dan sebutkan nama instansi penyelenggaranya ? </td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <?php
-                                        
-                                    ?>
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -245,13 +197,9 @@
                                         <input type="text" name="media_text[lainlain]" value="{{ @$selectedMediaTexts['lainlain']->text ?? '' }}" class="form-control media" placeholder="Tulis Instansi Penyelenggara">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
+                                <label class="fw-500 mb-3">Materi apa saja yang masih kurang Anda pahami?</label>
-                                    <td>Materi apa saja yang masih kurang Anda pahami? </td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -321,13 +269,9 @@
                                         <input type="text" name="materi_text[lainlain]" value="{{ @$selectedMateriTexts['lainlain']->text ?? '' }}" class="form-control materi" placeholder="">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
+                                <label class="fw-500 mb-3">Apakah sekolah anda bersedia untuk berkomitmen melaksanakan Gerakan PBLHS secara berkelanjutan? </label>
-                                    <td>Apakah sekolah anda bersedia untuk berkomitmen melaksanakan Gerakan PBLHS secara berkelanjutan? </td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -341,7 +285,6 @@
                                         <input type="text" name="komitmen_text[bersedia]" value="{{ @$selectedKomitmenTexts['bersedia']->text ?? '' }}" disabled class="form-control" placeholder="">
                                     </div>
                                 </div>
-
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -355,13 +298,9 @@
                                         <input type="text" name="komitmen_text[tidak_bersedia]" value="{{ @$selectedKomitmenTexts['tidak_bersedia']->text ?? '' }}" class="form-control" placeholder="">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
+                                <label class="fw-500 mb-3">Kegiatan/aksi lingkungan yang pernah dilakukan oleh warga sekolah?</label>
-                                    <td>Kegiatan/aksi lingkungan yang pernah dilakukan oleh warga sekolah?</td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -431,13 +370,9 @@
                                         <input type="text" name="kegiatan_lingkungan_text[kegiatan_3]" value="{{ @$selectedKegiatanLingkunganTexts['kegiatan_3']->text ?? '' }}" class="form-control" placeholder="">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                <tr class="bg-primary text-white belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
+                                <label class="fw-500 mb-3">Pihak yang terlibat dalam menjalankan kegiatan/aksi lingkungan </label>
-                                    <td>Pihak yang terlibat dalam menjalankan kegiatan/aksi lingkungan </td>
-                                </tr>
-                                <tr class="belumPernah {{@$kuesioner->level == 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <div class="input-group">
                                         <div class="input-group-prepend">
@@ -465,39 +400,32 @@
                                         <input type="text" name="pihak_kegiatan_lingkungan_text[eksternal]" value="{{ @$selectedPihakKegiatanLingkunganTexts['eksternal']->text ?? '' }}" class="form-control" placeholder="">
                                     </div>
                                 </div>
-                                    </td>
+                            </div>
-                                </tr>
+                            <div class="form-group sudahPernah {{@$kuesioner->level != 0 ? '' : 'd-none'}}">
-
+                                <label class="fw-500 mb-3">Jika sudah pernah mendapatkan penghargaan adiwiyata, tahun berapa sekolah anda mendapatkan penghargaan adiwiyata?</label>
-                                <tr class="bg-primary text-white sudahPernah {{@$kuesioner->level != 0 ? '' : 'd-none'}}">
-                                    <td>Jika sudah pernah mendapatkan penghargaan adiwiyata, tahun berapa sekolah anda mendapatkan penghargaan adiwiyata? </td>
-                                </tr>
-                                <tr class="sudahPernah {{@$kuesioner->level != 0 ? '' : 'd-none'}}">
-                                    <td>
                                 <div class="form-group">
                                     <label>Tahun perolehan penghargaaan (kosongkan jika belum adiwiyata)</label>
-                                            <select class="form-control form-control-sm">
+                                    <select class="form-control form-control-sm tahun_penghargaan" name="tahun_penghargaan">
                                         <option value="">Pilih Tahun</option>
                                         @for($i = (date('Y')-5); $i <= (date('Y')); $i++)
-                                                <option value="{{$i}}">{{$i}}</option>
+                                        <option {{@$kuesioner->tahun_penghargaan == $i ? 'selected' : ''}} value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     </select>
                                 </div>
                                 <div class="form-group">
                                     <label>Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)</label>
-                                            <input type="text" class="form-control form-control-sm" name="" placeholder="Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)">
+                                    <input type="text" value="{{@$kuesioner->link_sk_adiwiyata}}" class="form-control form-control-sm link_sk_adiwiyata" name="link_sk_adiwiyata" placeholder="Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)">
-                                        </div>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
                                 </div>
                             </div>
                             @if(!@$kuesioner)
-                <div class="card-footer">
+                            <div class="form-group">
                                 <button class="btn btn-success" id="btn-save">Simpan</button>
                             </div>
                             @endif
                         </div>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
 </div>
@@ -534,7 +462,7 @@
         let tim_adiwiyata = $('input[name="tim_adiwiyata"]:checked').val();
 
         if(level >= 0){
-
+            if(level == 0){
                 if((tim_adiwiyata >= 1)){
 
                     if(tim_adiwiyata == 2){
@@ -568,6 +496,23 @@
                 }else{
                     toastr.error("Data Belum Lengkap ", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});    
                 }
+        }else{
+            let tahun = $('.tahun_penghargaan').find(':selected').val();
+            let link_sk_adiwiyata = $('.link_sk_adiwiyata').val();
+            if((tahun == '') || (link_sk_adiwiyata == '')){
+                toastr.error("Data Belum Lengkap", 'Error!', {
+                    positionClass: 'toast-bottom-right',
+                    containerId: 'toast-bottom-right'
+                });
+            }else{
+                toastr.success("Data Sudah Lengkap", 'Sukses!', {
+                    positionClass: 'toast-bottom-right',
+                    containerId: 'toast-bottom-right'
+                });    
+
+                $('#form').submit();
+            }
+        }
             
         }else{
             toastr.error("Penghargaan adiwiyata Belum Diisi ", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});

resources/views/modules/kuesioner/index.blade.php

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                    </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100 wrap" 
+                    <table class="table w-100 wrap" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -134,15 +126,15 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="status_level">Status Level</th>
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
-                          <th data-field="penghargaan">Penghargaan Terakhir</th>
+                          <!-- <th data-field="penghargaan">Penghargaan Terakhir</th> -->
                           <th data-field="status">Status</th>
                         </tr>
                       </thead>
@@ -178,6 +170,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $("#grid-data").on("click", ".tolak", function() {
         var base_url = $(this).attr('data-href');
         var id = $(this).attr('data-id');

resources/views/modules/management/role/akses/form.blade.php

@@ -16,8 +16,8 @@
 <div class="row">
     <div class="col-lg-12">
         <div class="card">
-            <div class="card-header">
+            <div class="card-header bg-white">
-                <i class="fal fa-align-justify"></i> {{$title}}
+                <h5 class="mb-0 fw-500">{{$title}}</h5>
             </div>
             <form action="{{route($route.'.store')}}" method="POST" class="">
             {{csrf_field()}}

resources/views/modules/management/role/index.blade.php

@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </button>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary text-white">
+                        <tr>
                           <th data-width="50" data-field="action">#</th>
                           <th data-width="50" data-field="no">No</th>
                           <th data-field="name">Name</th>

resources/views/modules/management/user/index.blade.php

@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary text-white">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="role">Role</th>

resources/views/modules/management/user_sekolah/index.blade.php

@@ -18,7 +18,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +32,7 @@
                         </button>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +44,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary text-white">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="name">Name</th>

resources/views/modules/master/form-kriteria/index.blade.php

@@ -2,23 +2,10 @@
 
 @section('page-css')
 @endsection
-@section('breadcrumbs')
-<ol class="breadcrumb page-breadcrumb">
-    @foreach($breadcrumbs as $dataBread)
-    <li class="breadcrumb-item {{@$dataBread['active'] == true ? 'active' : ''}}">
-        @if(@$dataBread['url'])
-        <a href="{{@$dataBread['url']}}">{{$dataBread['name']}}</a>
-        @else
-        {{$dataBread['name']}}
-        @endif
-    </li>
-    @endforeach
-</ol>
-@endsection
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-chart-area'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
@@ -32,7 +19,7 @@
                         </a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -44,8 +31,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead>
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary text-white">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="kategori">Kategori</th>

resources/views/modules/profile/admin.blade.php

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,15 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
                     <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -135,21 +126,21 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <!-- <th data-field="action">#</th> -->
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
                           <th data-field="status_level">Status Level</th>
-                          <th data-field="tanggal_level">Tanggal Level</th>
+                          <!-- <th data-field="tanggal_level">Tanggal Level</th> -->
-                          <th data-field="penghargaan">Penghargaan Terakhir</th>
+                          <!-- <th data-field="penghargaan">Penghargaan Terakhir</th> -->
-                          <th data-field="dok">DOK Administrasi</th>
+                          <!-- <th data-field="dok">DOK Administrasi</th> -->
                           <th data-field="kriteria">Pemenuhan Kriteria</th>
                           <th data-field="jenis_usulan">Jenis Usulan</th>
-                          <th data-field="usulkan_csa">Usulkan CSA</th>
+                          <th data-field="usulkan_csa">Status</th>
-                          <th data-field="perpanjang_csa">Perpanjangan CSA</th>
+                          <!-- <th data-field="perpanjang_csa">Perpanjangan CSA</th> -->
                         </tr>
                       </thead>
                       <tbody></tbody>
@@ -165,6 +156,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

resources/views/modules/profile/sekolah.blade.php

@@ -2,44 +2,41 @@
 
 @section('page-css')
 <link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
+
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
+                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -53,58 +50,20 @@
         <div class="card">
             <div class="card-body">
                 <div class="row">
-                    <div class="col-md-4 mt-3">
+                    <div class="col-md-12">
-                        <div class="row">
-                            <div class="col-3 col-md-3 text-left">
-                                <i class="fal fa-building fa-5x"></i>
-                            </div>
-                            <div class="col-9 col-md-9">
-                                <div class="level rounded-plus bg-fusion-50 width-1 height-1 d-inline-block bg-success">
-                                            <h4>Level {{levelAdiwiyata(session('npsn'))}}</h4>
-                                        </div>
-                            </div>
-                        </div>
-                        
-                        <h4 class="mt-5"><b>{{session('name')}}</b></h4>
-                        <h5 class="text-success">NPSN: {{session('npsn')}}</h5>
-                        <span class="badge badge-primary">{{session('tingkat_sekolah')}}</span>
-                        <span class="badge badge-success">{{session('status_sekolah')}}</span>
-
-                        <div class="row">
-                            <div class="col-md-12 text-left">
-                                <h5 class="mt-2"><b>ALAMAT</b></h5>
-                            </div>
-                            <div class="col-md-12 text-left">
-                                <p>{{session('alamat_sekolah')}}</p>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12 text-left">
-                                <h5 class="mt-2"><b>KONTAK</b></h5>
-                            </div>
-                            <div class="col-md-2 text-left mb-2">
-                                <i class="fal fa-mobile fa-2x"></i>  
-                            </div>
-                            <div class="col-md-10 text-left">
-                                <span class="text-muted">{{session('kontak_person')}}</span> <br>
-                                <span class="text-muted">{{session('telp')}}</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-8 mt-3">
                         <form id="form" action="{{route($route.'.store')}}" method="POST">
                             {{csrf_field()}}
                             <div id="panel-1" class="card">
                                 <div class="card-body show">
-                                    <div class="panel-content">
+                                    <div class="panel-content mb-3">
-                                        <ul class="nav nav-tabs badge-primary" role="tablist">
+                                        <ul class="nav nav-tabs" role="tablist">
-                                            <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#usulan" role="tab">Usulan</a></li>
+                                            <!-- <li class="nav-item d-none"><a class="nav-link active" data-toggle="tab" href="#usulan" role="tab">Usulan</a></li> -->
-                                            <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#jumlah" role="tab">Data Jumlah</a></li>
+                                            <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#jumlah" role="tab">Data Jumlah</a></li>
                                             <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#air" role="tab">Penghematan Air</a></li>
                                             <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#listrik" role="tab">Penghematan Listrik</a></li>
                                         </ul>
                                         <div class="tab-content pt-3">
-                                            <div class="tab-pane fade show active" id="usulan" role="tabpanel">
+                                            <!-- <div class="tab-pane fade show active d-none" id="usulan" role="tabpanel">
                                                 <table class="table table-bordered">
                                                     <tr class="bg-success text-white">
                                                         <th><b>Penghargaan Terakhir</b></th>
@@ -134,126 +93,91 @@
                                                     </tr>
                                                     @endif
                                                 </table>
+                                            </div> -->
+                                            <div class="tab-pane fade show active" id="jumlah" role="tabpanel">
+                                                <div class="row mt-3">
+                                                    <div class="col-md-6">
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Peserta Didik</label>
+                                                            <input name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control " placeholder="jumlah peserta didik">
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Tenaga Pendidik</label>
+                                                            <input name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control " placeholder="jumlah tenaga pendidik">
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Tenaga kependidikan</label>
+                                                            <input name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control " placeholder="jumlah tenaga kependidikan">
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Warga Sekolah Lainnya</label>
+                                                            <input name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control " placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-md-6">
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Biopori</label>
+                                                            <input name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control " placeholder="jumlah biopori">
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Sumur Resapan</label>
+                                                            <input name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control " placeholder="jumlah sumur resapan">
+                                                        </div>
+                                                        <div class="form-group">
+                                                            <label class="fw-500">Jumlah Pohon/Tanaman yang ditanam dan tumbuh</label>
+                                                            <input name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control " placeholder="jumlah pohon tanaman">
+                                                        </div>
+                                                    </div>
                                                 </div>
-                                            <div class="tab-pane fade" id="jumlah" role="tabpanel">
-                                                <table class="table">
-                                                    <tbody>
-                                                      <tr>
-                                                        <td colspan="2" class="bg-success text-white">Data Jumlah</td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Peserta Didik</th>
-                                                        <td>
-                                                          <input name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Tenaga Pendidik</th>
-                                                        <td>
-                                                          <input name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Tenaga kependidikan</th>
-                                                        <td>
-                                                          <input name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Warga Sekolah Lainnya</th>
-                                                        <td>
-                                                          <input name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Biopori</th>
-                                                        <td>
-                                                          <input name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Sumur Resapan</th>
-                                                        <td>
-                                                          <input name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
-                                                        </td>
-                                                      </tr>
-                                                      <tr>
-                                                        <th scope="row"> Jumlah Pohon/Tanaman yang ditanam dan tumbuh</th>
-                                                        <td>
-                                                          <input name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
-                                                        </td>
-                                                      </tr>
-                                                    </tbody>
-                                                </table>
                                             </div>
                                             <div class="tab-pane fade" id="air" role="tabpanel">
-                                                <table class="table">
+                                                <div class="alert bg-primary-light">
-                                                    <tbody>
+                                                    <p class="mb-0 text-primary">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS</p>
-                                                      <tr>
+                                                </div>
-                                                        <td colspan="2" scope="row" class="bg-success text-white">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS :</td>
+                                                <div class="form-group">
-                                                      </tr>
+                                                    <label class="fw-500">Sebelum melaksanakan gerakan PBLHS <small class="text-warning">(Meter Kubik/Bulan)</small></label>
-                                                      <tr>
+                                                    <input name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control" placeholder="rata-rata per bulan dalam meter kubik">
-                                                        <th scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></th>
+                                                </div>
-                                                        <td>
+                                                <div class="form-group">
-                                                          <input name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
+                                                    <label class="fw-500">Setelah melaksanakan gerakan PBLHS <small class="text-warning">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></label>
-                                                        </td>
+                                                    <input name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control" placeholder="rata-rata per bulan dalam meter kubik">
-                                                      </tr>
+                                                </div>
-                                                      <tr>
-                                                        <th scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></th>
-                                                        <td>
-                                                          <input name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                                        </td>
-                                                      </tr>
-                                                    </tbody>
-                                                </table>
                                             </div>
                                             <div class="tab-pane fade" id="listrik" role="tabpanel">
-                                              <table class="table">
+                                                <div class="alert bg-primary-light">
-                                                <tbody>
+                                                    <p class="mb-0 text-primary">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS</p>
-                                                  <tr>
+                                                </div>
-                                                    <td colspan="2" scope="row" class="bg-success text-white">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS :</td>
+                                                <div class="row">
-                                                  </tr>
+                                                    <div class="col-md-6">
-                                                  <tr>
+                                                        <div class="form-group">
-                                                    <th scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></small>
+                                                            <label class="fw-500">Sebelum melaksanakan gerakan PBLHS <small class="text-warning">(KWH/Bulan)</small></label>
-                                                    </th>
+                                                            <input name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control" placeholder="rata-rata per bulan dalam kwh">
-                                                    <td>
+                                                        </div>
-                                                      <input name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                        <div class="form-group">
-                                                    </td>
+                                                            <label class="fw-500">Setelah melaksanakan gerakan PBLHS <small class="text-warning">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></label>
-                                                  </tr>
+                                                            <input name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control" placeholder="rata-rata per bulan dalam kwh">
-                                                  <tr>
+                                                        </div>
-                                                    <th scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></th>
+                                                        <div class="form-group">
-                                                    <td>
+                                                            <label class="fw-500">Luas ruangan ber AC</label>
-                                                      <input name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
+                                                            <input name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control" placeholder="dalam satuan meter persegi">
-                                                    </td>
+                                                        </div>
-                                                  </tr>
+                                                    </div>
-                                                  <tr>
+                                                    <div class="col-md-6">
-                                                    <th scope="row"> Luas ruangan ber AC</th>
+                                                        <div class="form-group">
-                                                    <td>
+                                                            <label class="fw-500">Luas ruangan non AC</label>
-                                                      <input name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
+                                                            <input name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control" placeholder="dalam satuan meter persegi">
-                                                    </td>
+                                                        </div>
-                                                  </tr>
+                                                        <div class="form-group">
-                                                  <tr>
+                                                            <label class="fw-500">Jumlah Kader</label>
-                                                    <th scope="row"> Luas ruangan non AC</th>
+                                                            <input name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                                    <td>
-                                                      <input name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                                    </td>
-                                                  </tr>
-
-                                                  <tr>
-                                                    <th scope="row"> Jumlah Kader</th>
-                                                    <td>
-                                                      <input name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                                    </td>
-                                                  </tr>
-                                                </tbody>
-                                              </table>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
-                                <div class="card-footer">
+                                        </div>
-                                    <div class="form-group text-right">
+                                    </div>
-                                        <button class="btn btn-success"><i class="fal fa-save"></i>&nbsp;&nbsp;Simpan Perubahan</button>
+                                    <div class="form-group">
+                                        <button class="btn btn-primary"><i class="fal fa-save"></i>&nbsp;&nbsp;Simpan Perubahan</button>
                                     </div>
                                 </div>
                             </div>

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

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,14 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
-
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    </div>
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -135,7 +126,7 @@
                     data-id-field="id"
                     id="grid-data">
                       <thead class="text-white">
-                        <tr class="table-primary">
+                        <tr class="bg-primary-light text-primary">
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="tahun">Tahun</th>
@@ -169,7 +160,7 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <div class="alert alert-info">
+                    <div class="alert bg-primary-light text-primary mb-2">
                         <p class="mb-0"><i>Silahkan Upload Kembali File, Untuk Update Data</i></p>
                     </div>
                     <div class="bodyModal"></div>
@@ -189,6 +180,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $("#grid-data").on("click", ".toggle-row", function() {
         let btn = $(this);
         let row = btn.closest("tr");

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

@@ -42,12 +42,38 @@
 </style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{$sekolah->nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$sekolah->npsn}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{$sekolah->tingkat->name}}</span>
+                                <span class="badge bg-success-light text-success">{{$sekolah->status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($sekolah->npsn)}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -61,248 +87,124 @@
         <form method="POST" id="form">
         <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
         {{csrf_field()}}
+            <div class="">
+                <div class="">
+                    <div class="row">
+                        
+                        <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                    <div class="row">
+                                    <ul class="nav nav-tabs" role="tablist">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{$sekolah->npsn}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{$sekolah->nama_sekolah}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{$sekolah->tingkat->name}}</span> <span class="badge badge-success">{{$sekolah->status}}</span></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-12">
-                            <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                    <ul class="nav nav-pills" role="tablist">
                                         <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
                                         <!-- <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li> -->
                                         <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
                                         <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
                                     </ul>
                                 </div>
+                            </div>
                             
                             <div class="tab-content py-3">
                                 <div class="tab-pane fade" id="profile" role="tabpanel">
-                                    <table class="table table-nobordered">
+                                   <div class="card my-2">
-                                        <tr class="table-info">
+                                        <div class="card-header bg-white">
-                                            <td colspan="2"><b>Profile Sekolah</b></td>
+                                            <h5 class="mb-0 fw-500">Data Jumlah</h5>
-                                        </tr>
+                                        </div>
-                                        <tr>
+                                        <div class="card-body">
-                                            <td>NPSN</td>
+                                            <div class="row">
-                                            <td>{{@$sekolah->npsn}}</td>
+                                                <div class="col-md-6">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Peserta Didik</label>
-                                            <td>Nama Sekolag</td>
+                                                        <input disabled name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
-                                            <td>{{@$sekolah->nama_sekolah}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Tenaga kependidikan</label>
-                                            <td>Tingkat Sekolah</td>
+                                                        <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
-                                            <td>{{@$sekolah->tingkat->name}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Biopori</label>
-                                            <td>Status Sekolah</td>
+                                                        <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
-                                            <td>{{@$sekolah->status}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr class="table-info">
+                                                        <label>Jumlah Pohon/Tanaman yang ditanam dan tumbuh</label>
-                                            <td colspan="2"><b>Alamat Sekolah</b></td>
+                                                        <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
-                                        </tr>
+                                                    </div>
-                                        <tr>
+                                                </div>
-                                            <td>Provinsi</td>
+                                                <div class="col-md-6">
-                                            <td>{{@$sekolah->provinsi->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Tenaga Pendidik</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
-                                            <td>Kabupaten/Kota</td>
+                                                    </div>
-                                            <td>{{@$sekolah->kabupaten->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Warga Sekolah Lainnya</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
-                                            <td>Kecamatan</td>
+                                                    </div>
-                                            <td>{{@$sekolah->kecamatan->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Sumur Resapan</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
-                                            <td>Alamat Lengkap</td>
+                                                    </div>
-                                            <td>{{@$sekolah->profile->alamat_sekolah}}</td>
+                                                </div>
-                                        </tr>
+                                            </div>
-                                        <tr>
+                                        </div>
-                                            <td>Kontak Person</td>
+                                    </div>
-                                            <td>{{@$sekolah->profile->kontak_person}}</td>
+                                    <div class="card my-2">
-                                        </tr>
+                                        <div class="card-header bg-white">
-                                        <tr>
+                                            <h5 class="mb-0 fw-500">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS</h5>
-                                            <td>Telp</td>
+                                        </div>
-                                            <td>{{@$sekolah->profile->telp}}</td>
+                                        <div class="card-body">
-                                        </tr>
+                                            <div class="row">
-                                        <tr class="table-info">
+                                                <div class="col-md-6">
-                                            <td colspan="2"><b>Data Jumlah</b></td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
-                                        <tr>
+                                                        <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            <td scope="row"> Jumlah Peserta Didik</td>
+                                                    </div>
-                                            <td>
+                                                </div>
-                                              <input readonly name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
+                                                <div class="col-md-6">
-                                            </td>
+                                                    <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
-                                        </tr>
+                                                    <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                        <tr>
+                                                </div>
-                                            <td scope="row"> Jumlah Tenaga Pendidik</td>
+                                            </div>
-                                            <td>
+                                        </div>
-                                              <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
+                                    </div>
-                                            </td>
+                                    <div class="card my-2">
-                                        </tr>
+                                        <div class="card-header bg-white">
-                                        <tr>
+                                            <h5 class="mb-0 fw-500">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS</h5>
-                                            <td scope="row"> Jumlah Tenaga kependidikan</td>
+                                        </div>
-                                            <td>
+                                        <div class="card-body">
-                                              <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
+                                            <div class="row">
-                                            </td>
+                                                <div class="col-md-6">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></small></label>
-                                            <td scope="row"> Jumlah Warga Sekolah Lainnya</td>
+                                                        <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            <td>
+                                                    </div>
-                                              <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
+                                                    <div class="form-group">
-                                            </td>
+                                                        <label>Luas ruangan ber AC</label>
-                                        </tr>
+                                                        <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                        <tr>
+                                                    </div>
-                                            <td scope="row"> Jumlah Biopori</td>
+                                                    <div class="form-group">
-                                            <td>
+                                                        <label>Jumlah Kader</label>
-                                              <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
+                                                        <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                </div>
-                                        <tr>
+                                                <div class="col-md-6">
-                                            <td scope="row"> Jumlah Sumur Resapan</td>
+                                                    <div class="form-group">
-                                            <td>
+                                                        <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small></label>
-                                              <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
+                                                        <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Luas ruangan non AC</label>
-                                            <td scope="row"> Jumlah Pohon/Tanaman yang ditanam dan tumbuh</td>
+                                                        <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            <td>
+                                                    </div>
-                                              <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
+                                                </div>
-                                            </td>
+                                            </div>
-                                        </tr>
+                                        </div>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></td>
-                                            <td>
-                                              <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                          </tr>
-                                          <tr>
-                                            <td> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></smald>
-                                            </th>
-                                            <td>
-                                              <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan ber AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan non AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-
-                                          <tr>
-                                            <td> Jumlah Kader</td>
-                                            <td>
-                                              <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
-                                          </tr>
-                                    </table>
                                     </div>
-                                <div class="tab-pane fade" id="dokumen" role="tabpanel">
-                                    <table class="table table-bordered">
-                                        <tr>
-                                            <td class="table-info">Seleksi Isian Dokumen Administrasi CSA</td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah nama CSAN tercantum dalam SK/Piagam Sekolah Adiwiyata Provinsi (untuk SAP 2021/2022/2023/2024/2025) atau SK/Piagam Perpanjangan Adiwiyata Tahun 2023/2024/2025  </b></p>
-
-                                                <input value="1" {{@$dokumen->nama_dalam_sk == 1 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Ya<br>
-                                                <input value="2" {{@$dokumen->nama_dalam_sk == 2 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak<br>
-                                                <input value="3" {{@$dokumen->nama_dalam_sk == 3 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak Ada Bukti/Dokumen <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah salinan SK/Piagam Sekolah Adiwiyata provinsi di tandatangani Gubernur atau pejabat yang diberi kewenangan untuk menandatangani atau SK/Piagam Perpanjangan di Tandatangani Kepala Dinas LH ?</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->sk_ttd == 1 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Ya <br>
-                                                <input value="2" {{@$dokumen->sk_ttd == 2 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak <br>
-                                                <input value="3" {{@$dokumen->sk_ttd == 3 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak Ada Bukti/Dokumen  <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Waktu Penetapan Penghargaan SAP</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->waktu_penetapan == 1 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022/ 2023/ 2024 ditetapkan SEBELUM 1 Agustus 2024 <br>
-                                                <input value="2" {{@$dokumen->waktu_penetapan == 2 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022 /2023/ 2024 ditetapkan SETELAH 1 Agustus 2024 <br>
-                                                <input value="3" {{@$dokumen->waktu_penetapan == 3 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP/SAN/SAM perolehan tahun 2020 atau sebelumnya serta lolos perpanjangan sebagai SAP <br>
-                                                <input value="4" {{@$dokumen->waktu_penetapan == 4 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP perolehan tahun 2020 atau sebelumnya serta tidak ada SK/piagam perpanjangan sebagai SAP <br>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveAdministrasi" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                        </tr>
-                                        @endif
-                                    </table>
                                 </div>
                                 <div class="tab-pane fade active show" id="kriteria" role="tabpanel">
                                     <div class="row">
-                                        <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
+                                        <div class="col-md-4">
-                                            <ul class="pageNumber">
+                                            <div class="card">
-                                                @foreach($page as $hal)
+                                                <div class="card-body">
-                                                <li class="page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
+                                                    <div class="my-3 text-center ">
-                                                @endforeach
-                                                <!-- <li class="resume">Resume</li> -->
-                                            </ul>
-                                        </div>
-                                        <div class="col-md-12 mt-3">
-                                            <div class="alert alert-primary mb-2 p-2">
-                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-8 bodyInput">
-                                            <div id="loading-spinner" style="display: none; text-align: center;">
-                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                            </div>
-                                            <div class="changeForm">
-                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
-                                            </div>
-                                        </div>
-                                        <div class="col-md-4 mt-5 mx-auto">
-                                            <div class="mx-auto text-center">
                                                         <a href="#" class="btn btn-outline-primary mr-2 ">
                                                             Sekolah
                                                             <br>
@@ -313,11 +215,32 @@
                                                             <br>
                                                             <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
                                                         </a>
-                                                <a href="#" class="btn btn-outline-danger mr-2 d-none">
+                                                    </div>
-                                                    Provinsi
+                                                    <div class="pageNumber row gap-1 justify-content-center">
-                                                    <br>
+                                                        @foreach($page as $hal)
-                                                    <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
+                                                        <div class="col-3 text-center page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
-                                                </a>
+                                                                <span>{{$hal}}</span>
+                                                        </div>
+                                                        @endforeach
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-8">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <div class="alert alert-primary mb-2 p-2">
+                                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-12 bodyInput">
+                                                            <div id="loading-spinner" style="display: none; text-align: center;">
+                                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
+                                                            </div>
+                                                            <div class="changeForm">
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
                                                             </div>
                                                         </div>
                                                         @if(@$kuesioner->status < 4)
@@ -327,49 +250,52 @@
                                                         @endif
                                                     </div>
                                                 </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="tab-pane fade" id="usulan" role="tabpanel">
-                                    <table class="table table-nobordered">
+                                    <div class="card">
-                                        <tr>
+                                        <div class="card-header bg-white">
-                                            <th colspan="2" class="table-info">Usulan</th>
+                                            <h4 class="mb-0 fw-500">Form Validasi</h4>
-                                        </tr>
+                                        </div>
-                                        <tr>
+                                        <div class="card-body">
-                                            <td>Jenis Usulan CSA</td>
+                                            <div class="row">
-                                            <td>{{getUsulan($sekolah->MsSekolahId)}}</td>
+                                                <div class="col-12">
-                                        </tr>
+                                                    <div class="alert bg-primary-light text-primary mb-3">
-                                        <tr>
+                                                        <i class="fal fa-info-circle"></i>&nbsp;Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
-                                            <th colspan="2" class="table-info">Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}} :</th>
+                                                    </div>
-                                        </tr>
+                                                </div>
-                                        <tr>
+                                                <div class="col-md-6 my-2">
-                                            <td>Nilai Dokumen Administrasi</td>
+                                                    <div class="form-group">
-                                            <td>0</td>
+                                                        <label class="fw-500">Jenis Usulan CSA</label>
-                                        </tr>
+                                                        <input disabled type="text" class="form-control" name="" value="{{getUsulan($sekolah->MsSekolahId)}}">
-                                        <tr>
+                                                    </div>
-                                            <td>Nilai Pemenuhan Kriteria</td>
+                                                </div>
-                                            <td>0</td>
+                                                <div class="col-md-6 my-2">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label class="fw-500">Validasi</label>
-                                            <td>Validasi</td>
-                                            <td>
                                                         <select class="form-control select2" id="validasi" name="validasi">
                                                             <option value="">- Pilih Validasi -</option>
                                                             <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Selesai</option>
                                                             <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
                                                         </select>
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                </div>
-                                        <tr>
+                                                <div class="col-md-12 my-2">
-                                            <td>Catatan</td>
+                                                    <div class="form-group">
-                                            <td>
+                                                        <label class="fw-500">Catatan</label>
                                                         <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                </div>
                                                 @if(@$kuesioner->status < 4)
-                                        <tr>
+                                                <div class="col-md-12 my-2">
-                                            <td><button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
+                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                            <td></td>
+                                                </div>
-                                        </tr>
                                                 @endif
-                                    </table>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         
@@ -561,7 +487,7 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
-            if (type === 'radio' || type === 'checkbox') {
+            if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {
                     isValid = false;
@@ -569,6 +495,16 @@
                 } else {
                     $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
                 }
+            }else if(type === 'checkbox'){
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                }else if ($(`input[name="${name}"]:checked`).length === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
+                }
             } else {
                 // Validasi input teks atau lainnya
                 if (!value) {

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

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                    </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -134,17 +126,16 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
                           <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">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
-                          <th data-field="tingkat_sekolah">SK</th>
                         </tr>
                       </thead>
                       <tbody></tbody>
@@ -160,6 +151,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

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

@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                    </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -134,17 +126,16 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
                           <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">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
-                          <th data-field="tingkat_sekolah">SK</th>
                         </tr>
                       </thead>
                       <tbody></tbody>
@@ -160,6 +151,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

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

@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                    </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -134,17 +126,16 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
                           <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">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
-                          <th data-field="tingkat_sekolah">SK</th>
                         </tr>
                       </thead>
                       <tbody></tbody>
@@ -160,6 +151,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

resources/views/modules/usulan/csap/form.blade.php

@@ -42,12 +42,38 @@
 </style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{$sekolah->nama_sekolah}}</h5>
+                                <p class="mb-0">NPSN: {{$sekolah->npsn}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{$sekolah->tingkat->name}}</span>
+                                <span class="badge bg-success-light text-success">{{$sekolah->status}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata($sekolah->npsn)}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -61,248 +87,123 @@
         <form method="POST" id="form">
         <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
         {{csrf_field()}}
+            <div class="">
+                <div class="">
+                    <div class="row">
+                        
+                        <div class="col-12">
                             <div class="card">
                                 <div class="card-body">
-                    <div class="row">
+                                    <ul class="nav nav-tabs" role="tablist">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{$sekolah->npsn}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{$sekolah->nama_sekolah}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{$sekolah->tingkat->name}}</span> <span class="badge badge-success">{{$sekolah->status}}</span></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-12">
-                            <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
-                                    <ul class="nav nav-pills" role="tablist">
                                         <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
+                                        <li class="nav-item d-none"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
                                         <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
                                         <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
                                     </ul>
                                 </div>
-                            
+                            </div>
                             <div class="tab-content py-3">
                                 <div class="tab-pane fade" id="profile" role="tabpanel">
-                                    <table class="table table-nobordered">
+                                    <div class="card my-2">
-                                        <tr class="table-info">
+                                        <div class="card-header bg-white">
-                                            <td colspan="2"><b>Profile Sekolah</b></td>
+                                            <h5 class="mb-0 fw-500">Data Jumlah</h5>
-                                        </tr>
+                                        </div>
-                                        <tr>
+                                        <div class="card-body">
-                                            <td>NPSN</td>
+                                            <div class="row">
-                                            <td>{{@$sekolah->npsn}}</td>
+                                                <div class="col-md-6">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Peserta Didik</label>
-                                            <td>Nama Sekolag</td>
+                                                        <input disabled name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
-                                            <td>{{@$sekolah->nama_sekolah}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Tenaga kependidikan</label>
-                                            <td>Tingkat Sekolah</td>
+                                                        <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
-                                            <td>{{@$sekolah->tingkat->name}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Jumlah Biopori</label>
-                                            <td>Status Sekolah</td>
+                                                        <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
-                                            <td>{{@$sekolah->status}}</td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr class="table-info">
+                                                        <label>Jumlah Pohon/Tanaman yang ditanam dan tumbuh</label>
-                                            <td colspan="2"><b>Alamat Sekolah</b></td>
+                                                        <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
-                                        </tr>
+                                                    </div>
-                                        <tr>
+                                                </div>
-                                            <td>Provinsi</td>
+                                                <div class="col-md-6">
-                                            <td>{{@$sekolah->provinsi->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Tenaga Pendidik</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
-                                            <td>Kabupaten/Kota</td>
+                                                    </div>
-                                            <td>{{@$sekolah->kabupaten->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Warga Sekolah Lainnya</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
-                                            <td>Kecamatan</td>
+                                                    </div>
-                                            <td>{{@$sekolah->kecamatan->name}}</td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Jumlah Sumur Resapan</label>
-                                        <tr>
+                                                        <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
-                                            <td>Alamat Lengkap</td>
+                                                    </div>
-                                            <td>{{@$sekolah->profile->alamat_sekolah}}</td>
+                                                </div>
-                                        </tr>
+                                            </div>
-                                        <tr>
+                                        </div>
-                                            <td>Kontak Person</td>
+                                    </div>
-                                            <td>{{@$sekolah->profile->kontak_person}}</td>
+                                    <div class="card my-2">
-                                        </tr>
+                                        <div class="card-header bg-white">
-                                        <tr>
+                                            <h5 class="mb-0 fw-500">Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS</h5>
-                                            <td>Telp</td>
+                                        </div>
-                                            <td>{{@$sekolah->profile->telp}}</td>
+                                        <div class="card-body">
-                                        </tr>
+                                            <div class="row">
-                                        <tr class="table-info">
+                                                <div class="col-md-6">
-                                            <td colspan="2"><b>Data Jumlah</b></td>
+                                                    <div class="form-group">
-                                        </tr>
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
-                                        <tr>
+                                                        <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            <td scope="row"> Jumlah Peserta Didik</td>
+                                                    </div>
-                                            <td>
+                                                </div>
-                                              <input readonly name="jumlah_peserta_didik" value="{{@$jumlah_peserta_didik ? @$jumlah_peserta_didik : old('jumlah_peserta_didik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah peserta didik">
+                                                <div class="col-md-6">
-                                            </td>
+                                                    <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></label>
-                                        </tr>
+                                                    <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                        <tr>
+                                                </div>
-                                            <td scope="row"> Jumlah Tenaga Pendidik</td>
+                                            </div>
-                                            <td>
+                                        </div>
-                                              <input readonly name="jumlah_tenaga_pendidik" value="{{@$jumlah_tenaga_pendidik ? @$jumlah_tenaga_pendidik : old('jumlah_tenaga_pendidik')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga pendidik">
+                                    </div>
-                                            </td>
+                                    <div class="card my-2">
-                                        </tr>
+                                        <div class="card-header bg-white">
-                                        <tr>
+                                            <h5 class="mb-0 fw-500">Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS</h5>
-                                            <td scope="row"> Jumlah Tenaga kependidikan</td>
+                                        </div>
-                                            <td>
+                                        <div class="card-body">
-                                              <input readonly name="jumlah_tenaga_kependidikan" value="{{@$jumlah_tenaga_kependidikan ? @$jumlah_tenaga_kependidikan : old('jumlah_tenaga_kependidikan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah tenaga kependidikan">
+                                            <div class="row">
-                                            </td>
+                                                <div class="col-md-6">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></small></label>
-                                            <td scope="row"> Jumlah Warga Sekolah Lainnya</td>
+                                                        <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            <td>
+                                                    </div>
-                                              <input readonly name="jumlah_warga_sekolah_lainnya" value="{{@$jumlah_warga_sekolah_lainnya ? @$jumlah_warga_sekolah_lainnya : old('jumlah_warga_sekolah_lainnya')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah warga lainnya (cont:petugas kebersihan, petugas keamanan, petugas kantin, dll)">
+                                                    <div class="form-group">
-                                            </td>
+                                                        <label>Luas ruangan ber AC</label>
-                                        </tr>
+                                                        <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                        <tr>
+                                                    </div>
-                                            <td scope="row"> Jumlah Biopori</td>
+                                                    <div class="form-group">
-                                            <td>
+                                                        <label>Jumlah Kader</label>
-                                              <input readonly name="jumlah_biopori" value="{{@$jumlah_biopori ? @$jumlah_biopori : old('jumlah_biopori')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah biopori">
+                                                        <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                </div>
-                                        <tr>
+                                                <div class="col-md-6">
-                                            <td scope="row"> Jumlah Sumur Resapan</td>
+                                                    <div class="form-group">
-                                            <td>
+                                                        <label>Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small></label>
-                                              <input readonly name="jumlah_sumur_resapan" value="{{@$jumlah_sumur_resapan ? @$jumlah_sumur_resapan : old('jumlah_sumur_resapan')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah sumur resapan">
+                                                        <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
+                                                    </div>
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label>Luas ruangan non AC</label>
-                                            <td scope="row"> Jumlah Pohon/Tanaman yang ditanam dan tumbuh</td>
+                                                        <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            <td>
+                                                    </div>
-                                              <input readonly name="jumlah_pohon" value="{{@$jumlah_pohon ? @$jumlah_pohon : old('jumlah_pohon')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jumlah pohon tanaman">
+                                                </div>
-                                            </td>
+                                            </div>
-                                        </tr>
+                                        </div>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan air sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan)</small></td>
-                                            <td>
-                                              <input readonly name="air_sebelum_pblhs" value="{{@$air_sebelum_pblhs ? @$air_sebelum_pblhs : old('air_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td scope="row"> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(Meter Kubik/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="air_setelah_pblhs" value="{{@$air_setelah_pblhs ? @$air_setelah_pblhs : old('air_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam meter kubik">
-                                            </td>
-                                        </tr>
-                                        <tr class="table-info">
-                                            <td colspan="2"><b>Penghematan listrik sebelum dan setelah melaksanakan gerakan PBLHS :</b></td>
-                                          </tr>
-                                          <tr>
-                                            <td> Sebelum melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan)</small><br> <small class="text-info"></smald>
-                                            </th>
-                                            <td>
-                                              <input readonly name="listrik_sebelum_pblhs" value="{{@$listrik_sebelum_pblhs ? @$listrik_sebelum_pblhs : old('listrik_sebelum_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Setelah melaksanakan gerakan PBLHS <br> <small class="text-info">(KWH/Bulan dalam Tahun ajaran 2022/2023)</small></td>
-                                            <td>
-                                              <input readonly name="listrik_setelah_pblhs" value="{{@$listrik_setelah_pblhs ? @$listrik_setelah_pblhs : old('listrik_setelah_pblhs')}}" type="text" class="numberInput form-control form-control-sm" placeholder="rata-rata per bulan dalam kwh">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan ber AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_ac" value="{{@$luas_ruangan_ac ? @$luas_ruangan_ac : old('luas_ruangan_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-                                          <tr>
-                                            <td> Luas ruangan non AC</td>
-                                            <td>
-                                              <input readonly name="luas_ruangan_non_ac" value="{{@$luas_ruangan_non_ac ? @$luas_ruangan_non_ac : old('luas_ruangan_non_ac')}}" type="text" class="numberInput form-control form-control-sm" placeholder="dalam satuan meter persegi">
-                                            </td>
-                                          </tr>
-
-                                          <tr>
-                                            <td> Jumlah Kader</td>
-                                            <td>
-                                              <input readonly name="jumlah_kader" value="{{@$jumlah_kader ? @$jumlah_kader : old('jumlah_kader')}}" type="text" class="numberInput form-control form-control-sm" placeholder="jml kader yang dibentuk dan diberdayakan selama pelaksanaan gerakan PBLHS">
-                                            </td>
-                                          </tr>
-                                    </table>
                                     </div>
-                                <div class="tab-pane fade" id="dokumen" role="tabpanel">
-                                    <table class="table table-bordered">
-                                        <tr>
-                                            <td class="table-info">Seleksi Isian Dokumen Administrasi CSA</td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah nama CSAN tercantum dalam SK/Piagam Sekolah Adiwiyata Provinsi (untuk SAP 2021/2022/2023/2024/2025) atau SK/Piagam Perpanjangan Adiwiyata Tahun 2023/2024/2025  </b></p>
-
-                                                <input value="1" {{@$dokumen->nama_dalam_sk == 1 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Ya<br>
-                                                <input value="2" {{@$dokumen->nama_dalam_sk == 2 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak<br>
-                                                <input value="3" {{@$dokumen->nama_dalam_sk == 3 ? 'checked' : '' }} type="radio" name="dokumen_1">&nbsp;Tidak Ada Bukti/Dokumen <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Apakah salinan SK/Piagam Sekolah Adiwiyata provinsi di tandatangani Gubernur atau pejabat yang diberi kewenangan untuk menandatangani atau SK/Piagam Perpanjangan di Tandatangani Kepala Dinas LH ?</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->sk_ttd == 1 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Ya <br>
-                                                <input value="2" {{@$dokumen->sk_ttd == 2 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak <br>
-                                                <input value="3" {{@$dokumen->sk_ttd == 3 ? 'checked' : '' }} type="radio" name="dokumen_2">&nbsp;Tidak Ada Bukti/Dokumen  <br>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <p><b>Waktu Penetapan Penghargaan SAP</b></p>
-                                                
-                                                <input value="1" {{@$dokumen->waktu_penetapan == 1 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022/ 2023/ 2024 ditetapkan SEBELUM 1 Agustus 2024 <br>
-                                                <input value="2" {{@$dokumen->waktu_penetapan == 2 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP tahun 2021/ 2022 /2023/ 2024 ditetapkan SETELAH 1 Agustus 2024 <br>
-                                                <input value="3" {{@$dokumen->waktu_penetapan == 3 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP/SAN/SAM perolehan tahun 2020 atau sebelumnya serta lolos perpanjangan sebagai SAP <br>
-                                                <input value="4" {{@$dokumen->waktu_penetapan == 4 ? 'checked' : '' }} type="radio" name="dokumen_3">&nbsp; SAP perolehan tahun 2020 atau sebelumnya serta tidak ada SK/piagam perpanjangan sebagai SAP <br>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveAdministrasi" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                        </tr>
-                                        @endif
-                                    </table>
                                 </div>
                                 <div class="tab-pane fade active show" id="kriteria" role="tabpanel">
                                     <div class="row">
-                                        <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
+                                        <div class="col-md-4">
-                                            <ul class="pageNumber">
+                                            <div class="card">
-                                                @foreach($page as $hal)
+                                                <div class="card-body">
-                                                <li class="page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
+                                                    <div class="my-3 text-center ">
-                                                @endforeach
-                                                <!-- <li class="resume">Resume</li> -->
-                                            </ul>
-                                        </div>
-                                        <div class="col-md-12 mt-3">
-                                            <div class="alert alert-primary mb-2 p-2">
-                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-8 bodyInput">
-                                            <div id="loading-spinner" style="display: none; text-align: center;">
-                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                            </div>
-                                            <div class="changeForm">
-                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
-                                            </div>
-                                        </div>
-                                        <div class="col-md-4 mt-5 mx-auto">
-                                            <div class="mx-auto text-center">
                                                         <a href="#" class="btn btn-outline-primary mr-2 ">
                                                             Sekolah
                                                             <br>
@@ -319,72 +220,91 @@
                                                             <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
                                                         </a>
                                                     </div>
+                                                    <div class="pageNumber row gap-1 justify-content-center">
+                                                        @foreach($page as $hal)
+                                                        <div class="col-3 text-center page {{ (checkPenilaian($hal,$sekolah->MsSekolahId) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
+                                                                <span>{{$hal}}</span>
                                                         </div>
-                                        @if(@$kuesioner->status < 4)
+                                                        @endforeach
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-8">
+                                            <div class="card">
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        <div class="col-md-12">
+                                                            <div class="alert alert-primary mb-2 p-2">
+                                                                <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                                                            </div>
+                                                        </div>
+                                                        <div class="col-md-12 bodyInput">
+                                                            <div id="loading-spinner" style="display: none; text-align: center;">
+                                                                <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
+                                                            </div>
+                                                            <div class="changeForm">
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                            </div>
+                                                        </div>
+                                                        @if(@$kuesioner->status <= 4)
                                                             <div class="col-md-12 mt-3">
                                                                 <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
                                                             </div>
                                                         @endif
                                                     </div>
                                                 </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="tab-pane fade" id="usulan" role="tabpanel">
-                                    <table class="table table-nobordered">
+                                    <div class="card">
-                                        <tr>
+                                        <div class="card-header bg-white">
-                                            <th colspan="2" class="table-info">Usulan</th>
+                                            <h4 class="mb-0 fw-500">Form Validasi</h4>
-                                        </tr>
+                                        </div>
-                                        <tr>
+                                        <div class="card-body">
-                                            <td>Jenis Usulan CSA</td>
+                                            <div class="row">
-                                            <td>{{getUsulan($sekolah->MsSekolahId)}}</td>
+                                                <div class="col-12">
-                                        </tr>
+                                                    <div class="alert bg-primary-light text-primary mb-3">
-                                        <tr>
+                                                        <i class="fal fa-info-circle"></i>&nbsp;Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
-                                            <th colspan="2" class="table-info">Penghargaan</th>
+                                                    </div>
-                                        </tr>
+                                                </div>
-                                        <tr>
+                                                <div class="col-md-6 my-2">
-                                            <td>Penghargaan Terakhir</td>
+                                                    <div class="form-group">
-                                            <td>{{getPenghargaanTerakhir($sekolah->MsSekolahId)}}</td>
+                                                        <label class="fw-500">Jenis Usulan CSA</label>
-                                        </tr>
+                                                        <input disabled type="text" class="form-control" name="" value="{{getUsulan($sekolah->MsSekolahId)}}">
-                                        <tr>
+                                                    </div>
-                                            <td>Nomor SK</td>
+                                                </div>
-                                            <td>-</td>
+                                                <div class="col-md-6 my-2">
-                                        </tr>
+                                                    <div class="form-group">
-                                        <tr>
+                                                        <label class="fw-500">Validasi</label>
-                                            <td>Tanggal Penetapan SK</td>
-                                            <td>-</td>
-                                        </tr>
-                                        <tr>
-                                            <th colspan="2" class="table-info">Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}} :</th>
-                                        </tr>
-                                        <tr>
-                                            <td>Nilai Dokumen Administrasi</td>
-                                            <td>0</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Nilai Pemenuhan Kriteria</td>
-                                            <td>0</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Validasi</td>
-                                            <td>
                                                         <select class="form-control select2" id="validasi" name="validasi">
                                                             <option value="">- Pilih Validasi -</option>
-                                                    <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Diteruskan</option>
+                                                            @if(session('group_alias') == 'penilai_kota')
-                                                    <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
+                                                            <option value="1">Diteruskan</option>
-                                                </select>
+                                                            <option value="2">Dikembalikan</option>
-                                            </td>
+                                                            @elseif(session('group_alias') == 'penilai_provinsi')
-                                        </tr>
+                                                            <option value="1">Selesai</option>
-                                        <tr>
-                                            <td>Catatan</td>
-                                            <td>
-                                                <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
-                                            </td>
-                                        </tr>
-                                        @if(@$kuesioner->status < 4)
-                                        <tr>
-                                            <td><button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
-                                            <td></td>
-                                        </tr>
                                                             @endif
-                                    </table>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                                <div class="col-md-12 my-2">
+                                                    <div class="form-group">
+                                                        <label class="fw-500">Catatan</label>
+                                                        <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
+                                                    </div>
+                                                </div>
+                                                @if(@$kuesioner->status <= 4)
+                                                <div class="col-md-12 my-2">
+                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                </div>
+                                                @endif
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
                                 </div>
                             </div>
                         
@@ -408,8 +328,8 @@
         let number = $(this).data('number');
         let base_url = "{{url('/')}}";
         // Tambahkan kelas active dan hapus dari yang lain
-        $('.page').removeClass('activePage');
+        $('.page').removeClass('bg-primary-light border-primary text-primary');
-        $(this).addClass('activePage');
+        $(this).addClass('bg-primary-light border-primary text-primary');
 
         $.ajax({
             url: base_url+'/getForm', // Ganti dengan URL API-mu
@@ -576,7 +496,7 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
-            if (type === 'radio' || type === 'checkbox') {
+            if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {
                     isValid = false;
@@ -584,6 +504,16 @@
                 } else {
                     $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
                 }
+            }else if(type === 'checkbox'){
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                }else if ($(`input[name="${name}"]:checked`).length === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
+                }
             } else {
                 // Validasi input teks atau lainnya
                 if (!value) {
@@ -617,6 +547,8 @@
             success: function (response) {
                 // console.log('Response:', response);
                 toastr.success("Berhasil menyimpan data", 'Success!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+                $('.nilai_kota').html(response.nilai_kota);
+                $('.nilai_provinsi').html(response.nilai_prov);
 
                 
                 $('.page').closest('.activePage').addClass('bg-success');

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

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,14 +106,15 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
-                    <div id="toolbar"></div>
+                    <div id="toolbar">
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
+                    </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -134,17 +126,16 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="npsn">NPSN</th>
                           <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">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
-                          <th data-field="tingkat_sekolah">SK</th>
                         </tr>
                       </thead>
                       <tbody></tbody>
@@ -160,6 +151,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

resources/views/modules/usulan/kriteria/form.blade.php

@@ -3,62 +3,43 @@
 @section('page-css')
 <link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
 <link rel="stylesheet" href="{{asset('assets/css/formplugins/dropzone/dropzone.css')}}">
-<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.9.3/min/dropzone.min.css"> -->
-<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.9.3/min/dropzone.min.js"></script> -->
-
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-    .pageNumber{ list-style:none; padding:0px; margin: 0px;}
-    .pageNumber > li{ display: inline-block; padding: 12px; background: rgba(255, 255, 255, 0.5); margin: 5px 1px;}
-    .pageNumber > li:hover{cursor: pointer;}
-    .page.active {
-        background-color: #007bff; /* Warna biru */
-        color: white;
-        font-weight: bold;
-    }
-/*    #file-list{ margin: 0px; padding: 0px; width: 40%;}*/
-    #file-list > li{
-/*        padding: 10px;*/
-/*      border: 1px solid #ddd;*/
-/*      border-radius: 5px;*/
-/*      margin: 5px 0px;*/
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
+<form method="POST" id="form">
-    <h1 class="subheader-title">
+        {{csrf_field()}}
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
+        <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
-    </h1>
-</div>
 <div class="row">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
+                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-lg-12">
         @if ($errors->any())
             <div class="alert alert-danger">
@@ -69,49 +50,38 @@
                 </ul>
             </div>
         @endif
-        <form method="POST" id="form">
-        {{csrf_field()}}
-        <input type="hidden" name="secure_id" value="{{encode_id($kuesioner->KuesionerId)}}">
-            <div class="card">
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{session('npsn')}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{session('name')}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{session('tingkat_sekolah')}}</span> <span class="badge badge-success">{{session('status_sekolah')}}</span></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><p>{{session('alamat_sekolah')}}</p></td>
-                                </tr>
-                            </table>
     </div>
-                        <div class="col-md-12">
+    <div class="col-lg-12">
         <div class="alert alert-warning">
             <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
             <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
         </div>
     </div>
-                        <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
+    
-                            <ul class="pageNumber">
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-body">
+                    <div class="pageNumber row gap-1 justify-content-center">
                         @foreach($page as $hal)
-                                <li class="page {{ (checkPenilaian($hal) == true ? 'bg-success text-white' : '' )}}" data-number={{$hal}}>{{$hal}}</li>
+                        <div class="col-3 text-center page {{ (checkPenilaian($hal) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
-                                @endforeach
+                            <span>{{$hal}}</span>
-                                <li class="resume">Resume</li>
-                                <li class="progress_usulan">Progress Usulan</li>
-                            </ul>
                         </div>
-                        <div class="col-md-12 mt-3">
+                        @endforeach
+                    </div>
+                    <div class="row mt-2 gap-1 justify-content-center">
+                        <div class="col-5 d-none text-center resume border-secondary rounded" style="padding: 10px;">
+                            <span>Resume</span>
+                        </div>
+                        <div class="col-5 text-center progress_usulan border-secondary rounded" style="padding: 10px;">
+                            <span>Progress Usulan</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-8">
+            <div class="row">
+                <div class="col-md-12">
                     <div class="alert alert-primary mb-2 p-2">
                         <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
                     </div>
@@ -124,28 +94,25 @@
                         {!! formKriteria(1) !!}
                     </div>
                 </div>
-                        
+                <div class="col-md-12">
-                    </div>
-                </div>
-                <div class="card-footer">
                     @if(session('group_alias') == 'sekolah')
-                        @if($kuesioner->status == 1)
+                        @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                            <div class="text-right">
                                 <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                            </div>
                         @endif
                     @endif
                 </div>
-                
             </div>
-        </form>
-        
         </div>
-</div>
+    </div>
+</form>
 @endsection
 @section('page-js')
 <script type="text/javascript" src="{{asset('assets/js/formplugins/dropzone/dropzone.js')}}"></script>
 <script type="text/javascript">
     @if(session('group_alias') == 'sekolah')
-        @if($kuesioner->status != 1)
+        @if(($kuesioner->status != 1) && ($kuesioner->status != 5))
             $('.dropzone').remove();
         @endif
     @endif
@@ -178,7 +145,7 @@
                             hiddenInput.name = 'input_upload_files[]';
                             hiddenInput.value = fileInfo.filename;
                             hiddenInput.class = 'removeFormKriteria';
-                            var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria">';
+                            var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria uploadedFiles is-required">';
                             $('.changeForm').append(elem);
                         });
                     });
@@ -201,8 +168,8 @@
         let number = $(this).data('number');
         let base_url = "{{url('/')}}";
         // Tambahkan kelas active dan hapus dari yang lain
-        $('.page').removeClass('active');
+        $('.page').removeClass('bg-primary-light border-primary text-primary');
-        $(this).addClass('active');
+        $(this).addClass('bg-primary-light border-primary text-primary');
 
         $.ajax({
             url: base_url+'/getForm', // Ganti dengan URL API-mu
@@ -251,7 +218,7 @@
                                 hiddenInput.name = 'input_upload_files[]';
                                 hiddenInput.class = 'removeFormKriteria';
                                 hiddenInput.value = fileInfo.filename;
-                                var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria">';
+                                var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria uploadedFiles is-required">';
                                 $('.changeForm').append(elem);
                             });
                         });
@@ -265,7 +232,7 @@
                 });
 
                 @if(session('group_alias') == 'sekolah')
-                    @if($kuesioner->status != 1)
+                    @if(($kuesioner->status != 1) && ($kuesioner->status != 5))
                         $('.dropzone').remove();
                     @endif
                 @endif
@@ -296,6 +263,7 @@
         let formData = {};
         let allData = {};
         let isValid = true; // Flag validasi
+        let isMultiple = true; // Flag validasi
 
         currentForm.forEach(field => {
             let name = field.name.replace(/\[\]$/, ''); // Hapus "[]" di akhir nama input
@@ -315,7 +283,17 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
-            if (type === 'radio' || type === 'checkbox') {
+            let uploadedFilesValue = $('.uploadedFiles').val();
+            if (!uploadedFilesValue || uploadedFilesValue === '') {
+                isValid = false;
+                $('.uploadedFiles').addClass("is-invalid");
+                toastr.error("Harap upload minimal 1 file", 'Error!', {positionClass: 'toast-bottom-right'});
+                return;
+            } else {
+                $('.uploadedFiles').removeClass("is-invalid");
+            }
+
+            if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {
                     isValid = false;
@@ -323,6 +301,16 @@
                 } else {
                     $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
                 }
+            }else if(type === 'checkbox'){
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                }else if ($(`input[name="${name}"]:checked`).length === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
+                }
             } else {
                 // Validasi input teks atau lainnya
                 if (!value) {
@@ -341,6 +329,12 @@
             return;
         }
 
+        if (!isMultiple) {
+            toastr.error("Harap isi minimal lebih dari 1 isian", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+            // alert(".");
+            return;
+        }
+
         $.ajax({
             url: "{{route($route.'.store')}}", // Ganti dengan URL API-mu
             type: 'POST', // Bisa juga 'POST' kalau perlu

resources/views/modules/usulan/kriteria/progress.blade.php

@@ -1,238 +1,61 @@
 @extends('layouts.master')
 
 @section('page-css')
-<link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    /* The actual timeline (the vertical ruler) */
-.main-timeline {
-  position: relative;
-}
-
-/* The actual timeline (the vertical ruler) */
-.main-timeline::after {
-  content: '';
-  position: absolute;
-  width: 6px;
-  background-color: #939597;
-  top: 0;
-  bottom: 0;
-  left: 50%;
-  margin-left: -3px;
-}
-
-/* Container around content */
-.timeline {
-  position: relative;
-  background-color: inherit;
-  width: 50%;
-}
-
-/* The circles on the timeline */
-.timeline::after {
-  content: '';
-  position: absolute;
-  width: 25px;
-  height: 25px;
-  right: -13px;
-  background-color: #939597;
-  border: 5px solid #F5DF4D;
-  top: 15px;
-  border-radius: 50%;
-  z-index: 1;
-}
-
-/* Place the container to the left */
-.left {
-  padding: 0px 40px 20px 0px;
-  left: 0;
-}
-
-/* Place the container to the right */
-.right {
-  padding: 0px 0px 20px 40px;
-  left: 50%;
-}
-
-/* Add arrows to the left container (pointing right) */
-.left::before {
-  content: " ";
-  position: absolute;
-  top: 18px;
-  z-index: 1;
-  right: 30px;
-  border: medium solid white;
-  border-width: 10px 0 10px 10px;
-  border-color: transparent transparent transparent white;
-}
-
-/* Add arrows to the right container (pointing left) */
-.right::before {
-  content: " ";
-  position: absolute;
-  top: 18px;
-  z-index: 1;
-  left: 30px;
-  border: medium solid white;
-  border-width: 10px 10px 10px 0;
-  border-color: transparent white transparent transparent;
-}
-
-/* Fix the circle for containers on the right side */
-.right::after {
-  left: -12px;
-}
-
-/* Media queries - Responsive timeline on screens less than 600px wide */
-@media screen and (max-width: 600px) {
-  /* Place the timelime to the left */
-  .main-timeline::after {
-    left: 31px;
-  }
-
-  /* Full-width containers */
-  .timeline {
-    width: 100%;
-    padding-left: 70px;
-    padding-right: 25px;
-  }
-
-  /* Make sure that all arrows are pointing leftwards */
-  .timeline::before {
-    left: 60px;
-    border: medium solid white;
-    border-width: 10px 10px 10px 0;
-    border-color: transparent white transparent transparent;
-  }
-
-  /* Make sure all circles are at the same spot */
-  .left::after, .right::after {
-    left: 18px;
-  }
-
-  .left::before {
-    right: auto;
-  }
-
-  /* Make all right containers behave like the left ones */
-  .right {
-    left: 0%;
-  }
-}
-
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-    .pageNumber{ list-style:none; padding:0px; margin: 0px;}
-    .pageNumber > li{ display: inline-block; padding: 12px; background: rgba(255, 255, 255, 0.5); margin: 5px 1px;}
-    .pageNumber > li:hover{cursor: pointer;}
-    .pageNumber > li.active {
-        background-color: #007bff; /* Warna biru */
-        color: white;
-        font-weight: bold;
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
-    <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
-    </h1>
-</div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
+                    <h1 class="subheader-title">
+                        {{$title}}
+                    </h1>
+                </div>
+            </div>
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
+                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12">
+        <div class="alert alert-warning mb-2">
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
+        </div>
+    </div>
     @if ($errors->any())
-            <div class="alert alert-danger">
+        <div class="col-md-12">
+            <div class="alert alert-danger mb-2">
                 <ul>
                     @foreach ($errors->all() as $error)
                         <li>{{ $error }}</li>
                     @endforeach
                 </ul>
             </div>
+        </div>
     @endif
-        <form method="POST" id="form">
+    <div class="col-md-6">
-        {{csrf_field()}}
         <div class="card">
             <div class="card-body">
-                    <div class="row">
+                <h4 class="mb-3 fw-700">Status Usulan</h4>
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{session('npsn')}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{session('name')}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{session('tingkat_sekolah')}}</span> <span class="badge badge-success">{{session('status_sekolah')}}</span></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><p>{{session('alamat_sekolah')}}</p></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-md-12">
-                            <div class="alert alert-warning">
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
-                            </div>
-                        </div>
-                        <div class="col-md-12 mb-4" style="background: rgba(23, 162, 184, 0.2) !important;">
-                            <ul class="pageNumber">
-                                <li class="back"><i class="fal fa-arrow-left"></i></li>
-                                <li class="resume">Resume</li>
-                                <li class="progress_usulan active">Progress Usulan</li>
-                            </ul>
-                        </div>
-                        <div class="col-md-12 bodyInput">
-                            <section style="background-color: #F0F2F5;">
-                                  <div class="container py-5">
-                                    <div class="main-timeline">
-                                    @foreach($log as $logs)
-                                      <div class="timeline left d-none">
-                                        <div class="card">
-                                          <div class="card-body p-4">
-                                            <h3><b>{{\Str::title(str_replace('_',' ',$logs->step))}}</b></h3>
-                                            <p class="mb-0">Oleh : {{user($logs->created_by)->name}} <span class="badge badge-primary">{{group($logs->created_by)->name}}</span></p>
-                                            <p class="mb-0">Tanggal : {{$logs->created_at}}</p>
-                                          </div>
-                                        </div>
-                                      </div>
-                                      @endforeach
-
-                                    <div class="timeline left">
-                                        <div class="card">
-                                          <div class="card-body p-4">
-                                            <h3><b>Status Usulan</b></h3>
                 <?php
                     if(($kuesioner->level+1) == 1){
                         $jenis_usulan = 'Kabupaten/Kota';
@@ -244,74 +67,88 @@
                         $jenis_usulan = 'Mandiri';
                     }
                 ?>
-                                            <p class="">
+                <p>
                     Sekolah diusulan untuk menjadi CSA (Calon Sekolah Adiwiyata) <b>{{$jenis_usulan}}</b><br>
                 </p>
                 <span class="text-primary">Silahkan lengkapi data pada menu Usulan Adiwiyata. </span>
             </div>
         </div>
     </div>
-                                     
+    <div class="col-md-6">
-                                      <div class="timeline right">
+        <form method="POST" id="form">
+            {{csrf_field()}}
             <div class="card">
                 <div class="card-body p-4">
-                                            <h3><b>
+                <h4 class="mb-3 fw-700">Kirim Kelengkapan Data</h4>
-                                                @if($kuesioner->status == 3)
-                                                <span class="badge badge-success"><i class="fal fa-check"></i></span>&nbsp;
-                                                @endif
-                                                Kirim Kelengkapan Data
-                                            </b></h3>
                 <p>Kab/Kota akan melakukan validasi, jika data sekolah lengkap akan diproses. apabila data belum lengkap akan dikembalikan ke sekolah untuk melakukan perbaikan. </p>
-                                            <p class="text-primary">Pastikan NPSN, Profile, Dok Adminstrasi, Sekolah Binaan (CSAM) dan Pemenuhan Kriteria sudah sesuai.</p>
+                <div class="alert bg-primary-light mb-3">
-                                            <ul>
+                    <p class="text-primary mb-0">Pastikan NPSN, Profile, Dok Adminstrasi dan Pemenuhan Kriteria sudah sesuai.</p>
-                                                <li>
+                </div>
-                                                    Dokumen Administrasi 
+                <div class="d-flex flex-column gap-3">
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-envelope"></i>&nbsp;Dokumen Administrasi 
+                        </div>
+                        <div>
                             @if(@$dok)
                                 @if(@$dok->status == 1)
-                                                            <span class="badge badge-success">Dokumen Sudah Di Verifikasi</span>
+                                    <span class="badge bg-success-light text-success">Dokumen Sudah Di Verifikasi</span>
                                 @elseif(@$dok->status == 2)
-                                                            <span class="badge badge-danger">Dokumen Ditolak</span>
+                                    <span class="badge bg-danger-light text-danger">Dokumen Ditolak</span>
                                 @else
-                                                            <span class="badge badge-warning">Menunggu Verifikasi Dokumen</span>
+                                    <span class="badge bg-warning-light text-warning">Menunggu Verifikasi Dokumen</span>
                                 @endif
                             @else
                                 <span class="badge badge-danger">Belum Upload Dokumen</span>
                             @endif
-                                                </li>
+                        </div>
-                                                <li>Pemenuhan Kriteria {{count(@$penilaian)}} / {{count(@$page)}} 
+                    </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <div>
+                            <i class="fal fa-list"></i>&nbsp;Pemenuhan Kriteria
+                        </div>
+                        <div>
+                            {{count(@$penilaian)}} / {{count(@$page)}} &nbsp;
                             @if(count(@$penilaian) == count(@$page))
-                                                    <span class="badge badge-success">Sudah Lengkap</span>
+                                <span class="badge bg-success-light text-success">Sudah Lengkap</span>
                             @else
-                                                    <span class="badge badge-danger">Belum Lengkap</span>
+                                <span class="badge bg-danger-light text-danger">Belum Lengkap</span>
                             @endif
-                                                </li>
+                        </div>
-                                            </ul>
+                    </div>
+                </div>
                 @if(session('group_alias') == 'sekolah')
-                                                @if($kuesioner->status == 1)
+                    <div class="d-flex flex-row justify-content-between my-3">
-                                                    <div class="custom-control custom-checkbox m-2">
+                        @if(session('group_alias') == 'sekolah')
+                            @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
+                                <div class="custom-control custom-checkbox">
                                     <input type="checkbox" class="custom-control-input is-required check" id="true" value="1" name="check">
                                     <label class="custom-control-label" for="true">Dengan ini menyatakan bahwa kelengkapan data sudah benar.</label>
                                 </div>
+                            @endif
+                        @endif
+                    </div>
+                    @if(session('group_alias') == 'sekolah')
+                        @if(@$kuesioner->status == 5)
+                            <div class="alert alert-danger my-2">
+                                Status : {!!kuesionerLogStatus(@$kuesioner->KuesionerId)!!} <br>
+                                <p class="mb-0"><i>Pastikan isian sudah diperbaiki sebelum dikirim kembali</i></p>
+                            </div>
+                        @endif
+                        @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
                             <button class="btn btn-success btnSend">Kirim Data</button>
                         @endif
                     @endif
+                @endif
               </div>
             </div>
             <div id="loading-spinner" style="display: none; text-align: center;">
                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
             </div>
-                                      </div>
-                                    </div>
-                                  </div>
-                                </section>
-                        </div>
-                        
-                    </div>
-                </div>
-                
-            </div>
         </form>
     </div>
+
+    
 </div>
 @endsection
 @section('page-js')

resources/views/modules/usulan/kriteria/resume.blade.php

@@ -1,126 +1,77 @@
 @extends('layouts.master')
 
 @section('page-css')
-<link rel="stylesheet" media="screen, print" href="{{asset('assets/css/datagrid/datatables/datatables.bundle.css')}}">
-<style type="text/css">
-    .listItem{
-        list-style: none;
-        margin: 0;
-        padding: 0;
-    }
-    .listItem > li{
-        display: inline-block;
-        margin: 10px;
-    }
-    .listItem > li:hover{
-        cursor: pointer;
-    }
-    .listItem > li .number{
-        font-size: 14px;
-        color: #fff;
-        background: #0ba360 !important;
-        padding: 10px;
-        border-radius: 10%;
-    }
-    .level{
-        float: right;
-        color: #fff;
-        text-align: center;
-        width: 100px;
-    }
-    .nav-link{
-        border-radius: 0px!important;
-    }
-    .pageNumber{ list-style:none; padding:0px; margin: 0px;}
-    .pageNumber > li{ display: inline-block; padding: 12px; background: rgba(255, 255, 255, 0.5); margin: 5px 1px;}
-    .pageNumber > li:hover{cursor: pointer;}
-    .pageNumber > li.active {
-        background-color: #007bff; /* Warna biru */
-        color: white;
-        font-weight: bold;
-    }
-</style>
 @endsection
 @section('content')
-<div class="subheader">
+<div class="row" id="accordion">
+    <div class="col-12 mb-3">
+        <div class="d-flex flex-row justify-content-between">
+            <div class="d-flex align-items-center">
+                <div class="subheader mb-0">
                     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-edit'></i> {{$title}}
+                        {{$title}}
                     </h1>
-</div>
+                </div>
-<div class="row">
+            </div>
-    <div class="col-lg-12">
+            <div class="align-items-end">
+                <div class="card">
+                    <div class="card-body p-2">
+                        <div class="d-flex flex-row gap-3 justify-content-center align-items-center">
+                            <div class="p-2 bg-secondary rounded">
+                                <i class="fal fa-home"></i>
+                            </div>
+                            <div>
+                                <h5 class="fw-700 mb-1">{{session('name')}}</h5>
+                                <p class="mb-0">NPSN: {{session('npsn')}}</p>
+                            </div>
+                            <div class="d-flex flex-column gap-1">
+                                <span class="badge bg-primary-light text-primary">{{session('tingkat_sekolah')}}</span>
+                                <span class="badge bg-success-light text-success">{{session('status_sekolah')}}</span>
+                                <span class="badge bg-info-light text-info">Level {{levelAdiwiyata(session('npsn'))}}</span>
+                            </div>
+                        </div>  
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12">
+        <div class="alert alert-warning mb-2">
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
+            <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
+        </div>
+    </div>
     @if ($errors->any())
-            <div class="alert alert-danger">
+        <div class="col-md-12">
+            <div class="alert alert-danger mb-2">
                 <ul>
                     @foreach ($errors->all() as $error)
                         <li>{{ $error }}</li>
                     @endforeach
                 </ul>
             </div>
+        </div>
     @endif
-        <form method="POST" id="form">
+
-        {{csrf_field()}}
+        
-            <div class="card">
+        @foreach($page as $k => $dataNumber)
+        <div class="col-lg-12 mb-2">
+            <div class="card mb-2">
+                <div class="card-header bg-primary-light py-1 px-0" id="heading{{$k}}">
+                    <h5 class="mb-0">
+                      <button class="btn btn-link" data-toggle="collapse" data-target="#collapse{{$k}}" aria-expanded="true" aria-controls="collapse{{$k}}">
+                        {{$k+1}}
+                      </button>
+                    </h5>
+                  </div>
+                <div id="collapse{{$k}}" class="collapse" aria-labelledby="heading{{$k}}" data-parent="#accordion">
                     <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-12 p-3">
-                            <table class="" border="0" style="width:100%">
-                                <tr>
-                                    <td rowspan="5" width="5" style="vertical-align: middle; padding-right: 10px;">
-                                        <i class="fal fa-building fa-5x"></i>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h5 class="text-success">NPSN: {{session('npsn')}}</h5></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><h4><b>{{session('name')}}</b></h4></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><span class="badge badge-primary">{{session('tingkat_sekolah')}}</span> <span class="badge badge-success">{{session('status_sekolah')}}</span></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2"><p>{{session('alamat_sekolah')}}</p></td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="col-md-12">
-                            <div class="alert alert-warning">
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Anda Belum Melakukan Finalisasi Proses Data Kriteria</p>
-                                <p class="mb-0"><i class="fal fa-info-circle"></i>&nbsp;Klik <b class="text-danger">Progress Usulan</b> untuk melakukan Finalisasi Proses Data Kriteria</p>
-                            </div>
-                        </div>
-                        <div class="col-md-12 mb-4" style="background: rgba(23, 162, 184, 0.2) !important;">
-                            <ul class="pageNumber">
-                                <li class="back"><i class="fal fa-arrow-left"></i></li>
-                                <li class="resume active">Resume</li>
-                                <li class="progress_usulan">Progress Usulan</li>
-                            </ul>
-                        </div>
-                        <div class="col-md-12 bodyInput">
-                            <div id="loading-spinner" style="display: none; text-align: center;">
-                                    <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
-                                </div>
-                            <div class="changeForm">
-                                @foreach($page as $dataNumber)
-                                <div class="card mb-2" style="background:#EDE8DC;">
-                                    <div class="card-header color-white bg-success">
-                                        {{$dataNumber}}
-                                    </div>
-                                    <div class="card-body color-black">
                         {!! formKriteria($dataNumber) !!}  
                     </div>
                 </div>
+            </div>
+        </div>
         @endforeach
-                            </div>
-                        </div>
-                        
-                    </div>
-                </div>
-                
-            </div>
-        </form>
-    </div>
 </div>
 @endsection
 @section('page-js')

resources/views/modules/usulan/sk/form.blade.php

@@ -19,6 +19,10 @@
                             <input type="text" name="nama" class="form-control">
                             <small class="text-muted"><i>(Opsional)</i></small>
                         </div>
+                        <div class="form-group">
+                            <label class="label">Nomor SK</label>
+                            <input type="text" name="nomor_sk" class="form-control" required>
+                        </div>
                         <div class="form-group">
                             <label class="label">Tanggal Penetapan SK</label>
                             <input type="date" name="tanggal_penetapan" class="form-control" required>

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

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,18 +106,18 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
                     <div id="toolbar">
                         @if(permission('is_create', $route, 'module',true))
-                        <a href="{{route($route.'.create')}}" class="btn btn-primary"><i class="fal fa-plus"></i>&nbsp;Tambah {{$title}}</a>
+                        <a href="{{route($route.'.create')}}" class="btn btn-sm btn-primary"><i class="fal fa-plus"></i>&nbsp;Tambah {{$title}}</a>
                         @endif
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -138,12 +129,13 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="judul">Judul SK</th>
                           <th data-field="sekolah">Sekolah</th>
+                          <th data-field="nomor_sk">Nomor SK</th>
                           <th data-field="tanggal_penetapan">Tanggal Penetapan SK</th>
                           <th data-field="tahun">Tahun</th>
                           <th data-field="jenis_usulan">Jenis Usulan</th>
@@ -163,6 +155,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;

resources/views/modules/usulan/surat/form.blade.php

@@ -4,7 +4,7 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> Tambah {{$title}}
+        Tambah {{$title}}
     </h1>
 </div>
 <div class="row">

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

@@ -6,23 +6,14 @@
 @section('content')
 <div class="subheader">
     <h1 class="subheader-title">
-        <i class='subheader-icon fal fa-building'></i> {{$title}}
+        {{$title}}
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
-        <div class="accordion" id="accordionExample">
         <div class="card">
-            <div class="card-header" id="headingOne">
-              <h2 class="mb-0">
-                <button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                  <i class="fal fa-filter"></i>&nbsp;Filter
-                </button>
-              </h2>
-            </div>
-
-            <div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
             <div class="card-body">
+                <h5 class="mb-4"><i class="fal fa-filter"></i>&nbsp;Filter</h5>
                 <div class="row">
                     <div class="col-md-12 mb-2">
                         <div class="row">
@@ -106,7 +97,7 @@
                             </div>  
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <button class="btn btn-warning btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -115,18 +106,18 @@
             </div>
         </div>
     </div>
-        </div>
+    <div class="col-lg-12">
-
         <div id="panel-4" class="panel">
             <div class="panel-container show">
                 <div class="panel-content">
                     <div id="toolbar">
                         @if(permission('is_create', $route, 'module',true))
-                        <a href="{{route($route.'.create')}}" class="btn btn-primary"><i class="fal fa-plus"></i>&nbsp;Tambah {{$title}}</a>
+                        <a href="{{route($route.'.create')}}" class="btn btn-sm btn-primary"><i class="fal fa-plus"></i>&nbsp;Tambah {{$title}}</a>
                         @endif
+                        <a class="btn btn-secondary btn-filter btn-sm text-white"><i class="fal fa-filter text-white"></i>&nbsp;Filter</a>
                     </div>
 
-                    <table class="table table-bordered table-hover table-striped w-100" 
+                    <table class="table w-100" 
                     data-search="true"
                     data-toggle="table"
                     data-pagination="true"
@@ -138,8 +129,8 @@
                     data-page-size="10"
                     data-id-field="id"
                     id="grid-data">
-                      <thead class="text-white">
+                      <thead class="bg-primary-light text-primary">
-                        <tr class="table-primary">
+                        <tr>
                           <th data-field="action">#</th>
                           <th data-field="no">No</th>
                           <th data-field="judul">Judul Surat</th>
@@ -162,6 +153,9 @@
 <script src="{{asset('assets/js/datagrid/datatables/datatables.bundle.js')}}"></script>
 <script src="{{asset('assets/js/bootstrap-table.min.js')}}"></script>
 <script type="text/javascript">
+    $('.btn-filter').on('click',function(){
+        $('#filter').toggleClass('d-none');
+    });
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;