From b64b44539c9f7dfff36082fdd64b64c95bd0fa7f Mon Sep 17 00:00:00 2001
From: rahmatrafli1 <rahmatrafli1@gmail.com>
Date: Fri, 4 Oct 2024 05:55:54 +0700
Subject: [PATCH] Mengubah Opsi Jenis Kantor pada Menu Master KJPP menjadi
 selected ketika jenis kantor itu sama

---
 app/Http/Controllers/KJPPController.php |  9 +++------
 module.json                             | 20 ++++++++++----------
 resources/views/kjpp/create.blade.php   | 12 ++++++++----
 resources/views/kjpp/show.blade.php     |  4 +---
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php
index 99a0c2f..4898ab5 100644
--- a/app/Http/Controllers/KJPPController.php
+++ b/app/Http/Controllers/KJPPController.php
@@ -35,7 +35,6 @@ class KJPPController extends Controller
      */
     public function create()
     {
-        $branch = Branch::all();
         $ijin_usaha = IjinUsaha::all();
         $jenis_aset = JenisJaminan::all();
         $provinces = Province::all();
@@ -48,7 +47,7 @@ class KJPPController extends Controller
         // Combine KJPP number with branch code
         $fullKjppNumber = $kjppNumber;
 
-        return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
+        return view('lpj::kjpp.create', compact('ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
     }
 
     /**
@@ -98,13 +97,12 @@ class KJPPController extends Controller
         $ijin_usaha = IjinUsaha::where('code', $kjpp->nomor_ijin_usaha)->get();
         $ijin_usahas = IjinUsaha::all();
         $jenis_jaminan = JenisJaminan::all();
-        $branches = Branch::where('name', $kjpp->jenis_kantor)->get();
         $provinces = Province::where('code', $kjpp->province_code)->get();
         $cities = City::where('code', $kjpp->city_code)->get();
         $districts = District::where('code', $kjpp->district_code)->get();
         $villages  = Village::where('code', $kjpp->village_code)->get();
         // dd($branches);
-        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'branches', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
+        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
     }
 
     /**
@@ -113,7 +111,6 @@ class KJPPController extends Controller
     public function edit($id)
     {
         $kjpp = KJPP::find($id);
-        $branch = Branch::all();
         $ijin_usaha = IjinUsaha::all();
         $jenis_aset = JenisJaminan::all();
         $provinces = Province::all();
@@ -121,7 +118,7 @@ class KJPPController extends Controller
         $districts = District::where('city_code', $kjpp->city_code)->get();
         $villages  = Village::where('district_code', $kjpp->district_code)->get();
 
-        return view('lpj::kjpp.create', compact('kjpp', 'branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
+        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
     }
 
     /**
diff --git a/module.json b/module.json
index 374c181..14514c4 100644
--- a/module.json
+++ b/module.json
@@ -16,7 +16,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Tender",
@@ -25,7 +25,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"],
+        "roles": ["Administrator"],
         "sub": [
           {
             "title": "Data Penawaran",
@@ -60,7 +60,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Data Debitur",
@@ -69,7 +69,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Authorization",
@@ -78,7 +78,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Registrasi",
@@ -87,7 +87,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Assignment",
@@ -96,7 +96,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Activity",
@@ -105,7 +105,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       },
       {
         "title": "Laporan",
@@ -114,7 +114,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"]
+        "roles": ["Administrator"]
       }
     ],
     "master": [
@@ -125,7 +125,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["administrator"],
+        "roles": ["Administrator"],
         "sub": [
           {
             "title": "Cabang",
diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php
index 0fb62fc..abb7af3 100644
--- a/resources/views/kjpp/create.blade.php
+++ b/resources/views/kjpp/create.blade.php
@@ -56,16 +56,20 @@
                                 @if (isset($kjpp->id))
                                     <option value="">Pilih Jenis Kantor</option>
                                     <option value="Kantor Pusat"
-                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Pusat' }}>Kantor Pusat
+                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Pusat' ? 'selected' : '' }}>
+                                        Kantor Pusat
                                     </option>
                                     <option value="Kantor Cabang"
-                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Cabang' }}>Kantor Cabang
+                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Cabang' ? 'selected' : '' }}>
+                                        Kantor Cabang
                                     </option>
                                 @else
                                     <option value="">Pilih Jenis Kantor</option>
-                                    <option value="Kantor Pusat" {{ old('jenis_kantor') == 'Kantor Pusat' }}>Kantor Pusat
+                                    <option value="Kantor Pusat"
+                                        {{ old('jenis_kantor') == 'Kantor Pusat' ? 'selected' : '' }}>Kantor Pusat
                                     </option>
-                                    <option value="Kantor Cabang" {{ old('jenis_kantor') == 'Kantor Cabang' }}>Kantor
+                                    <option value="Kantor Cabang"
+                                        {{ old('jenis_kantor') == 'Kantor Cabang' ? 'selected' : '' }}>Kantor
                                         Cabang
                                     </option>
                                 @endif
diff --git a/resources/views/kjpp/show.blade.php b/resources/views/kjpp/show.blade.php
index 35762c9..0e5def9 100644
--- a/resources/views/kjpp/show.blade.php
+++ b/resources/views/kjpp/show.blade.php
@@ -36,9 +36,7 @@
                     <label class="form-label max-w-56">Jenis Kantor</label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            @foreach ($branches as $branch)
-                                {{ $branch->name }}
-                            @endforeach
+                            {{ $kjpp->jenis_kantor }}
                         </p>
                     </div>
                     <label class="form-label max-w-56">Nomor Ijin Usaha</label>