From 184e7191dc094ada6882d8fad08b8651bcc2dd6f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 5 Nov 2024 14:26:06 +0700 Subject: [PATCH 1/2] Add 'administrator' role to various permissions Updated the role lists throughout `module.json` to include the 'administrator' role alongside existing roles. This ensures that administrators have the necessary permissions to perform actions across different sections and functionalities. --- module.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/module.json b/module.json index 35b63fb..572fe59 100644 --- a/module.json +++ b/module.json @@ -150,7 +150,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"] + "roles": ["administrator","senior-officer"] }, { "title": "Otorisator", @@ -159,7 +159,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"], + "roles": ["administrator","senior-officer"], "sub": [ { "title": "Pelaporan", @@ -167,7 +167,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"] + "roles": ["administrator","senior-officer"] }, { "title": "Pembayaran", @@ -175,7 +175,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"] + "roles": ["administrator","senior-officer"] }, { "title": "Pembatalan", @@ -183,7 +183,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"] + "roles": ["administrator","senior-officer"] }, { "title": "SLA", @@ -191,7 +191,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["senior-officer"] + "roles": ["administrator","senior-officer"] } ] }, @@ -202,7 +202,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { @@ -227,7 +227,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Laporan", @@ -444,7 +444,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Kontur Tanah", @@ -452,7 +452,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Posisi Kavling", @@ -460,7 +460,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Ketinggian Tanah", @@ -468,7 +468,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Kondisi Fisik Tanah", @@ -476,7 +476,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Jenis Bangunan", @@ -484,7 +484,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Kondisi Bangunan", @@ -492,7 +492,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Sifat Bangunan", @@ -500,7 +500,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { @@ -509,7 +509,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { @@ -518,7 +518,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Tingkat Keramaian", @@ -526,7 +526,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Masyarakat Sekitar", @@ -534,7 +534,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Lantai Unit", @@ -542,7 +542,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "View unit", @@ -550,7 +550,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Spesifikasi Bangunan", @@ -558,7 +558,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] }, { "title": "Kategori Speksikasi Bangunan", @@ -566,7 +566,7 @@ "classes": "", "attributes": [], "permission": "", - "roles": ["surveyor"] + "roles": ["administrator","surveyor"] } From 0c891b222887458af17668ce2a019c138c797a36 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 5 Nov 2024 15:07:57 +0700 Subject: [PATCH 2/2] Add conditional custom field input types Enhanced the handling of custom fields by conditionally adding input types like text, number, date, and textarea based on the field's type. Also, added missing placeholders to input elements to improve usability. --- .../debitur/components/dokumen.blade.php | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index 3de2e04..40c55fd 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -176,6 +176,27 @@ + @else + @if($detail->jenisLegalitasJaminan->custom_field) +
+ +
+ @if($detail->jenisLegalitasJaminan->custom_field_type === "text") + + @elseif($detail->jenisLegalitasJaminan->custom_field_type === "number") + + @elseif($detail->jenisLegalitasJaminan->custom_field_type === "date") + + @elseif($detail->jenisLegalitasJaminan->custom_field_type === "textarea") + + @else + + @endif +
+
+ @endif @endif
@@ -221,15 +242,15 @@
@if($item->custom_field_type === "text") - + @elseif($item->custom_field_type === "number") - + @elseif($item->custom_field_type === "date") - + @elseif($item->custom_field_type === "textarea") - + @else - + @endif
@@ -246,9 +267,7 @@ @php $n++; @endphp @endforeach @else -
-
@endif
@@ -370,13 +389,13 @@ @push('scripts') {{--Pemilik Jaminan--}}