From 0dd375494eaa744a9527680507f45455d3765fb4 Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 21 Jan 2025 12:23:51 +0700 Subject: [PATCH 01/18] perbaikan foto tempat --- resources/views/surveyor/components/informasi.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index e452f5b..c419550 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -206,9 +206,10 @@ Foto Argis Region + src="{{ isset($forminspeksi['foto_tempat']) ? asset('storage/' . (is_array($forminspeksi['foto_tempat']) ? $forminspeksi['foto_tempat'][0] : $forminspeksi['foto_tempat'])) : '' }}" + alt="Foto Tempat" class="mt-2 max-w-full h-auto" + style="{{ isset($forminspeksi['foto_tempat']) ? '' : 'display: none;' }} max-width: 30rem;"> + From 86e6e5e7bf352bcd4112e102c0dfdc600b84959f Mon Sep 17 00:00:00 2001 From: majid Date: Tue, 21 Jan 2025 12:30:49 +0700 Subject: [PATCH 02/18] perbaikan pembanding input bangunan --- .../components/pembanding-tanah-bangunan-unit.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php index 9a4eab9..70c7a27 100644 --- a/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php +++ b/resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php @@ -103,7 +103,7 @@ @endphp - @@ -135,8 +135,8 @@ + class="input" + value="{{ $inspectionData['bangunan']['luas_tanah_bagunan']['sesuai'] ?? ($inspectionData['bangunan']['luas_tanah_bagunan']['tidak sesuai'] ?? '') }}"> Date: Tue, 21 Jan 2025 12:57:01 +0700 Subject: [PATCH 03/18] fix(surveyor): perbaiki tampilan foto tempat - Menambahkan pengecekan untuk memastikan foto tempat ditampilkan hanya jika ada. - Menghindari tampilan elemen gambar yang tidak perlu saat tidak ada foto. --- .../views/surveyor/components/informasi.blade.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index c419550..b6e8f42 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -205,10 +205,12 @@ - Foto Tempat + @if(count($forminspeksi['foto_tempat']) > 0) + Foto Tempat + @endif From 9a25aaed8ca0fba296b067dc99dd9cf2d0b03973 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 14:37:19 +0700 Subject: [PATCH 04/18] fix(form): perbaiki kesalahan penamaan variabel dan tampilkan foto tempat - Memperbaiki penamaan variabel dari 'registrasi_cat' menjadi 'registrasi_catatatn' pada textarea. - Menambahkan pengecekan untuk memastikan 'forminspeksi' ada sebelum menampilkan foto tempat. - Memastikan foto tempat hanya ditampilkan jika ada dalam array. --- resources/views/penilaian/form.blade.php | 2 +- .../views/surveyor/components/informasi.blade.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index f0505da..0fbf21e 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -270,7 +270,7 @@
+ type="text" name="keterangan">{{ $permohonan->registrasi_catatatn ?? "" }} {{ $penilaian->keterangan ?? '' }}
diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index b6e8f42..db05f87 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -205,11 +205,13 @@ - @if(count($forminspeksi['foto_tempat']) > 0) - Foto Tempat + @if($forminspeksi) + @if(count($forminspeksi['foto_tempat']) > 0) + Foto Tempat + @endif @endif From 5211f9a3377f514cfad037cb7fe61608c7a19c7d Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 14:38:50 +0700 Subject: [PATCH 05/18] fix(form): perbaiki kesalahan penamaan variabel - Mengubah penamaan variabel 'registrasi_catatatn' menjadi 'registrasi_catatan' pada textarea. --- resources/views/penilaian/form.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index 0fbf21e..c1743c1 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -270,7 +270,7 @@
+ type="text" name="keterangan">{{ $permohonan->registrasi_catatan ?? "" }} {{ $penilaian->keterangan ?? '' }}
From 6d4d172ccf3718265eb02b3adf9f8e11e5e85004 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 14:44:58 +0700 Subject: [PATCH 06/18] fix(history-permohonan): tambahkan label 'Catatan' pada keterangan aktivitas - Memperjelas informasi dengan menambahkan label 'Catatan' sebelum keterangan aktivitas. - Meningkatkan keterbacaan dan pemahaman pengguna terhadap informasi yang ditampilkan. --- resources/views/component/history-permohonan.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/component/history-permohonan.blade.php b/resources/views/component/history-permohonan.blade.php index a8133c3..65653ec 100644 --- a/resources/views/component/history-permohonan.blade.php +++ b/resources/views/component/history-permohonan.blade.php @@ -59,7 +59,7 @@
{{ str_replace('-',' ',$activity->status) }} -

