From 5bbe76749dac36513a9fc5fc5ede635a002b50ae Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Thu, 29 Jan 2026 12:12:25 +0700
Subject: [PATCH] update

---
 .../views/modules/kuesioner/index.blade.php   | 316 +++++++++---------
 .../views/modules/profile/admin.blade.php     | 194 +++++------
 .../views/modules/usulan/csak/index.blade.php | 118 ++++---
 .../views/modules/usulan/csap/index.blade.php | 118 ++++---
 4 files changed, 385 insertions(+), 361 deletions(-)

diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 94523f1..f8d5b61 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -14,12 +14,56 @@
         <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="row" id="pencarian">
+                    
+                    <div class="col-md-12 mb-2">
+                        <div class="row">
+                            @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="provinsi" class="form-control select2" id="provinsi">
+                                            <option value="0">- PILIH PROVINSI -</option>
+                                            @foreach($provinsi as $datProv)
+                                            <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH KABUPATEN/KOTA -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                            <option value="0">- PILIH KECAMATAN -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            @else 
+                                @if(@$kecamatan)
+                                    <div class="col-md-3">
+                                        <div class="form-group">
+                                            <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                                <option value="0">- PILIH KECAMATAN -</option>
+                                                @foreach($kecamatan as $dataKec)
+                                                <option value="{{encode_id($dataKec->MsKecamatanId)}}">{{$dataKec->name}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                    </div> 
+                                @endif
+                            @endif
+                        </div>
+                    </div>
                     <div class="col-md-12 mb-2">
                         <div class="row">
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="tingkat" class="form-control select2">
                                         <option value="">-- PILIH TINGKAT --</option>
                                         <option value="1">SD</option>
                                         <option value="2">SMP</option>
@@ -37,7 +81,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="status_sekolah" class="form-control select2">
                                         <option value="">-- PILIH STATUS --</option>
                                         <option value="Negeri">Negeri</option>
                                         <option value="Swasta">Swasta</option>
@@ -46,58 +90,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH LEVEL --</option>
-                                        <option value="1"> LEVEL 1</option>
-                                        <option value="2"> LEVEL 2</option>
-                                        <option value="3"> LEVEL 3</option>
-                                        <option value="4"> LEVEL 4</option>
-                                        <option value="5"> LEVEL 5</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH JENIS USULAN --</option>
-                                        <option value="1">Kab/Kota</option>
-                                        <option value="2">Provinsi</option>
-                                        <option value="3">Nasional</option>
-                                        <option value="4">Mandiri</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-12 mb-2">
-                        <div class="row">
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="provinsi" class="form-control select2" id="provinsi">
-                                        <option value="0">- PILIH PROVINSI -</option>
-                                        @foreach($provinsi as $datProv)
-                                        <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kabupaten" class="form-control select2" id="kabupaten">
-                                        <option value="0">- PILIH KABUPATEN/KOTA -</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kecamatan" class="form-control select2" id="kecamatan" required>
-                                        <option value="0">- PILIH KECAMATAN -</option>
-                                    </select>
-                                </div>
-                            </div>  
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button id="ok" class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -126,6 +119,7 @@
                     data-sort-order="desc"
                     data-page-size="10"
                     data-id-field="id"
+                    data-query-params="queryParams"
                     id="grid-data">
                       <thead class="bg-primary-light text-primary">
                         <tr>
@@ -173,9 +167,23 @@
 <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">
+    var $table = $('#grid-data');
+    var $ok = $('#ok');
     $('.btn-filter').on('click',function(){
         $('#filter').toggleClass('d-none');
     });
+    $(function() {
+        $ok.click(function() {
+            $table.bootstrapTable('refresh');
+        })
+    });
+    function queryParams(params) {
+        $('#pencarian').find('input[name], select').each(function() {
+        params[$(this).attr('name')] = $(this).val()
+        })
+
+        return params
+    }
     $("#grid-data").on("click", ".tolak", function() {
         var base_url = $(this).attr('data-href');
         var id = $(this).attr('data-id');
@@ -269,112 +277,112 @@
         return false;
     });
     $('select').on("select2:selecting", function(e) {
-              var selectorOrigin = this.id;
-              var id = e.params.args.data.id;
-              
-              
-              if(selectorOrigin=='provinsi'){
-                $('#loading-spinner').show();
-                clear('kabupaten');
-                selector = 'kabupaten';
-                url_to = 'kabupaten';
-                getSelect(id, selector, url_to);
-              }
+        var selectorOrigin = this.id;
+        var id = e.params.args.data.id;
+        
+        
+        if(selectorOrigin=='provinsi'){
+        $('#loading-spinner').show();
+        clear('kabupaten');
+        selector = 'kabupaten';
+        url_to = 'kabupaten';
+        getSelect(id, selector, url_to);
+        }
 
-              if(selectorOrigin=='kabupaten'){
-                $('#loading-spinner').show();
-                clear('kecamatan');
-                selector = 'kecamatan';
-                url_to = 'kecamatan';
-                getSelect(id, selector, url_to);
-              }
-              if(selectorOrigin=='kecamatan'){
-                $('#loading-spinner').show();
-                clear('sekolah');
-                selector = 'sekolah';
-                url_to = 'sekolah';
-                getSelect(id, selector, url_to);
-              }
-            });
+        if(selectorOrigin=='kabupaten'){
+        $('#loading-spinner').show();
+        clear('kecamatan');
+        selector = 'kecamatan';
+        url_to = 'kecamatan';
+        getSelect(id, selector, url_to);
+        }
+        if(selectorOrigin=='kecamatan'){
+        $('#loading-spinner').show();
+        clear('sekolah');
+        selector = 'sekolah';
+        url_to = 'sekolah';
+        getSelect(id, selector, url_to);
+        }
+    });
 
