From a7ac60c319aa413e63338b843ba84e60ed4c860d Mon Sep 17 00:00:00 2001
From: rahmatrafli1 <rahmatrafli1@gmail.com>
Date: Tue, 29 Oct 2024 14:13:58 +0700
Subject: [PATCH] Memperbaiki Konflik pada module.json dan breadcrumb.php

---
 module.json            | 60 ++++++++++++++++++++--------------------
 routes/breadcrumbs.php | 63 +++++++++++++++---------------------------
 2 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/module.json b/module.json
index f8cc66a..7a322e4 100644
--- a/module.json
+++ b/module.json
@@ -182,7 +182,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": ["senior-officer"]
+            "roles": ["ssenior-officero"]
           }
         ]
       },
@@ -213,7 +213,7 @@
       },
       {
         "title": "Laporan",
-        "path": "",
+        "path": "laporan",
         "icon": "ki-filled ki-filter-tablet text-lg",
         "classes": "",
         "attributes": [],
@@ -224,16 +224,40 @@
           "pemohon-eo",
           "admin",
           "senior-officer"
+        ],
+        "sub": [
+          {
+            "title": "Sederhana",
+            "path": "laporan.sederhana",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["administrator", "admin"]
+          },
+          {
+            "title": "Standard",
+            "path": "laporan.standard",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": [
+              "administrator",
+              "pemohon-ao",
+              "pemohon-eo",
+              "admin",
+              "senior-officer"
+            ]
+          }
         ]
       },
       {
-        "title": "Penilai",
-        "path": "penilai",
-        "icon": "ki-filled ki-brush text-lg",
+        "title": "Resume",
+        "path": "resume",
+        "icon": "ki-filled ki-questionnaire-tablet text-lg",
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": ["surveyor"]
+        "roles": ["administrator", "pemohon-ao", "pemohon-eo"]
       }
     ],
     "master": [
@@ -252,22 +276,6 @@
           "surveyor"
         ],
         "sub": [
-          {
-            "title": "Cabang",
-            "path": "basicdata.branch",
-            "classes": "",
-            "attributes": [],
-            "permission": "",
-            "roles": ["administrator", "pemohon-ao", "pemohon-eo"]
-          },
-          {
-            "title": "Mata Uang",
-            "path": "basicdata.currency",
-            "classes": "",
-            "attributes": [],
-            "permission": "",
-            "roles": ["administrator", "pemohon-ao", "pemohon-eo"]
-          },
           {
             "title": "Jenis Fasilitas Kredit",
             "path": "basicdata.jenis-fasilitas-kredit",
@@ -404,14 +412,6 @@
             "permission": "",
             "roles": ["administrator", "admin"]
           },
-          {
-            "title": "SLA",
-            "path": "basicdata.sla",
-            "classes": "",
-            "attributes": [],
-            "permission": "",
-            "roles": ["administrator", "admin"]
-          },
           {
             "title": "Bentuk Tanah",
             "path": "basicdata.bentuk-tanah",
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index cdbf79a..68a7260 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -3,9 +3,11 @@
 use Diglactic\Breadcrumbs\Breadcrumbs;
 use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
 
-Breadcrumbs::for('basicdata', function (BreadcrumbTrail $trail) {
-    $trail->push('Basic Data');
-});
+if (!Breadcrumbs::exists('basicdata')) {
+    Breadcrumbs::for('basicdata', function (BreadcrumbTrail $trail) {
+        $trail->push('Basic Data');
+    });
+}
 
 Breadcrumbs::for('basicdata.jenis-fasilitas-kredit', function (BreadcrumbTrail $trail) {
     $trail->parent('basicdata');
@@ -113,36 +115,6 @@ Breadcrumbs::for('basicdata.jenis-dokumen.edit', function (BreadcrumbTrail $trai
 });
 
 
-Breadcrumbs::for('basicdata.currency', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata');
-    $trail->push('Mata Uang', route('basicdata.currency.index'));
-});
-
-Breadcrumbs::for('basicdata.currency.create', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata.currency');
-    $trail->push('Tambah Mata Uang', route('basicdata.currency.create'));
-});
-
-Breadcrumbs::for('basicdata.currency.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata.currency');
-    $trail->push('Edit Mata Uang');
-});
-
-Breadcrumbs::for('basicdata.branch', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata');
-    $trail->push('Cabang', route('basicdata.branch.index'));
-});
-
-Breadcrumbs::for('basicdata.branch.create', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata.branch');
-    $trail->push('Tambah Cabang', route('basicdata.branch.create'));
-});
-
-Breadcrumbs::for('basicdata.branch.edit', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata.branch');
-    $trail->push('Edit Cabang');
-});
-
 Breadcrumbs::for('basicdata.nilai-plafond', function (BreadcrumbTrail $trail) {
     $trail->parent('basicdata');
     $trail->push('Nilai Plafond', route('basicdata.nilai-plafond.index'));
@@ -535,16 +507,25 @@ Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail)
     $trail->push('Otorisator', route('otorisator.pelaporan.index'));
 });
 
-Breadcrumbs::for('penilai', function (BreadcrumbTrail $trail) {
-    $trail->push('Penilai', route('penilai.index'));
+Breadcrumbs::for('laporan', function (BreadcrumbTrail $trail) {
+    $trail->push('Laporan', route('laporan.sederhana.index'));
 });
 
-Breadcrumbs::for('penilai.show', function (BreadcrumbTrail $trail) {
-    $trail->parent('penilai');
-    $trail->push('Detail Penilai');
+Breadcrumbs::for('laporan.sederhana.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('laporan');
+    $trail->push('Sederhana', route('laporan.sederhana.index'));
 });
 
-Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) {
-    $trail->parent('basicdata');
-    $trail->push('SLA', route('basicdata.sla.index'));
+Breadcrumbs::for('laporan.standard.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('laporan');
+    $trail->push('Standard', route('laporan.standard.index'));
+});
+
+Breadcrumbs::for('resume', function (BreadcrumbTrail $trail) {
+    $trail->push('Resume', route('resume.index'));
+});
+
+Breadcrumbs::for('resume.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('resume');
+    $trail->push('Detail');
 });