{{ $activity->keterangan }}

+

Catatan : {{ $activity->keterangan }}

{{ $activity->created_by ? $activity->creator->name : 'System' }} {{ $activity->created_at->format('d M Y H:i') }} From edbe452f8b97e55f89cf3ebe47c015d4ffb1291f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 14:48:15 +0700 Subject: [PATCH 07/18] fix(form): perbaiki tampilan textarea keterangan - Mengubah cara menampilkan catatan registrasi pada textarea. - Menambahkan newline sebelum keterangan penilaian jika ada catatan registrasi. --- resources/views/penilaian/form.blade.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index c1743c1..97c615f 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -269,8 +269,7 @@ Catatan
- +
From a4ca00c88b2c4c43bf52ef4c8b9e794375ca90e3 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 14:49:06 +0700 Subject: [PATCH 08/18] fix(history-permohonan): perbaiki tampilan catatan aktivitas - Menambahkan kondisi untuk menampilkan label 'Catatan' hanya jika ada keterangan. - Memastikan tampilan lebih bersih saat tidak ada keterangan yang tersedia. --- resources/views/component/history-permohonan.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/component/history-permohonan.blade.php b/resources/views/component/history-permohonan.blade.php index 65653ec..6c17dfc 100644 --- a/resources/views/component/history-permohonan.blade.php +++ b/resources/views/component/history-permohonan.blade.php @@ -59,7 +59,7 @@
{{ str_replace('-',' ',$activity->status) }} -

Catatan : {{ $activity->keterangan }}

+

{{ $activity->keterangan ? 'Catatan : '.$activity->keterangan : '' }}

{{ $activity->created_by ? $activity->creator->name : 'System' }} {{ $activity->created_at->format('d M Y H:i') }} From b2b8c0e9cdf6f517bbc7cdd21411c65ddbef33db Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 15:08:48 +0700 Subject: [PATCH 09/18] fix(informasi): perbaiki tampilan foto tempat - Memastikan foto tempat ditampilkan dengan benar jika merupakan array. - Menambahkan kondisi untuk menangani kasus ketika foto tempat tidak ada. --- .../surveyor/components/informasi.blade.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index db05f87..f877df0 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -206,14 +206,21 @@
@if($forminspeksi) - @if(count($forminspeksi['foto_tempat']) > 0) - Foto Tempat + @if(is_array($forminspeksi['foto_tempat'])) + @if(count($forminspeksi['foto_tempat']) > 0) + Foto Tempat + @endif + @else + Foto Tempat + @endif @endif @endif -
From fde505a5b2514537d84ebf60b77d276d83f1944a Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 21 Jan 2025 15:10:17 +0700 Subject: [PATCH 10/18] fix(form): perbaiki tampilan form input - Memperbaiki kesalahan tampilan pada elemen input. --- .../surveyor/components/informasi.blade.php | 477 +++++++++--------- 1 file changed, 238 insertions(+), 239 deletions(-) diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index f877df0..20bd3a7 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -1,269 +1,268 @@ - -
-
-

- Informasi Dinas Tata Ruang -