-            function clear(elementId) {
-              $('#' + elementId).empty();
-              $('#' + elementId).select2();
-            }
+    function clear(elementId) {
+        $('#' + elementId).empty();
+        $('#' + elementId).select2();
+    }
 
-            function getSelect(id, selectTo, urlTo, selected = "") {
-                id = id;
-                var base_url = "{{url('/')}}";
-                //alert(id);
-                destino = "#" + selectTo;
-                valor = $('#' + id).find(":selected").val();
+    function getSelect(id, selectTo, urlTo, selected = "") {
+        id = id;
+        var base_url = "{{url('/')}}";
+        //alert(id);
+        destino = "#" + selectTo;
+        valor = $('#' + id).find(":selected").val();
 
-                $.ajax({
-                        method: "POST",
-                        url: base_url + "/get/" + urlTo,
-                        xhrFields: {
-                            withCredentials: true
-                        },
-                        data: {
-                        _token: '{{csrf_token()}}',
-                            id: id
-                        }
-                    }).done(function(msg) {
-                      obj = msg.data;
+        $.ajax({
+                method: "POST",
+                url: base_url + "/get/" + urlTo,
+                xhrFields: {
+                    withCredentials: true
+                },
+                data: {
+                _token: '{{csrf_token()}}',
+                    id: id
+                }
+            }).done(function(msg) {
+                obj = msg.data;
 
-                      if (obj.length > 0) {
-                        //Clear the current options
-                        $(destino).empty();
-                        
-                        if(selectTo=='kabupaten'){
-                          $(destino).append('<option value="">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
+                if (obj.length > 0) {
+                //Clear the current options
+                $(destino).empty();
+                
+                if(selectTo=='kabupaten'){
+                    $(destino).append('<option value="">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
 
 
-                          
-                          $.each(obj, function(index) {
-                            value = obj[index].id;
-                            text = obj[index].name;
-                            $(destino).append('<option value=' + value + '>' + text + '</option>');
-                          });
-                          console.log(selected)
-                          if (selected) {
-                            $(destino).val(selected).trigger('change');
-                            selected = "";
-                          }
-                        }
-
-                        if(selectTo=='kecamatan'){
-                          $(destino).append('<option value="">-PILIH KECAMATAN-</option>').select2("val", "0");
-                          
-                          $.each(obj, function(index) {
-                            value = obj[index].id;
-                            text = obj[index].name;
-                            $(destino).append('<option value=' + value + '>' + text + '</option>');
-                          });
-                          console.log(selected)
-                          if (selected) {
-                            $(destino).val(selected).trigger('change');
-                            selected = "";
-                          }
-                        }
-
-                        
-                      } else {
-
-                        if(selectTo=='provinsi'){
-                          $(destino).empty().append('<option value="0">-PILIH PROVINSI-</option>').select2("val", "0");
-                        }
-                        if(selectTo=='kabupaten'){
-                          $(destino).empty().append('<option value="0">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
-                        }
-                        if(selectTo=='kecamatan'){
-                          $(destino).empty().append('<option value="0">-PILIH KECAMATAN-</option>').select2("val", "0");
-                        }
-                        
-                      }
-                      $('#loading-spinner').hide();
+                    
+                    $.each(obj, function(index) {
+                    value = obj[index].id;
+                    text = obj[index].name;
+                    $(destino).append('<option value=' + value + '>' + text + '</option>');
                     });
-                  return false;
-            }
+                    console.log(selected)
+                    if (selected) {
+                    $(destino).val(selected).trigger('change');
+                    selected = "";
+                    }
+                }
+
+                if(selectTo=='kecamatan'){
+                    $(destino).append('<option value="">-PILIH KECAMATAN-</option>').select2("val", "0");
+                    
+                    $.each(obj, function(index) {
+                    value = obj[index].id;
+                    text = obj[index].name;
+                    $(destino).append('<option value=' + value + '>' + text + '</option>');
+                    });
+                    console.log(selected)
+                    if (selected) {
+                    $(destino).val(selected).trigger('change');
+                    selected = "";
+                    }
+                }
+
+                
+                } else {
+
+                if(selectTo=='provinsi'){
+                    $(destino).empty().append('<option value="0">-PILIH PROVINSI-</option>').select2("val", "0");
+                }
+                if(selectTo=='kabupaten'){
+                    $(destino).empty().append('<option value="0">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
+                }
+                if(selectTo=='kecamatan'){
+                    $(destino).empty().append('<option value="0">-PILIH KECAMATAN-</option>').select2("val", "0");
+                }
+                
+                }
+                $('#loading-spinner').hide();
+            });
+            return false;
+    }
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php
index 36422f6..f1851b5 100644
--- a/resources/views/modules/profile/admin.blade.php
+++ b/resources/views/modules/profile/admin.blade.php
@@ -18,7 +18,7 @@
                     
                     <div class="col-md-12 mb-2">
                         <div class="row">
-                            @if(session('group_alias') == 'administrator')
+                            @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <select name="provinsi" class="form-control select2" id="provinsi">
@@ -170,109 +170,109 @@
         return params
     }
     $('select').on("select2:selecting", function(e) {
-              var selectorOrigin = this.id;
-              var id = e.params.args.data.id;
-              
-              
-              if(selectorOrigin=='provinsi'){
-                $('#loading-spinner').show();
-                clear('kabupaten');
-                selector = 'kabupaten';
-                url_to = 'kabupaten';
-                getSelect(id, selector, url_to);
-              }
+        var selectorOrigin = this.id;
+        var id = e.params.args.data.id;
+        
+        
+        if(selectorOrigin=='provinsi'){
+        $('#loading-spinner').show();
+        clear('kabupaten');
+        selector = 'kabupaten';
+        url_to = 'kabupaten';
+        getSelect(id, selector, url_to);
+        }
 
-              if(selectorOrigin=='kabupaten'){
-                $('#loading-spinner').show();
-                clear('kecamatan');
-                selector = 'kecamatan';
-                url_to = 'kecamatan';
-                getSelect(id, selector, url_to);
-              }
-              if(selectorOrigin=='kecamatan'){
-                $('#loading-spinner').show();
-                clear('sekolah');
-                selector = 'sekolah';
-                url_to = 'sekolah';
-                getSelect(id, selector, url_to);
-              }
-            });
+        if(selectorOrigin=='kabupaten'){
+        $('#loading-spinner').show();
+        clear('kecamatan');
+        selector = 'kecamatan';
+        url_to = 'kecamatan';
+        getSelect(id, selector, url_to);
+        }
+        if(selectorOrigin=='kecamatan'){
+        $('#loading-spinner').show();
+        clear('sekolah');
+        selector = 'sekolah';
+        url_to = 'sekolah';
+        getSelect(id, selector, url_to);
+        }
+    });
 
-            function clear(elementId) {
-              $('#' + elementId).empty();
-              $('#' + elementId).select2();
-            }
+    function clear(elementId) {
+        $('#' + elementId).empty();
+        $('#' + elementId).select2();
+    }
 
-            function getSelect(id, selectTo, urlTo, selected = "") {
-                id = id;
-                var base_url = "{{url('/')}}";
-                //alert(id);
-                destino = "#" + selectTo;
-                valor = $('#' + id).find(":selected").val();
+    function getSelect(id, selectTo, urlTo, selected = "") {
+        id = id;
+        var base_url = "{{url('/')}}";
+        //alert(id);
+        destino = "#" + selectTo;
+        valor = $('#' + id).find(":selected").val();
 
-                $.ajax({
-                        method: "POST",
-                        url: base_url + "/get/" + urlTo,
-                        data: {
-                        _token: '{{csrf_token()}}',
-                            id: id
-                        }
-                    }).done(function(msg) {
-                      obj = msg.data;
+        $.ajax({
+                method: "POST",
+                url: base_url + "/get/" + urlTo,
+                data: {
+                _token: '{{csrf_token()}}',
+                    id: id
+                }
+            }).done(function(msg) {
+                obj = msg.data;
 
-                      if (obj.length > 0) {
-                        //Clear the current options
-                        $(destino).empty();
-                        
-                        if(selectTo=='kabupaten'){
-                          $(destino).append('<option value="">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
+                if (obj.length > 0) {
+                //Clear the current options
+                $(destino).empty();
+                
+                if(selectTo=='kabupaten'){
+                    $(destino).append('<option value="">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
 
 
-                          
-                          $.each(obj, function(index) {
-                            value = obj[index].id;
-                            text = obj[index].name;
-                            $(destino).append('<option value=' + value + '>' + text + '</option>');
-                          });
-                          console.log(selected)
-                          if (selected) {
-                            $(destino).val(selected).trigger('change');
-                            selected = "";
-                          }
-                        }
-
-                        if(selectTo=='kecamatan'){
-                          $(destino).append('<option value="">-PILIH KECAMATAN-</option>').select2("val", "0");
-                          
-                          $.each(obj, function(index) {
-                            value = obj[index].id;
-                            text = obj[index].name;
-                            $(destino).append('<option value=' + value + '>' + text + '</option>');
-                          });
-                          console.log(selected)
-                          if (selected) {
-                            $(destino).val(selected).trigger('change');
-                            selected = "";
-                          }
-                        }
-
-                        
-                      } else {
-
-                        if(selectTo=='provinsi'){
-                          $(destino).empty().append('<option value="0">-PILIH PROVINSI-</option>').select2("val", "0");
-                        }
-                        if(selectTo=='kabupaten'){
-                          $(destino).empty().append('<option value="0">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
-                        }
-                        if(selectTo=='kecamatan'){
-                          $(destino).empty().append('<option value="0">-PILIH KECAMATAN-</option>').select2("val", "0");
-                        }
-                        
-                      }
-                      $('#loading-spinner').hide();
+                    
+                    $.each(obj, function(index) {
+                    value = obj[index].id;
+                    text = obj[index].name;
+                    $(destino).append('<option value=' + value + '>' + text + '</option>');
                     });
-                  return false;
-            }
+                    console.log(selected)
+                    if (selected) {
+                    $(destino).val(selected).trigger('change');
+                    selected = "";
+                    }
+                }
+
+                if(selectTo=='kecamatan'){
+                    $(destino).append('<option value="">-PILIH KECAMATAN-</option>').select2("val", "0");
+                    
+                    $.each(obj, function(index) {
+                    value = obj[index].id;
+                    text = obj[index].name;
+                    $(destino).append('<option value=' + value + '>' + text + '</option>');
+                    });
+                    console.log(selected)
+                    if (selected) {
+                    $(destino).val(selected).trigger('change');
+                    selected = "";
+                    }
+                }
+
+                
+                } else {
+
+                if(selectTo=='provinsi'){
+                    $(destino).empty().append('<option value="0">-PILIH PROVINSI-</option>').select2("val", "0");
+                }
+                if(selectTo=='kabupaten'){
+                    $(destino).empty().append('<option value="0">-PILIH KABUPATEN/KOTA-</option>').select2("val", "0");
+                }
+                if(selectTo=='kecamatan'){
+                    $(destino).empty().append('<option value="0">-PILIH KECAMATAN-</option>').select2("val", "0");
+                }
+                
+                }
+                $('#loading-spinner').hide();
+            });
+            return false;
+    }
 </script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index 341fa7e..dc48e0d 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -14,12 +14,56 @@
         <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="row" id="pencarian">
+                    
+                    <div class="col-md-12 mb-2">
+                        <div class="row">
+                            @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="provinsi" class="form-control select2" id="provinsi">
+                                            <option value="0">- PILIH PROVINSI -</option>
+                                            @foreach($provinsi as $datProv)
+                                            <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH KABUPATEN/KOTA -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                            <option value="0">- PILIH KECAMATAN -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            @else 
+                                @if(@$kecamatan)
+                                    <div class="col-md-3">
+                                        <div class="form-group">
+                                            <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                                <option value="0">- PILIH KECAMATAN -</option>
+                                                @foreach($kecamatan as $dataKec)
+                                                <option value="{{encode_id($dataKec->MsKecamatanId)}}">{{$dataKec->name}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                    </div> 
+                                @endif
+                            @endif
+                        </div>
+                    </div>
                     <div class="col-md-12 mb-2">
                         <div class="row">
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="tingkat" class="form-control select2">
                                         <option value="">-- PILIH TINGKAT --</option>
                                         <option value="1">SD</option>
                                         <option value="2">SMP</option>
@@ -37,7 +81,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="status_sekolah" class="form-control select2">
                                         <option value="">-- PILIH STATUS --</option>
                                         <option value="Negeri">Negeri</option>
                                         <option value="Swasta">Swasta</option>
@@ -46,58 +90,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH LEVEL --</option>
-                                        <option value="1"> LEVEL 1</option>
-                                        <option value="2"> LEVEL 2</option>
-                                        <option value="3"> LEVEL 3</option>
-                                        <option value="4"> LEVEL 4</option>
-                                        <option value="5"> LEVEL 5</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH JENIS USULAN --</option>
-                                        <option value="1">Kab/Kota</option>
-                                        <option value="2">Provinsi</option>
-                                        <option value="3">Nasional</option>
-                                        <option value="4">Mandiri</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-12 mb-2">
-                        <div class="row">
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="provinsi" class="form-control select2" id="provinsi">
-                                        <option value="0">- PILIH PROVINSI -</option>
-                                        @foreach($provinsi as $datProv)
-                                        <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kabupaten" class="form-control select2" id="kabupaten">
-                                        <option value="0">- PILIH KABUPATEN/KOTA -</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kecamatan" class="form-control select2" id="kecamatan" required>
-                                        <option value="0">- PILIH KECAMATAN -</option>
-                                    </select>
-                                </div>
-                            </div>  
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button id="ok" class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -125,6 +118,7 @@
                     data-sort-name="ids"
                     data-sort-order="desc"
                     data-page-size="10"
+                    data-query-params="queryParams"
                     data-id-field="id"
                     id="grid-data">
                       <thead class="bg-primary-light text-primary">
@@ -154,9 +148,23 @@
 <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">
+    var $table = $('#grid-data');
+    var $ok = $('#ok');
     $('.btn-filter').on('click',function(){
         $('#filter').toggleClass('d-none');
     });
+    $(function() {
+        $ok.click(function() {
+            $table.bootstrapTable('refresh');
+        })
+    });
+    function queryParams(params) {
+        $('#pencarian').find('input[name], select').each(function() {
+        params[$(this).attr('name')] = $(this).val()
+        })
+
+        return params
+    }
     $('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 341fa7e..8d17b97 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -14,12 +14,56 @@
         <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="row" id="pencarian">
+                    
+                    <div class="col-md-12 mb-2">
+                        <div class="row">
+                            @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="provinsi" class="form-control select2" id="provinsi">
+                                            <option value="0">- PILIH PROVINSI -</option>
+                                            @foreach($provinsi as $datProv)
+                                            <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH KABUPATEN/KOTA -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                            <option value="0">- PILIH KECAMATAN -</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            @else 
+                                @if(@$kecamatan)
+                                    <div class="col-md-3">
+                                        <div class="form-group">
+                                            <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                                <option value="0">- PILIH KECAMATAN -</option>
+                                                @foreach($kecamatan as $dataKec)
+                                                <option value="{{encode_id($dataKec->MsKecamatanId)}}">{{$dataKec->name}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                    </div> 
+                                @endif
+                            @endif
+                        </div>
+                    </div>
                     <div class="col-md-12 mb-2">
                         <div class="row">
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="tingkat" class="form-control select2">
                                         <option value="">-- PILIH TINGKAT --</option>
                                         <option value="1">SD</option>
                                         <option value="2">SMP</option>
@@ -37,7 +81,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
+                                    <select name="status_sekolah" class="form-control select2">
                                         <option value="">-- PILIH STATUS --</option>
                                         <option value="Negeri">Negeri</option>
                                         <option value="Swasta">Swasta</option>
@@ -46,58 +90,7 @@
                             </div>
                             <div class="col-md-3">
                                 <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH LEVEL --</option>
-                                        <option value="1"> LEVEL 1</option>
-                                        <option value="2"> LEVEL 2</option>
-                                        <option value="3"> LEVEL 3</option>
-                                        <option value="4"> LEVEL 4</option>
-                                        <option value="5"> LEVEL 5</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select class="form-control select2">
-                                        <option value="">-- PILIH JENIS USULAN --</option>
-                                        <option value="1">Kab/Kota</option>
-                                        <option value="2">Provinsi</option>
-                                        <option value="3">Nasional</option>
-                                        <option value="4">Mandiri</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-12 mb-2">
-                        <div class="row">
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="provinsi" class="form-control select2" id="provinsi">
-                                        <option value="0">- PILIH PROVINSI -</option>
-                                        @foreach($provinsi as $datProv)
-                                        <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kabupaten" class="form-control select2" id="kabupaten">
-                                        <option value="0">- PILIH KABUPATEN/KOTA -</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kecamatan" class="form-control select2" id="kecamatan" required>
-                                        <option value="0">- PILIH KECAMATAN -</option>
-                                    </select>
-                                </div>
-                            </div>  
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <button class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
+                                    <button id="ok" class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
                         </div>
@@ -126,6 +119,7 @@
                     data-sort-order="desc"
                     data-page-size="10"
                     data-id-field="id"
+                    data-query-params="queryParams"
                     id="grid-data">
                       <thead class="bg-primary-light text-primary">
                         <tr>
@@ -154,9 +148,23 @@
 <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">
+    var $table = $('#grid-data');
+    var $ok = $('#ok');
     $('.btn-filter').on('click',function(){
         $('#filter').toggleClass('d-none');
     });
+    $(function() {
+        $ok.click(function() {
+            $table.bootstrapTable('refresh');
+        })
+    });
+    function queryParams(params) {
+        $('#pencarian').find('input[name], select').each(function() {
+        params[$(this).attr('name')] = $(this).val()
+        })
+
+        return params
+    }
     $('select').on("select2:selecting", function(e) {
               var selectorOrigin = this.id;
               var id = e.params.args.data.id;