From 2cb2b7981cca211008a9e9c8f8c5919d810634b2 Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 14 Feb 2025 16:16:41 +0700 Subject: [PATCH] perbaikan back halaman di otorisator so dan penambahan nilai likuidasi di resume --- app/Helpers/Lpj.php | 16 +- app/Http/Controllers/PenilaiController.php | 3 +- app/Http/Controllers/PenilaianController.php | 3 +- .../views/component/form-penilai.blade.php | 55 +- .../views/penilai/components/memo.blade.php | 21 +- .../penilai/components/print-resume.blade.php | 710 +++++++++--------- .../views/penilai/components/resume.blade.php | 285 +++++-- resources/views/penilai/lampiran.blade.php | 50 +- .../views/penilaian/paparan-so.blade.php | 8 +- .../surveyor/components/header.blade.php | 17 +- .../components/print-out/main.blade.php | 15 +- 11 files changed, 700 insertions(+), 483 deletions(-) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 98169aa..83d30e9 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -2,8 +2,8 @@ use Carbon\Carbon; use Illuminate\Support\Facades\DB; - use Modules\Lpj\Models\CustomField; - use Modules\Lpj\Models\HolidayCalendar; +use Modules\Lpj\Models\CustomField; +use Modules\Lpj\Models\HolidayCalendar; use Modules\Lpj\Models\PenawaranDetailTender; use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\Penilaian; @@ -30,7 +30,7 @@ function formatTanggalIndonesia($date, $time = false) function formatRupiah($number) { $number = (float) $number; - return 'Rp ' . number_format($number, 2, ',', '.'); + return 'Rp ' . number_format($number, 0, ',', '.'); } @@ -357,7 +357,8 @@ function checkRegionUserName($userId) } } -function getNomorLaporan($permohonanId, $documentId){ +function getNomorLaporan($permohonanId, $documentId) +{ $laporan = Laporan::where([ 'permohonan_id' => $permohonanId, 'dokumen_jaminan_id' => $documentId, @@ -365,13 +366,14 @@ function getNomorLaporan($permohonanId, $documentId){ return $laporan->nomor_laporan ?? null; } -function getCustomField($param){ - if(is_numeric($param)){ +function getCustomField($param) +{ + if (is_numeric($param)) { $field = CustomField::find($param); } else { $field = CustomField::where(['name' => $param])->first(); } - if($field){ + if ($field) { return $field; } else { return null; diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 02b983b..6094c5e 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -55,6 +55,7 @@ class PenilaiController extends Controller $basicData = $this->surveyorController->getCommonData(); $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId); $inpeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); + $penilai = Penilai::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first(); $formFoto = null; if ($inpeksi) { @@ -62,7 +63,7 @@ class PenilaiController extends Controller $forminspeksi = json_decode($inpeksi->data_form, true); } - return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData')); + return view('lpj::penilai.lampiran', compact('permohonan', 'formFoto', 'forminspeksi','basicData', 'penilai')); } public function create() diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 3f1b3c1..c16e361 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -724,6 +724,7 @@ class PenilaianController extends Controller ->where('dokument_id', $documentId) ->where('inspeksi_id', $inspeksi->id) ->first(); + $penilai = $lpj; $forminspeksi = null; $lpjData = null; @@ -765,7 +766,7 @@ class PenilaianController extends Controller return redirect()->back()->with('error', 'Laporan belum dibuat'); } - return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan')); + return view('lpj::' . $viewLaporan, compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'resumeData', 'rap', 'memo', 'cities', 'districts', 'villages','formFoto', 'formPeta','nomorLaporan', 'penilai')); } private function getViewLaporan($tipe) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index 8aa6765..59b4832 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -353,8 +353,7 @@ class="btn btn-xs btn-info"> Back - - @elseif (Auth::user()->hasAnyRole(['administrator','surveyor']) && Route::currentRouteName('penilai.show')) + @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show')) Back @@ -678,14 +677,14 @@
- * Masukkan Angka Saja + * Masukkan Angka Saja +
@@ -800,9 +799,8 @@
diff --git a/resources/views/penilai/lampiran.blade.php b/resources/views/penilai/lampiran.blade.php index 44c22a7..fcc8b8f 100644 --- a/resources/views/penilai/lampiran.blade.php +++ b/resources/views/penilai/lampiran.blade.php @@ -7,19 +7,17 @@ @section('content')
@if (Auth::user()->hasAnyRole(['senior-officer'])) - @include('lpj::component.detail-jaminan', [ - 'backLink' => 'otorisator.view-laporan', - 'queryParams' => [ - 'permohonanId' => request()->query('permohonanId'), - 'documentId' => request()->query('documentId'), - 'inspeksiId' => request()->query('inspeksiId'), - 'jaminanId' => request()->query('jaminanId'), - 'statusLpj' => 1, - ], - 'title' => 'Paparan dokument', - ]) - - + @include('lpj::component.detail-jaminan', [ + 'backLink' => 'otorisator.view-laporan', + 'queryParams' => [ + 'permohonanId' => request()->query('permohonanId'), + 'documentId' => request()->query('documentId'), + 'inspeksiId' => request()->query('inspeksiId'), + 'jaminanId' => request()->query('jaminanId'), + 'statusLpj' => 1, + ], + 'title' => 'Paparan dokument', + ]) @else @include('lpj::component.detail-jaminan', [ 'backLink' => 'penilai.show', @@ -29,5 +27,31 @@ @endif @include('lpj::penilai.components.foto-lampiran') + +
+
+ Kertas Kerja +
+
+ @php + $url = ''; + $fileName = ''; + if ($penilai && $penilai->kertas_kerja) { + $url = asset('storage/' . $penilai->kertas_kerja); + $fileName = basename($penilai->kertas_kerja); + } + @endphp + + @if ($penilai && $penilai->kertas_kerja) + + +

{{ $fileName }}

+ @else +

Belum ada kertas kerja

+ @endif +
+
@endsection diff --git a/resources/views/penilaian/paparan-so.blade.php b/resources/views/penilaian/paparan-so.blade.php index fe74d84..4b4cbc1 100644 --- a/resources/views/penilaian/paparan-so.blade.php +++ b/resources/views/penilaian/paparan-so.blade.php @@ -245,8 +245,8 @@ approval_so: { title: 'Approval SO', render: (item, data) => { - if(data.authorization.approve_so) { - return `${data.authorization.approve_so.name} | ${window.formatTanggalIndonesia(data.authorization.approve_so_at)}`; + if(data?.authorization?.approve_so) { + return `${data?.authorization?.approve_so?.name} | ${window.formatTanggalIndonesia(data?.authorization?.approve_so_at)}`; } return ''; }, @@ -254,8 +254,8 @@ approval_dd: { title: 'Approval DD', render: (item, data) => { - if(data.authorization.approve_dd) { - return `${data.authorization.approve_dd.name} | ${window.formatTanggalIndonesia(data.authorization.approve_dd_at)}`; + if(data?.authorization?.approve_dd) { + return `${data?.authorization?.approve_dd?.name} | ${window.formatTanggalIndonesia(data?.authorization?.approve_dd_at)}`; } return ''; }, diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php index 0173111..70455f8 100644 --- a/resources/views/surveyor/components/header.blade.php +++ b/resources/views/surveyor/components/header.blade.php @@ -12,9 +12,20 @@ Back @else - - Back - + @php + use Illuminate\Support\Facades\Route; + @endphp + @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']) && + Route::currentRouteName('otorisator.show')) + + Back + + @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show')) + + Back + + @endif @endif {{-- Back diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php index 1de2703..2e74dfa 100644 --- a/resources/views/surveyor/components/print-out/main.blade.php +++ b/resources/views/surveyor/components/print-out/main.blade.php @@ -527,17 +527,16 @@ @php + $hubCadebPenghuni = $forminspeksi['asset']['hub_cadeb_penghuni'] ?? null; - $cekHub = - isset($forminspeksi['asset']['hub_cadeb_penghuni']) && - $forminspeksi['asset']['hub_cadeb_penghuni'] === 'sesuai' - ? 'sesuai' - : 'tidak sesuai'; + $cekHub = $hubCadebPenghuni === 'sesuai' ? 'sesuai' : 'tidak sesuai'; - $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub]) - ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai'] - : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']; + $hubCadeb = + is_array($hubCadebPenghuni) && isset($hubCadebPenghuni[$cekHub]) + ? $hubCadebPenghuni[$cekHub] + : $hubCadebPenghuni[$cekHub] ?? null; @endphp + Hubungan Penghuni Jaminan dengan Debitur @if (isset($basicData['hubPenghuni']))