Rilis v2603.0.0

app/Helpers/helper.php

@@ -11,7 +11,7 @@
      */
     function pantau_versi()
     {
-        return 'v2601.0.0';
+        return 'v2603.0.0';
     }
 }
 

app/Http/Controllers/LaporanDesaAktifController.php

@@ -25,11 +25,102 @@ public function index(Request $request)
         if ($request->ajax()) {
             $_30HariLalu = Carbon::now()->subDays(30);
 
-            return DataTables::of(Desa::fillter($fillters)->withCount(['akses' => static fn ($q) => $q->where('created_at', '>=', $_30HariLalu)])->where('updated_at', '>=', $_30HariLalu))
+            $query = Desa::query()
+                ->select([
+                    'desa.id',
+                    'desa.nama_desa',
+                    'desa.jml_surat_tte',
+                    'desa.jml_mandiri',
+                    'desa.jml_artikel',
+                    'desa.jml_dokumen',
+                    'desa.kode_provinsi',
+                    'desa.kode_kabupaten',
+                    'desa.kode_kecamatan',
+                    'desa.versi_lokal',
+                    'desa.versi_hosting',
+                    'desa.tgl_akses_lokal',
+                    'desa.tgl_akses_hosting',
+                    'desa.modul_tte',
+                    'desa.updated_at',
+                ])
+                ->selectRaw(
+                    '(SELECT COUNT(*) FROM akses WHERE akses.desa_id = desa.id AND akses.created_at >= ?) as akses_count',
+                    [$_30HariLalu]
+                )
+                ->where('desa.updated_at', '>=', $_30HariLalu);
+
+            $this->applyFilters($query, $fillters);
+
+            return DataTables::of($query)
                 ->addIndexColumn()
                 ->make(true);
         }
 
         return view('laporan.desa_aktif', compact('fillters'));
     }
+
+    /**
+     * Apply filters directly without calling scopeFillter (which overrides SELECT with *).
+     */
+    private function applyFilters($query, array $fillters): void
+    {
+        $fillters = array_merge([
+            'kode_provinsi' => null,
+            'kode_kabupaten' => null,
+            'kode_kecamatan' => null,
+            'akses' => null,
+            'status' => null,
+            'versi_lokal' => null,
+            'versi_hosting' => null,
+            'tte' => null,
+        ], $fillters);
+
+        $query
+            ->when($fillters['kode_provinsi'] ?? false, function ($q, $kode_provinsi) {
+                $q->where('desa.kode_provinsi', $kode_provinsi);
+            })
+            ->when($fillters['kode_kabupaten'] ?? false, function ($q, $kode_kabupaten) {
+                $q->where('desa.kode_kabupaten', $kode_kabupaten);
+            })
+            ->when($fillters['kode_kecamatan'] ?? false, function ($q, $kode_kecamatan) {
+                $q->where('desa.kode_kecamatan', $kode_kecamatan);
+            })
+            ->when($fillters['status'] == 1, function ($q) {
+                $q->whereNotNull('desa.versi_hosting')->whereNull('desa.versi_lokal');
+            })
+            ->when($fillters['status'] == 2, function ($q) {
+                $q->whereNotNull('desa.versi_lokal')->whereNull('desa.versi_hosting');
+            })
+            ->when($fillters['status'] == 3, function ($q) {
+                $q->where(function ($sub) {
+                    $version = lastrelease_opensid();
+                    $sub->where('desa.versi_hosting', 'LIKE', $version . '-premium%')
+                        ->orWhere('desa.versi_lokal', 'LIKE', $version . '-premium%');
+                });
+            })
+            ->when($fillters['akses'] == 1, function ($q) {
+                $q->whereRaw('timestampdiff(month, greatest(coalesce(desa.tgl_akses_lokal, 0), coalesce(desa.tgl_akses_hosting, 0)), now()) > 1');
+            })
+            ->when($fillters['akses'] == 2, function ($q) {
+                $q->whereRaw('timestampdiff(month, greatest(coalesce(desa.tgl_akses_lokal, 0), coalesce(desa.tgl_akses_hosting, 0)), now()) <= 1');
+            })
+            ->when($fillters['akses'] == 3, function ($q) {
+                $q->whereRaw('timestampdiff(month, greatest(coalesce(desa.tgl_akses_lokal, 0), coalesce(desa.tgl_akses_hosting, 0)), now()) > 3');
+            })
+            ->when($fillters['akses'] == 4, function ($q) {
+                $q->whereRaw('greatest(coalesce(desa.tgl_akses_lokal, 0), coalesce(desa.tgl_akses_hosting, 0)) >= now() - interval 7 day');
+            })
+            ->when($fillters['akses'] == 5, function ($q) {
+                $q->whereRaw("desa.versi_lokal <> '' and desa.versi_hosting is null and coalesce(desa.tgl_akses_lokal, 0) >= now() - interval 7 day");
+            })
+            ->when($fillters['versi_lokal'], function ($q, $versi) {
+                $q->where('desa.versi_lokal', $versi);
+            })
+            ->when($fillters['versi_hosting'], function ($q, $versi) {
+                $q->where('desa.versi_hosting', $versi);
+            })
+            ->when(in_array($fillters['tte'], ['1', '0']), function ($q) use ($fillters) {
+                $q->where('desa.modul_tte', $fillters['tte']);
+            });
+    }
 }

