Merge pull request #815 from OpenSID/dev-809

Sesuaikan dasbor pada OpenKab untuk menambahkan daftar desa aktif

Author: vickyrolanda

app/Console/Commands/updateAdminMenu.php

@@ -38,7 +38,7 @@ public function handle()
         setPermissionsTeamId($team->id);
         if ($team) {
             $team->menu = Modul::Menu;
-            if(Schema::hasColumn('teams', 'menu_order')){
+            if (Schema::hasColumn('teams', 'menu_order')) {
                 $team->menu_order = null;
             }
 

catatan_rilis.md

@@ -2,6 +2,7 @@ Di rilis ini, versi 2509.0.1 berisi penambahan dan perbaikan yang diminta penggu
 
 #### Penambahan Fitur
 
+1. [#809](https://github.com/OpenSID/OpenKab/issues/809) Penambahan dasbor pada OpenKab untuk menambahkan daftar desa aktif.
 
 #### Perbaikan BUG
 

database/seeders/IdentitasSeeder.php

@@ -21,11 +21,12 @@ public function run()
             'kode_kabupaten' => '52.72',
             'nama_provinsi' => 'Nusa Tenggara Barat',
             'kode_provinsi' => '52',
-            'sebutan_kab' => 'Kota'
+            'sebutan_kab' => 'Kota',
         ];
-        if(Schema::hasColumn('identitas', 'sebutan_desa')){
+        if (Schema::hasColumn('identitas', 'sebutan_desa')) {
             $defaultData['sebutan_desa'] = 'Kelurahan';
         }
+
         return Identitas::create($defaultData);
     }
 }

resources/views/dasbor/data-desa.blade.php

@@ -1,6 +1,6 @@
 <div class="col-md-12">
     <div class="card rounded-0 elevation-0">
-        <div class="card-header bg-white">Data {{ config('app.sebutanDesa') }}
+        <div class="card-header bg-white">{{ config('app.sebutanDesa') }} Aktif
         </div>
         <div class="card-body">
             <div class="table-responsive">
@@ -10,7 +10,11 @@
                             <th class="padat">No</th>
                             <th>{{ config('app.sebutanDesa') }}</th>
                             <th>Kecamatan</th>
-                            <th class="padat">Jumlah Penduduk</th>
+                            <th class="padat">Jumlah <br>Penduduk</th>
+                            <th class="padat">Jumlah <br>Surat Tercetak</th>
+                            <th class="padat">Jumlah <br>Artikel</th>
+                            <th class="padat">Jumlah <br>Pengunjung Website</th>
+                            <th class="padat">Terakhir <br>Akses Login</th>
                         </tr>
                     </thead>
                     <tbody></tbody>

resources/views/dasbor/tabel_penduduk.blade.php

@@ -2,8 +2,6 @@
     @include('dasbor.data-desa')
 </div>
 
-
-
 @push('js')
     <script nonce="{{ csp_nonce() }}">
         document.addEventListener("DOMContentLoaded", function(event) {
@@ -14,7 +12,7 @@
                 processing: true,
                 serverSide: true,
                 autoWidth: false,
-                ordering: false,
+                // ordering: false,
                 searchPanes: {
                     viewTotal: false,
                     columns: [0]
@@ -30,6 +28,10 @@
                             "filter[kode_kabupaten]": $("#filter_kabupaten").val(),
                             "filter[kode_kecamatan]": $("#filter_kecamatan").val(),
                             "filter[kode_desa]": $("#filter_desa").val(),
+                            // sort by multiple column
+                            "sort": (row.order.length > 0 && row.columns[row.order[0].column].name)
+                                ? (row.order[0].dir == 'asc' ? '' : '-')+ row.columns[row.order[0].column].name
+                                : '-surat_count,-artikel_count,-traffic_count',
                         };
                     },
                     dataSrc: function(json) {
@@ -52,7 +54,7 @@ className: 'text-nowrap',
                         }
                     },
                     {
-                        targets: [0, 1, 2, 3],
+                        targets: [0, 1, 2],
                         orderable: false,
                         searchable: false,
                     },
@@ -87,8 +89,38 @@ className: 'text-nowrap',
                             return `<a target="_blank" href=${urlDetail.href}>${data.attributes.penduduk_count}</a>`
                         },
                         name: "penduduk_count",
-                        className: 'text-center'
+                        className: 'text-center',
+                        searchable: false
+                    },
+                    {
+                        data: "attributes.surat_count",
+                        name: "surat_count",
+                        className: 'text-center',
+                        searchable: false
                     },
+                    {
+                        data: "attributes.artikel_count",
+                        name: "artikel_count",
+                        className: 'text-center',
+                        searchable: false
+                    },
+                    {
+                        data: "attributes.traffic_count",
+                        name: "traffic_count",
+                        className: 'text-center',
+                        searchable: false
+                    },
+                    {
+                        data: function(data) {
+                            return data.attributes.last_login ? (new Date(
+                                    data.attributes.last_login))
+                                .toLocaleString() : '-';
+                        },
+                        name: "last_login",
+                        className: 'text-center',
+                        searchable: false
+                    },
+
                 ],
             })
             $('#tabel_penduduk_block').change(function(event) {