From d8bb66b517dfc13cb387cba3c621eceaa5e11bb2 Mon Sep 17 00:00:00 2001 From: Arif Priadi <145224165+arifpriadi@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:13:21 +0800 Subject: [PATCH] Perbaikan ubah profil saat data desa sudah ada (#947) --- .../Controllers/Data/ProfilController.php | 3 ++- catatan_rilis.md | 3 ++- .../views/data/profil/form_edit.blade.php | 25 ++++++++++++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Data/ProfilController.php b/app/Http/Controllers/Data/ProfilController.php index 3701c9d41..3d73ecb4a 100644 --- a/app/Http/Controllers/Data/ProfilController.php +++ b/app/Http/Controllers/Data/ProfilController.php @@ -50,8 +50,9 @@ public function index() $page_title = 'Profil'; $page_description = 'Data Profil'; $status_pantau = checkWebsiteAccessibility(config('app.server_pantau')) ? 1 : 0; + $adaDesa = DataUmum::where('profil_id', $profil->id)->exists(); - return view('data.profil.edit', compact('page_title', 'page_description', 'profil', 'status_pantau')); + return view('data.profil.edit', compact('page_title', 'page_description', 'profil', 'status_pantau', 'adaDesa')); } /** diff --git a/catatan_rilis.md b/catatan_rilis.md index bdef07690..429b15bda 100644 --- a/catatan_rilis.md +++ b/catatan_rilis.md @@ -11,7 +11,8 @@ Di rilis versi v2406.1.0 di versi ini terdapat [untuk diisi] dan perbaikan lain 1. [#930](https://github.com/OpenSID/OpenDK/issues/930) Perbaikan link email pada halaman website. 2. [#934](https://github.com/OpenSID/OpenDK/issues/934) Perbaikan tampilan widget pegawai kecamatan. 3. [#927](https://github.com/OpenSID/OpenDK/issues/927) Perbaikan keterangan gagal impor jika desa tidak terdaftar. -4. [#963](https://github.com/OpenSID/OpenDK/issues/963) Perbaikan slug pada menu. +4. [#963](https://github.com/OpenSID/OpenDK/issues/963) Perbaikan slug pada menu. +5. [#961](https://github.com/OpenSID/OpenDK/issues/961) Perbaikan ubah profil saat data desa sudah ada. #### TEKNIS diff --git a/resources/views/data/profil/form_edit.blade.php b/resources/views/data/profil/form_edit.blade.php index 55ea2f96d..3afc31d13 100644 --- a/resources/views/data/profil/form_edit.blade.php +++ b/resources/views/data/profil/form_edit.blade.php @@ -3,7 +3,10 @@
- @if ($status_pantau) + + @if ($adaDesa) + + @elseif ($status_pantau) @else @@ -11,7 +14,9 @@ @endif
- @if ($status_pantau) + @if ($adaDesa) + + @elseif ($status_pantau) + @elseif ($status_pantau) @else @@ -35,7 +42,9 @@ @endif
- @if ($status_pantau) + @if ($adaDesa) + + @elseif ($status_pantau) + @elseif ($status_pantau) @else @@ -59,7 +70,9 @@ @endif
- @if ($status_pantau) + @if ($adaDesa) + + @elseif ($status_pantau)