app/Http/Controllers/PenggunaAktifPbbController.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Pbb;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Yajra\DataTables\Facades\DataTables;
+
+class PenggunaAktifPbbController extends Controller
+{
+    public function index(Request $request)
+    {
+        $fillters = [
+            'kode_provinsi' => $request->kode_provinsi,
+            'kode_kabupaten' => $request->kode_kabupaten,
+            'kode_kecamatan' => $request->kode_kecamatan,
+            'akses_opendk' => $request->akses_opendk,
+            'versi_opendk' => $request->versi_opendk,
+        ];
+
+        if ($request->ajax()) {
+            $_30HariLalu = Carbon::now()->subDays(30);
+
+            $query = Pbb::wilayahkhusus()
+                ->where('updated_at', '>=', $_30HariLalu)
+                ->filterDatatable($fillters)
+                ->select([
+                    'id',
+                    'nama_desa',
+                    'nama_kecamatan',
+                    'nama_kabupaten',
+                    'nama_provinsi',
+                    'versi',
+                    'updated_at',
+                ]);
+
+            return DataTables::of($query)
+                ->addIndexColumn()
+                ->addColumn('akses_terakhir', function ($data) {
+                    return $data->updated_at ? $data->updated_at->format('Y-m-d H:i:s') : '-';
+                })
+                ->make(true);
+        }
+
+        return view('pbb.pengguna_aktif', compact('fillters'));
+    }
+}

catatan_rilis.md

@@ -1,12 +1,16 @@
-Di rilis v2601.0.0 berisi perbaikan yang diminta Komunitas Open Desa.
+Di rilis v2603.0.0 berisi perbaikan yang diminta Komunitas Open Desa.
 
 #### Penambahan Fitur
 
+1. [#620](https://github.com/OpenSID/pantau/issues/620) Penambahan halaman PBB Pengguna Aktif.
 
 #### Perbaikan Bug
 
+1. [#615](https://github.com/OpenSID/pantau/issues/615) Perbaikan tanggal dinamis di config.
+2. [#618](https://github.com/OpenSID/pantau/issues/618) Perbaikan Optimasi Query Laporan Desa Aktif
+
 
 #### Penyesuaian Teknis
 
-1. [#599](https://github.com/OpenSID/pantau/issues/599) Known security vulnerabilities detected.
-2. [#598](https://github.com/OpenSID/pantau/issues/598) Sembunyikan kolom URL untuk pengguna yang tidak login.
+1. [#619](https://github.com/OpenSID/pantau/issues/619) Perbaikan tampilan pengaturan dasar di pantau.
+2. [#605](https://github.com/OpenSID/pantau/issues/605) Update keamanan package/library npm dan composer.

composer.json

@@ -9,6 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
+        "aws/aws-sdk-php": "3.368.0",
         "doctrine/dbal": "^3.6",
         "guzzlehttp/guzzle": "^7.2",
         "jeroennoten/laravel-adminlte": "^3.13",