Merge pull request #354 from OpenSID/rilis-2406.0.0

Rilis 2406.0.0

app/Helpers/general.php

@@ -12,7 +12,7 @@
      */
     function openkab_versi()
     {
-        return 'v2401.0.0';
+        return 'v2406.0.0';
     }
 }
 
@@ -213,7 +213,7 @@ function default_favicon($favicon)
      */
     function date_from_format($value, $format = null)
     {
-        \Log::error($value);
+        Log::error($value);
 
         return Carbon::createFromFormat($format ?? config('app.format.date'), $value);
     }

app/Http/Controllers/Api/WebsiteController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Repository\BantuanRepository;
 use App\Http\Repository\ConfigRepository;
+use App\Http\Repository\KeluargaRepository;
 use App\Http\Repository\PendudukRepository;
 use Illuminate\Http\Response;
 
@@ -28,7 +29,9 @@ private function data()
 
         $bantuanSummary = (new BantuanRepository)->summary();
         $pendudukSummary = (new PendudukRepository)->summary();
+        $keluargaSummary = (new KeluargaRepository)->summary();
         $categoriesItems = [
+            'keluarga' => ['text' => 'keluarga', 'value' => angka_lokal($keluargaSummary), 'icon' => 'web/img/penduduk.jpg'],
             'penduduk' => ['text' => 'penduduk', 'value' => angka_lokal($pendudukSummary), 'icon' => 'web/img/penduduk.jpg'],
             'kecamatan' => ['text' => 'kecamatan', 'value' => angka_lokal($configSummary->count()) ?? 0, 'icon' => 'web/img/kecamatan.jpg'],
             'desa' => ['text' => 'desa/kelurahan', 'value' => angka_lokal($totalDesa), 'icon' => 'web/img/kelurahan.jpg'],

app/Http/Controllers/Web/PresisiController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Web;
+
+use App\Http\Controllers\Controller;
+use App\Models\Penduduk;
+
+class PresisiController extends Controller
+{
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        $totalDesa = 0;
+        $pendudukSummary = 0;
+        $configSummary = 0;
+        $keluargaSummary = 0;
+        $categoriesItems = [
+            ['key' => 'kecamatan', 'text' => 'kecamatan', 'value' => $configSummary, 'icon' => 'web/img/kecamatan.jpg'],
+            ['key' => 'desa', 'text' => 'desa/kelurahan', 'value' => $totalDesa, 'icon' => 'web/img/kelurahan.jpg'],
+            ['key' => 'penduduk', 'text' => 'jumlah penduduk', 'value' => $pendudukSummary, 'icon' => 'web/img/penduduk.jpg'],
+            ['key' => 'keluarga', 'text' => 'jumlah keluarga', 'value' => $keluargaSummary, 'icon' => 'web/img/bantuan.jpg'],
+        ];
+        $listKecamatan = ['' => 'Pilih Kecamatan'];
+        $listDesa = ['' => 'Pilih Desa'];
+
+        return view('presisi.index', compact('categoriesItems', 'listKecamatan', 'listDesa'));
+    }
+
+    public function kependudukan()
+    {
+        $statistik = Penduduk::KATEGORI_STATISTIK;
+
+        return view('presisi.kependudukan.index', compact('statistik'));
+    }
+}

app/Http/Middleware/WeakPassword.php

@@ -21,7 +21,7 @@ public function handle(Request $request, Closure $next)
     {
         $weakPassword = session('weak_password');
         if ($weakPassword && ! in_array(Route::currentRouteName(), $this->except)) {
-            return redirect(route('password.change'));
+            // return redirect(route('password.change'));
         }
 
         return $next($request);

app/Http/Middleware/WebsiteEnable.php

@@ -22,6 +22,10 @@ public function handle(Request $request, Closure $next)
         if (! $website) {
             return redirect('login');
         }
+        $homePage = Setting::where(['key' => 'home_page'])->first()?->value ?? 0;
+        if ($homePage == 'presisi') {
+            return redirect('presisi');
+        }
 
         return $next($request);
     }

app/Http/Repository/KeluargaRepository.php

@@ -86,4 +86,9 @@ private function caseKelasSosial(): array|object
             'footer' => $this->listFooter($kelas, $query),
         ];
     }
+
+    public function summary()
+    {
+        return QueryBuilder::for(Keluarga::class)->count();
+    }
 }

app/Listeners/MenuListener.php

@@ -74,8 +74,10 @@ public function handle(BuildingMenu $event)
 
         // tambahkan menu dari group
         $user = auth()->user();
-        foreach ($user->team->first()?->menu ?? [] as $menu) {
-            $event->menu->add($menu);
+        if ($user) {
+            foreach ($user->team->first()?->menu ?? [] as $menu) {
+                $event->menu->add($menu);
+            }
         }
     }
 }

catatan_rilis.md

@@ -1,9 +1,13 @@
-Di rilis v2401.0.0 berisi penambahan fitur dan perbaikan lain sesuai dengan pelayanan ke pelanggan.
+Di rilis v2406.0.0 berisi penambahan fitur dan perbaikan lain sesuai dengan pelayanan ke pelanggan.
 
 #### Penambahan Fitur
 
+1. [#344](https://github.com/OpenSID/OpenKab/issues/344) Penambahan opsi dasbor pada pengaturan OpenKab.
+2. [#345](https://github.com/OpenSID/OpenKab/issues/345) Penambahan template dasbor baru pada OpenKab.
+3. [#348](https://github.com/OpenSID/OpenKab/issues/348) Penambahan data statistik penduduk.
+
 #### Perbaikan BUG
 
-1. [#336](https://github.com/OpenSID/OpenKab/issues/336) Perbaikan halaman depan yang tidak tampil datanya secara dinamis.
+1. [#342](https://github.com/OpenSID/OpenKab/issues/342) Perbaikan perbaiki duplikat pilih Kecamatan.
 
-#### Perubahan Teknis
+#### Perubahan Teknis