-
-
- -
- @php - $inputDinasTata = [ - [ - 'label' => 'Peruntukan', - 'name' => 'peruntukan', - 'index' => 0, - 'value' => old( - 'peruntukan', - isset($forminspeksi['fakta']['peruntukan']) ? $forminspeksi['fakta']['peruntukan'] : '', - ), - ], - [ - 'label' => 'KDB', - 'name' => 'kdb', - 'index' => 1, - 'value' => old( - 'kdb', - isset($forminspeksi['fakta']['kdb']) ? $forminspeksi['fakta']['kdb'] : '', - ), - ], - [ - 'label' => 'KDH', - 'name' => 'kdh', - 'index' => 2, - 'value' => old( - 'kdh', - isset($forminspeksi['fakta']['kdh']) ? $forminspeksi['fakta']['kdh'] : '', - ), - ], - [ - 'label' => 'GSB', - 'name' => 'gsb', - 'index' => 3, - 'value' => old( - 'gsb', - isset($forminspeksi['fakta']['gsb']) ? $forminspeksi['fakta']['gsb'] : '', - ), - ], - [ - 'label' => 'Max Lantai', - 'name' => 'max_lantai', - 'index' => 4, - 'value' => old( - 'max_lantai', - isset($forminspeksi['fakta']['max_lantai']) ? $forminspeksi['fakta']['max_lantai'] : '', - ), - ], - [ - 'label' => 'KLB', - 'name' => 'klb', - 'index' => 5, - 'value' => old( - 'klb', - isset($forminspeksi['fakta']['klb']) ? $forminspeksi['fakta']['klb'] : '', - ), - ], - [ - 'label' => 'GSS', - 'name' => 'gss', - 'index' => 6, - 'value' => old( - 'gss', - isset($forminspeksi['fakta']['gss']) ? $forminspeksi['fakta']['gss'] : '', - ), - ], - [ - 'label' => 'Pelebaran Jalan', - 'name' => 'pelebaran_jalan', - 'index' => 7, - 'value' => old( - 'pelebaran_jalan', - isset($forminspeksi['fakta']['pelebaran_jalan']) - ? $forminspeksi['fakta']['pelebaran_jalan'] - : '', - ), - ], - [ - 'label' => 'Nama Petugas TK', - 'name' => 'nama_petugas', - 'index' => 8, - 'value' => old( - 'nama_petugas', - isset($forminspeksi['fakta']['nama_petugas']) - ? $forminspeksi['fakta']['nama_petugas'] - : '', - ), - ], - ]; - @endphp + +
+
+

+ Informasi Dinas Tata Ruang +

