From 74701c092d62599b0c52be1e7a901c447f224eab Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 24 Jan 2025 15:47:12 +0700 Subject: [PATCH] fix(LaporanController ) : laporan memo dan print out rap --- app/Http/Controllers/LaporanController.php | 20 ++- .../components/print-out-rap.blade.php | 165 +++++++++--------- 2 files changed, 101 insertions(+), 84 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 61f98bc..cd84f0f 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -5,14 +5,21 @@ namespace Modules\Lpj\Http\Controllers; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Modules\Lpj\Models\Permohonan; +use Modules\Lpj\Http\Controllers\PenilaiController; class LaporanController extends Controller { public $user; + public $penilaiController; /** * Display a listing of the resource. */ + + public function __construct(PenilaiController $penilaiController){ + $this->penilaiController = $penilaiController; + } + public function index() { return view('lpj::laporan.index'); @@ -33,7 +40,18 @@ class LaporanController extends Controller */ public function show($id) { $permohonan = Permohonan::with([ - 'penilai'])->find($id); + 'penilai', + 'dokumenjaminan', + ])->find($id); + + if ($permohonan->penilai->type_penilai == 'memo') { + return $this->penilaiController->print_out($request = new Request(['documentId' => $permohonan->penilai->dokument_id, 'jaminanId' => $permohonan->dokumenjaminan[0]->jenis_jaminan_id, 'permohonanId' => $permohonan->id, 'statusLpj' => 1, 'type' => 'memo'])); + } + + if ($permohonan->penilai->type_penilai == 'rap') { + return $this->penilaiController->print_out($request = new Request(['documentId' => $permohonan->penilai->dokument_id, 'jaminanId' => $permohonan->dokumenjaminan[0]->jenis_jaminan_id, 'permohonanId' => $permohonan->id, 'statusLpj' => 1, 'type' => 'rap'])); + } + return view('lpj::laporan.show', compact('permohonan')); } /** diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php index a45a709..5f201e5 100644 --- a/resources/views/penilai/components/print-out-rap.blade.php +++ b/resources/views/penilai/components/print-out-rap.blade.php @@ -318,7 +318,6 @@ {{ $forminspeksi['kontraktor'] ?? '' }} - @@ -343,8 +342,6 @@ @endforeach @endisset - - @isset($forminspeksi['partisi']) @@ -369,9 +366,9 @@ @endisset -

JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN

- - @isset($forminspeksi['jumlah_unit']) + @isset($forminspeksi['jumlah_unit']) +

JUMLAH UNIT, BLOK, TYPE DAN LUAS BANGUNAN

+
@foreach ($forminspeksi['jumlah_unit'] as $item) @endforeach - @endisset -
@@ -379,11 +376,11 @@
-

BATAS-BATAS PERUMAHAN

- - @isset($forminspeksi['batas_batas_perumahan']) +
+ @endisset + @isset($forminspeksi['batas_batas_perumahan']) +

BATAS-BATAS PERUMAHAN

+ @foreach ($forminspeksi['batas_batas_perumahan'] as $item) @endforeach - @endisset -
@@ -391,11 +388,11 @@
-

FASOS/FASUM

- - @isset($forminspeksi['fasus_fasum']) +
+ @endisset + @isset($forminspeksi['fasus_fasum']) +

FASOS/FASUM

+ @foreach ($forminspeksi['fasus_fasum'] as $item) @endforeach - @endisset -
@@ -403,11 +400,11 @@
-

PROGRES PENJUALAN SAAT INI

- - @isset($forminspeksi['progres_penjualan']) +
+ @endisset + @isset($forminspeksi['progres_penjualan']) +

PROGRES PENJUALAN SAAT INI

+ @foreach ($forminspeksi['progres_penjualan'] as $item) @endforeach - @endisset -
@@ -415,11 +412,11 @@
-

HARGA UNIT

- - @isset($forminspeksi['harga_unit']) +
+ @endisset + @isset($forminspeksi['harga_unit']) +

HARGA UNIT

+ @foreach ($forminspeksi['harga_unit'] as $item) @endforeach - @endisset -
@@ -427,11 +424,11 @@
-

TARGET MARKET

- - @isset($forminspeksi['target_market']) +
+ @endisset + @isset($forminspeksi['target_market']) +

TARGET MARKET

+ @foreach ($forminspeksi['target_market'] as $item) @endforeach - @endisset -
@@ -439,11 +436,11 @@
-

KERJASAMA DENGAN BANK LAIN

- - @isset($forminspeksi['kerjasama_dengan_bank']) +
+ @endisset + @isset($forminspeksi['kerjasama_dengan_bank']) +

KERJASAMA DENGAN BANK LAIN

+ @foreach ($forminspeksi['kerjasama_dengan_bank'] as $item) @endforeach - @endisset -
@@ -451,59 +448,61 @@
-

RUTE MENUJU LOKASI

- - - - - - -
- {{ $forminspeksi['rute_menuju_lokasi'] ?? '' }} -
-

ATURAN TATA KOTA

- - @php - $informasi = [ - 'peruntukan', - 'kdb', - 'kdh', - 'gsb', - 'max_lantai', - 'klb', - 'gss', - 'pelebaran_jalan', - 'nama_petugas', - ]; - @endphp - - @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) - @foreach ($informasi as $key) - @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') -

- {{ ucfirst(str_replace('_', ' ', $key)) }}: - {{ $forminspeksi['fakta'][$key] }}

- @endif - @endforeach - @endif -
- -

CATATAN LAINNYA

- - @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan) +
+ @endisset + @isset($forminspeksi['rute_menuju_lokasi']) +

RUTE MENUJU LOKASI

+ - @endforeach + +
-

{!! nl2br(e($keterangan)) !!}

+ {{ $forminspeksi['rute_menuju_lokasi'] ?? '' }}
+ @endisset + @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) +

ATURAN TATA KOTA

+ + @php + $informasi = [ + 'peruntukan', + 'kdb', + 'kdh', + 'gsb', + 'max_lantai', + 'klb', + 'gss', + 'pelebaran_jalan', + 'nama_petugas', + ]; + @endphp + + @if (isset($forminspeksi['fakta']) && is_array($forminspeksi['fakta'])) + @foreach ($informasi as $key) + @if (isset($forminspeksi['fakta'][$key]) && $forminspeksi['fakta'][$key] !== '-') +

- {{ ucfirst(str_replace('_', ' ', $key)) }}: + {{ $forminspeksi['fakta'][$key] }}

+ @endif + @endforeach + @endif +
+ @endif + + @isset($forminspeksi['fakta']['keterangan']) - - - - +

CATATAN LAINNYA

+ + @foreach ($forminspeksi['fakta']['keterangan'] ?? [] as $keterangan) + + + + @endforeach +
+

{!! nl2br(e($keterangan)) !!}

+
+ @endisset

Demikian kami sampaikan, atas perhatiannya kami ucapkan terima kasih.