Penambahan filter berdasarkan desa pada modul berkaitan dengan data d…

…esa (#953)
OpenSID · Jun 14, 2024 · f0c3670 · f0c3670
1 parent 209e85b
commit f0c3670
Show file tree

Hide file tree

Showing 13 changed files with 170 additions and 27 deletions.
diff --git a/app/Http/Controllers/Data/AnggaranDesaController.php b/app/Http/Controllers/Data/AnggaranDesaController.php
@@ -50,18 +50,29 @@ public function index()
 
     public function getDataAnggaran()
     {
-        return DataTables::of(AnggaranDesa::with('desa')->get())
-            ->addColumn('aksi', function ($row) {
-                $data['delete_url'] = route('data.anggaran-desa.destroy', $row->id);
-
-                return view('forms.aksi', $data);
-            })->editColumn('bulan', function ($row) {
-                return months_list()[$row->bulan];
-            })
-            ->editColumn('jumlah', function ($row) {
-                return number_format($row->jumlah, 2);
-            })
-            ->rawColumns(['aksi'])->make();
+        if (request()->ajax()) {
+            $desa = request()->input('desa');
+
+            return DataTables::of(
+                AnggaranDesa::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                        return $query->where('desa_id', $desa);
+                    })
+                    ->with('desa')
+                    ->get()
+                )
+                ->addColumn('aksi', function ($row) {
+                    $data['delete_url'] = route('data.anggaran-desa.destroy', $row->id);
+
+                    return view('forms.aksi', $data);
+                })->editColumn('bulan', function ($row) {
+                    return months_list()[$row->bulan];
+                })
+                ->editColumn('jumlah', function ($row) {
+                    return number_format($row->jumlah, 2);
+                })
+                ->rawColumns(['aksi'])
+                ->make();
+        }
     }
 
     public function import()

diff --git a/app/Http/Controllers/Data/TingkatPendidikanController.php b/app/Http/Controllers/Data/TingkatPendidikanController.php
@@ -55,13 +55,24 @@ public function index()
      */
     public function getData()
     {
-        return DataTables::of(TingkatPendidikan::with(['desa'])->get())
-            ->addColumn('aksi', function ($row) {
-                $data['delete_url'] = route('data.tingkat-pendidikan.destroy', $row->id);
+        if (request()->ajax()) {
+            $desa = request()->input('desa');
 
-                return view('forms.aksi', $data);
-            })
-            ->rawColumns(['aksi'])->make();
+            return DataTables::of(
+                TingkatPendidikan::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                        return $query->where('desa_id', $desa);
+                    })
+                    ->with('desa')
+                    ->get()
+                )
+                ->addColumn('aksi', function ($row) {
+                    $data['delete_url'] = route('data.tingkat-pendidikan.destroy', $row->id);
+
+                    return view('forms.aksi', $data);
+                })
+                ->rawColumns(['aksi'])
+                ->make();
+        }
     }
 
     /**

diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -4,7 +4,7 @@ Di rilis versi v2406.1.0 di versi ini terdapat [untuk diisi] dan perbaikan lain
 #### FITUR
 
 1. [#262](https://github.com/OpenSID/OpenDK/issues/262) Penambahan modul themes.
-2. [#960](https://github.com/OpenSID/OpenDK/issues/960) Penambahan filter berdasarkan desa pada modul keluarg.
+2. [#960](https://github.com/OpenSID/OpenDK/issues/960) Penambahan filter berdasarkan desa pada modul berkaitan dengan data desa.
 
 
 #### BUG

diff --git a/resources/views/data/aki_akb/index.blade.php b/resources/views/data/aki_akb/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="aki-table">
                         <thead>
@@ -44,6 +46,7 @@
     </section>
 @endsection
 
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
 
 @push('scripts')
@@ -52,7 +55,12 @@
             var data = $('#aki-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.aki-akb.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.aki-akb.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -87,6 +95,10 @@ class: 'text-center',
                     [1, 'desc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/anggaran_desa/index.blade.php b/resources/views/data/anggaran_desa/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="anggaran-table">
                         <thead>
@@ -45,6 +47,7 @@
     </section>
 @endsection
 
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
 
 @push('scripts')
@@ -53,7 +56,12 @@
             var data = $('#anggaran-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.anggaran-desa.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.anggaran-desa.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -91,6 +99,10 @@ class: 'text-right'
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/epidemi_penyakit/index.blade.php b/resources/views/data/epidemi_penyakit/index.blade.php
@@ -26,6 +26,8 @@
             </div>
             <div class="box-body">
                 <div class="table-responsive">
+                    @include('layouts.fragments.list-desa')
+                    <hr>
                     <table class="table table-bordered table-hover dataTable" id="aki-table">
                         <thead>
                             <tr>
@@ -44,6 +46,7 @@
     </section>
 @endsection
 
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
 
 @push('scripts')
@@ -52,7 +55,12 @@
             var data = $('#aki-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.epidemi-penyakit.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.epidemi-penyakit.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -85,6 +93,10 @@ class: 'text-center',
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/fasilitas_paud/index.blade.php b/resources/views/data/fasilitas_paud/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="fasilitas-table">
                         <thead>
@@ -45,6 +47,7 @@
     </section>
 @endsection
 
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
 
 @push('scripts')
@@ -53,7 +56,12 @@
             var data = $('#fasilitas-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.fasilitas-paud.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.fasilitas-paud.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -90,6 +98,10 @@ class: 'text-center',
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/imunisasi/index.blade.php b/resources/views/data/imunisasi/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="imunisasi-table">
                         <thead>
@@ -43,6 +45,7 @@
     </section>
 @endsection
 
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
 
 @push('scripts')
@@ -51,7 +54,12 @@
             var data = $('#imunisasi-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.imunisasi.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.imunisasi.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -80,6 +88,10 @@ class: 'text-center',
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/putus_sekolah/index.blade.php b/resources/views/data/putus_sekolah/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="imunisasi-table">
                         <thead>
@@ -49,14 +51,22 @@
         </div>
     </section>
 @endsection
+
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
+
 @push('scripts')
     <script type="text/javascript">
         $(document).ready(function() {
             var data = $('#imunisasi-table').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.putus-sekolah.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.putus-sekolah.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -113,6 +123,10 @@ class: 'text-center',
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')

diff --git a/resources/views/data/tingkat_pendidikan/index.blade.php b/resources/views/data/tingkat_pendidikan/index.blade.php
@@ -25,6 +25,8 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('layouts.fragments.list-desa')
+                <hr>
                 <div class="table-responsive">
                     <table class="table table-bordered table-hover dataTable" id="tingkat-pendidikan">
                         <thead>
@@ -47,14 +49,22 @@
         </div>
     </section>
 @endsection
+
+@include('partials.asset_select2')
 @include('partials.asset_datatables')
+
 @push('scripts')
     <script type="text/javascript">
         $(document).ready(function() {
             var data = $('#tingkat-pendidikan').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: "{!! route('data.tingkat-pendidikan.getdata') !!}",
+                ajax: {
+                    url: "{!! route('data.tingkat-pendidikan.getdata') !!}",
+                    data: function(d) {
+                        d.desa = $('#list_desa').val();
+                    }
+                },
                 columns: [{
                         data: 'aksi',
                         name: 'aksi',
@@ -100,6 +110,10 @@ class: 'text-center',
                     [1, 'asc']
                 ]
             });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
         });
     </script>
     @include('forms.datatable-vertical')