+
+
+ +
+ @php + $inputDinasTata = [ + [ + 'label' => 'Peruntukan', + 'name' => 'peruntukan', + 'index' => 0, + 'value' => old( + 'peruntukan', + isset($forminspeksi['fakta']['peruntukan']) ? $forminspeksi['fakta']['peruntukan'] : '', + ), + ], + [ + 'label' => 'KDB', + 'name' => 'kdb', + 'index' => 1, + 'value' => old( + 'kdb', + isset($forminspeksi['fakta']['kdb']) ? $forminspeksi['fakta']['kdb'] : '', + ), + ], + [ + 'label' => 'KDH', + 'name' => 'kdh', + 'index' => 2, + 'value' => old( + 'kdh', + isset($forminspeksi['fakta']['kdh']) ? $forminspeksi['fakta']['kdh'] : '', + ), + ], + [ + 'label' => 'GSB', + 'name' => 'gsb', + 'index' => 3, + 'value' => old( + 'gsb', + isset($forminspeksi['fakta']['gsb']) ? $forminspeksi['fakta']['gsb'] : '', + ), + ], + [ + 'label' => 'Max Lantai', + 'name' => 'max_lantai', + 'index' => 4, + 'value' => old( + 'max_lantai', + isset($forminspeksi['fakta']['max_lantai']) ? $forminspeksi['fakta']['max_lantai'] : '', + ), + ], + [ + 'label' => 'KLB', + 'name' => 'klb', + 'index' => 5, + 'value' => old( + 'klb', + isset($forminspeksi['fakta']['klb']) ? $forminspeksi['fakta']['klb'] : '', + ), + ], + [ + 'label' => 'GSS', + 'name' => 'gss', + 'index' => 6, + 'value' => old( + 'gss', + isset($forminspeksi['fakta']['gss']) ? $forminspeksi['fakta']['gss'] : '', + ), + ], + [ + 'label' => 'Pelebaran Jalan', + 'name' => 'pelebaran_jalan', + 'index' => 7, + 'value' => old( + 'pelebaran_jalan', + isset($forminspeksi['fakta']['pelebaran_jalan']) + ? $forminspeksi['fakta']['pelebaran_jalan'] + : '', + ), + ], + [ + 'label' => 'Nama Petugas TK', + 'name' => 'nama_petugas', + 'index' => 8, + 'value' => old( + 'nama_petugas', + isset($forminspeksi['fakta']['nama_petugas']) + ? $forminspeksi['fakta']['nama_petugas'] + : '', + ), + ], + ]; + @endphp - @if (count($inputDinasTata) > 0) - @foreach ($inputDinasTata as $item) -
- -
- 0) + @foreach ($inputDinasTata as $item) +
+ +
+ - @error($item['name']) - - @enderror -
-
- @endforeach - @endif + @error($item['name']) + + @enderror +
+
+ @endforeach + @endif -
- -
- -
- + +
+ +
+ - Foto Bhumi + Foto Bhumi -
- - Gistaru - -
-
+
+ + Gistaru + +
+
-
- -
- -
+
+ +
+ +
- - Foto Bhumi -
- - Bhumi - -
-
+ Foto Bhumi +
+ + Bhumi + +
+
- @if (isset($link_url_region->regions->url)) -
- -
- -
- regions->url)) +
+ +
+ +
+ - Foto Argis Region -
- - - {{ $link_url_region->regions->name_url }} - -
-
- @endif -
- + Foto Argis Region +
+ + + {{ $link_url_region->regions->name_url }} + +
+
+ @endif +
+ -
- -
-
- + +
+
+ - -
+ +
- @if($forminspeksi) - @if(is_array($forminspeksi['foto_tempat'])) - @if(count($forminspeksi['foto_tempat']) > 0) - Foto Tempat - @endif - @else - Foto Tempat - @endif - @endif - @endif -
-
+ @if($forminspeksi) + @if(is_array($forminspeksi['foto_tempat'])) + @if(count($forminspeksi['foto_tempat']) > 0) + Foto Tempat + @endif + @else + Foto Tempat + @endif + @endif +
+
- + -
+
- -
-
- @if (!empty($forminspeksi['fakta']['keterangan']) && is_array($forminspeksi['fakta']['keterangan'])) - @foreach ($forminspeksi['fakta']['keterangan'] as $index => $item) -
- - -
- @endforeach - @else -
- - - -
- @endif -
- -
-
-
-
+ +
+
+ @if (!empty($forminspeksi['fakta']['keterangan']) && is_array($forminspeksi['fakta']['keterangan'])) + @foreach ($forminspeksi['fakta']['keterangan'] as $index => $item) +
+ + +
+ @endforeach + @else +
+ + + +
+ @endif +
+ +
+
+ + - @include('lpj::surveyor.components.modal-kamera') +@include('lpj::surveyor.components.modal-kamera') - @push('scripts') - @include('lpj::surveyor.js.camera-editor') - @endpush +@push('scripts') + @include('lpj::surveyor.js.camera-editor') +@endpush From 6e6611c02c81cf3bd096496520ba90187f5704ae Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 06:58:32 +0700 Subject: [PATCH 11/18] fix(SLAController): tambahkan filter jenis 'sla' pada query Authorization - Memperbarui query Authorization untuk hanya mengambil data dengan jenis 'sla'. - Menambahkan logika untuk pencarian berdasarkan parameter yang diberikan. --- app/Http/Controllers/PenilaianController.php | 3 +++ app/Http/Controllers/SLAController.php | 2 +- app/Http/Controllers/SurveyorController.php | 10 ++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index cd51dc2..09d0ba4 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -486,6 +486,7 @@ class PenilaianController extends Controller if (Auth::user()->roles[0]->name === 'senior-officer') { $authorization->update([ 'status' => '3', + 'status_so' => '1', 'approve_so' => Auth::user()->id, 'approve_so_at' => now(), 'keterangan_so' => $request->message, @@ -501,6 +502,7 @@ class PenilaianController extends Controller $authorization->update([ 'status' => $status, + 'status_eo' => '1', 'approve_eo' => Auth::user()->id, 'approve_eo_at' => now(), 'keterangan_eo' => $request->message, @@ -508,6 +510,7 @@ class PenilaianController extends Controller } elseif (Auth::user()->roles[0]->name === 'DD Appraisal') { $authorization->update([ 'status' => '1', + 'status_dd' => '1', 'approve_dd' => Auth::user()->id, 'approve_dd_at' => now(), 'keterangan_dd' => $request->message, diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php index 423084d..3256aee 100644 --- a/app/Http/Controllers/SLAController.php +++ b/app/Http/Controllers/SLAController.php @@ -71,7 +71,7 @@ class SLAController extends Controller // abort(403, 'Sorry! You are not allowed to view users.'); } - $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd'); + $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla'); // Pencarian berdasarkan parameter search if ($request->has('search') && !empty($request->get('search'))) { diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 2576e2b..c8bc0d7 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -1016,12 +1016,14 @@ class SurveyorController extends Controller public function storeFreeze($id, Request $request) { try { - $permohonan = Permohonan::findOrFail($id); - $permohonan->update([ - 'status' => 'request-freeze', - 'keterangan' => $request->message + Authorization::updateOrCreate([ + 'permohonan_id' => $permohonan->id, + 'jenis' => 'sla' + ],[ + 'request' => 'freeze', + 'user_id' => Auth::user()->id ]); return response()->json([ From 7558d1a5741f72b069068717fb00e5fd65d0fcbc Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 22 Jan 2025 07:33:58 +0700 Subject: [PATCH 12/18] fix(PenilaianController): perbaiki logika otorisasi dan pembaruan status - Menambahkan penanganan untuk konteks 'Paparan' pada otorisasi. - Memperbaiki kesalahan penamaan variabel dari 'nulai_plafond_id' menjadi 'nilai_plafond_id'. - Memperbarui status otorisasi berdasarkan peran pengguna. - Menambahkan pembaruan status permohonan untuk konteks 'paparan'. --- app/Http/Controllers/PenilaianController.php | 52 +++- .../views/penilaian/otorisator/show.blade.php | 260 +++++++++++++----- 2 files changed, 238 insertions(+), 74 deletions(-) diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 09d0ba4..234dd22 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -430,6 +430,14 @@ class PenilaianController extends Controller ], 404); } $permohonan = Permohonan::find($authorization->permohonan_id); + } elseif ($context === 'Paparan') { + $authorization = Authorization::with(['user'])->find($id); + if (!$authorization) { + return response()->json([ + 'message' => 'Data authorization Paparan tidak ditemukan.', + ], 404); + } + $permohonan = Permohonan::find($authorization->permohonan_id); } else { $permohonan = Permohonan::find($id); } @@ -493,7 +501,7 @@ class PenilaianController extends Controller ]); } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') { $status = '2'; - if (!in_array($permohonan->nulai_plafond_id, [1, 4])) { + if (!in_array($permohonan->nilai_plafond_id, [1, 4])) { $status = '1'; $permohonan->update([ 'status' => $authorization->request @@ -522,11 +530,45 @@ class PenilaianController extends Controller } break; case 'paparan': - $permohonan->update([ - 'status' => 'paparan', - 'keterangan' => $request->message, - ]); + if (Auth::user()->roles[0]->name === 'senior-officer') { + $authorization->update([ + 'status' => '3', + 'status_so' => '1', + 'approve_so' => Auth::user()->id, + 'approve_so_at' => now(), + 'keterangan_so' => $request->message, + ]); + } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator') { + $status = '2'; + if (!in_array($permohonan->nilai_plafond_id, [1, 4])) { + $status = '1'; + $permohonan->update([ + 'status' => $authorization->request + ]); + } + $authorization->update([ + 'status' => $status, + 'status_eo' => '1', + 'approve_eo' => Auth::user()->id, + 'approve_eo_at' => now(), + 'keterangan_eo' => $request->message, + ]); + } elseif (Auth::user()->roles[0]->name === 'DD Appraisal') { + $authorization->update([ + 'status' => '1', + 'status_dd' => '1', + 'approve_dd' => Auth::user()->id, + 'approve_dd_at' => now(), + 'keterangan_dd' => $request->message, + ]); + + $permohonan->update([ + 'status' => 'paparan', + 'tanggal_paparan' => $request->tanggalPaparan + ]); + } break; + default: return response()->json([ 'message' => 'Konteks otorisasi tidak valid.', diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index baf9663..6e40a96 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -129,9 +129,36 @@ href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}"> Lihat Laporan - @endif + @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == null) + + + @endif - @if ($dataHeader == 'paparan') + @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && + $permohonan->approval_so && + $permohonan->approval_eo == null) + + @endif + + @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && + $permohonan->approval_eo && + $permohonan->approval_dd == null && + in_array($permohonan->nilai_plafond_id, [1, 4])) + + @endif + + @elseif($dataHeader == 'paparan') Lihat Data Paparan @@ -142,37 +169,23 @@ Otorisator {{ $header ?? '' }} @endif - @endif - @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $permohonan->approval_so == null) - - @if ($dataHeader != 'paparan') - @endif - @endif - @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && - $permohonan->approval_so && - $permohonan->approval_eo == null) - - @endif - - @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && - $permohonan->approval_eo && - $permohonan->approval_dd == null && - in_array($permohonan->nilai_plafond_id, [1, 4])) - + @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && + $authorization->approve_so && + $authorization->approval_dd == null && + in_array($permohonan->nilai_plafond_id, [1, 4])) + + @endif @endif @@ -181,53 +194,162 @@ @push('scripts')