From 8b10cc9b7289ce53e8665c58abe3c540d710cfe6 Mon Sep 17 00:00:00 2001
From: ilhamwara <ilhamwara@gmail.com>
Date: Wed, 7 May 2025 13:22:29 +0700
Subject: [PATCH] update

---
 .../Modules/Usulan/CSAKController.php         |  16 ++-
 .../Modules/Usulan/CSAPController.php         |  24 +++-
 app/Http/Controllers/ProfileController.php    |  48 ++++----
 public/assets/css/vendors.bundle.css          | 112 ++++++++++++++++++
 .../views/modules/kuesioner/index.blade.php   |  31 ++---
 .../views/modules/profile/admin.blade.php     |  30 ++---
 .../usulan/administrasi/index.blade.php       |  32 ++---
 .../views/modules/usulan/csak/index.blade.php |  34 +++---
 .../views/modules/usulan/csam/index.blade.php |  34 +++---
 .../views/modules/usulan/csan/index.blade.php |  34 +++---
 .../views/modules/usulan/csap/index.blade.php |  34 +++---
 .../views/modules/usulan/sk/index.blade.php   |  30 ++---
 .../modules/usulan/surat/index.blade.php      |  30 ++---
 13 files changed, 289 insertions(+), 200 deletions(-)

diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index 6647922..f1b535d 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -101,8 +101,20 @@ 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 .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
+                $penilaian .= '<div class="text-white 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-white bg-primary 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 badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
 
             $sekolah = '';
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 063543a..45a4d75 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -100,9 +100,27 @@ class CSAPController extends Controller
             }
 
             $penilaian = '';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->ms_sekolah_id).'</span></br>';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'</span></br>';
-            $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+
+            $penilaian .= '<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">';
+                $penilaian .= '<div class="text-white 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-white bg-primary 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-white bg-success 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>';
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 2930f91..c615ac3 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -68,28 +68,6 @@ 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){
@@ -98,12 +76,34 @@ class ProfileController extends Controller
                 $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>';
-            if(($row->level+1) == 1){
+            if(($kuesioner->level+1) == 1){
                 $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
             }
-            if(($row->level+1) == 2){
+            if(($kuesioner->level+1) == 2){
                 $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
                 $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
             }
diff --git a/public/assets/css/vendors.bundle.css b/public/assets/css/vendors.bundle.css
index b0cf022..31b3ad4 100644
--- a/public/assets/css/vendors.bundle.css
+++ b/public/assets/css/vendors.bundle.css
@@ -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 */
diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 505d5f1..45f0b1f 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
@@ -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');
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php
index f3dcd6b..ed7e089 100644
--- a/resources/views/modules/profile/admin.blade.php
+++ b/resources/views/modules/profile/admin.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,21 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
@@ -148,7 +139,7 @@
                           <!-- <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> -->
                         </tr>
                       </thead>
@@ -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;
diff --git a/resources/views/modules/usulan/administrasi/index.blade.php b/resources/views/modules/usulan/administrasi/index.blade.php
index 6ecf8c1..9cd4ac7 100644
--- a/resources/views/modules/usulan/administrasi/index.blade.php
+++ b/resources/views/modules/usulan/administrasi/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,22 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
                     data-toggle="table"
@@ -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");
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index bdc7640..88d3ce1 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
@@ -141,10 +133,9 @@
                           <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;
diff --git a/resources/views/modules/usulan/csam/index.blade.php b/resources/views/modules/usulan/csam/index.blade.php
index bdc7640..88d3ce1 100644
--- a/resources/views/modules/usulan/csam/index.blade.php
+++ b/resources/views/modules/usulan/csam/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
@@ -141,10 +133,9 @@
                           <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;
diff --git a/resources/views/modules/usulan/csan/index.blade.php b/resources/views/modules/usulan/csan/index.blade.php
index bdc7640..88d3ce1 100644
--- a/resources/views/modules/usulan/csan/index.blade.php
+++ b/resources/views/modules/usulan/csan/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
@@ -141,10 +133,9 @@
                           <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;
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index bdc7640..88d3ce1 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,21 +97,22 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
                     data-search="true"
@@ -141,10 +133,9 @@
                           <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;
diff --git a/resources/views/modules/usulan/sk/index.blade.php b/resources/views/modules/usulan/sk/index.blade.php
index 8c3f9f8..01c87a3 100644
--- a/resources/views/modules/usulan/sk/index.blade.php
+++ b/resources/views/modules/usulan/sk/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,24 +97,24 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
@@ -164,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;
diff --git a/resources/views/modules/usulan/surat/index.blade.php b/resources/views/modules/usulan/surat/index.blade.php
index a515cad..3c13a66 100644
--- a/resources/views/modules/usulan/surat/index.blade.php
+++ b/resources/views/modules/usulan/surat/index.blade.php
@@ -10,19 +10,10 @@
     </h1>
 </div>
 <div class="row">
-    <div class="col-lg-12">
-        <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">
+    <div class="col-lg-12 mb-2 d-none" id="filter">
+        <div class="card">
+            <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,24 +97,24 @@
                             </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>
                     </div>
                 </div>
-              </div>
             </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" 
@@ -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;