From 3853b5d6eb2140188999bcf5c10be5486364a116 Mon Sep 17 00:00:00 2001 From: majid Date: Mon, 5 May 2025 10:13:09 +0700 Subject: [PATCH] fix: perbaikkan tampilan dan print out lpj setalah migrate db old ke db new --- app/Helpers/Lpj.php | 30 ++- app/Http/Controllers/ActivityController.php | 47 ++-- .../Controllers/DokumenJaminanController.php | 4 +- .../LaporanPenilaiJaminanController.php | 56 ++--- database/seeders/MasterDataSurveyorSeeder.php | 32 ++- .../seeders/MigrationPembandingSeeder.php | 10 +- .../views/activity/activitydetail.blade.php | 2 +- .../views/component/detail-jaminan.blade.php | 6 +- .../component/print-out-dokument.blade.php | 2 +- .../debitur/components/jaminan.blade.php | 2 +- .../laporan-penilai-jaminan/index.blade.php | 14 +- .../views/pemilik_jaminan/form.blade.php | 10 +- .../components/analisa/informasi.blade.php | 2 + .../components/analisa/lingkungan.blade.php | 19 +- .../views/penilai/components/header.blade.php | 10 +- .../components/print-out-sederhana.blade.php | 114 +++++---- .../components/print-out-standar.blade.php | 40 +-- .../components/print-pembanding.blade.php | 20 +- resources/views/penilai/show.blade.php | 4 +- .../views/penilaian/otorisator/show.blade.php | 4 +- resources/views/permohonan/index.blade.php | 4 +- .../surveyor/components/header.blade.php | 2 +- .../surveyor/components/inspeksi.blade.php | 236 +++++++++--------- .../components/print-out/fakta.blade.php | 20 +- .../components/print-out/footer.blade.php | 2 +- .../components/print-out/informasi.blade.php | 185 +++++++------- .../components/print-out/lingkungan.blade.php | 28 ++- .../components/print-out/main.blade.php | 24 +- 28 files changed, 525 insertions(+), 404 deletions(-) diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php index 569f067..b51161f 100644 --- a/app/Helpers/Lpj.php +++ b/app/Helpers/Lpj.php @@ -28,7 +28,7 @@ function formatTanggalIndonesia($date, $time = false) } catch (\Throwable $e) { return $date; } - + } @@ -562,3 +562,31 @@ function ubahNomorHp($nomorHp) { return "Nomor HP tidak valid"; } } + +function parsePembandingMigration($keterangan) { + + $keterangan = preg_replace('/[-]{5,}/', '',$keterangan); // Hapus ------ + $keterangan = preg_replace('/[.]{5,}/', '',$keterangan); // Hapus ..... + + $keterangan = preg_replace('/\s+/', ' ',$keterangan); + $keterangan = preg_replace('/\s*\n\s*/', "\n",$keterangan); + + // Pecah teks per baris untuk diproses + $lines = explode("\n",$keterangan); + $cleaned = []; + + foreach ($lines as $line) { + $line = trim($line); + if (!empty($line)) { + // Format angka dalam format Rp. 123.456.789 + $line = preg_replace_callback('/Rp\.\s*([\d.,]+)/', function($matches) { + $angka = str_replace(['.', ','], '', $matches[1]); + return 'Rp. ' . number_format((int)$angka, 0, ',', '.'); + }, $line); + + $cleaned[] = $line; + } + } + + return implode("\n", $cleaned); +} diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 8c04b89..34138c0 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -306,6 +306,7 @@ class ActivityController extends Controller $query = Permohonan::query(); // Apply search filter if provided + $query = $query->orderBy('nomor_registrasi', 'desc'); if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { @@ -324,7 +325,9 @@ class ActivityController extends Controller }); } - // Default sorting if no sort provided + + + // Apply sorting if provided if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { $order = $request->get('sortOrder'); $column = $request->get('sortField'); @@ -333,20 +336,13 @@ class ActivityController extends Controller $query->orderBy('nomor_registrasi', 'asc'); } - // Get total count of records before pagination + // Get the total count of records $totalRecords = $query->count(); - - // Pagination - if ($request->has('page') && $request->has('size')) { - $page = (int) $request->get('page', 1); - $size = (int) $request->get('size', 10); - $offset = ($page - 1) * $size; - $query->skip($offset)->take($size); + $size = $request->get('size', 10); + if ($size == 0) { + $size = 10; } - // Get filtered count - $filteredRecords = $query->count(); - // Filter by region if user is senior-officer if ($regionId) { $query->whereHas('region', function ($q) use ($regionId) { @@ -361,37 +357,36 @@ class ActivityController extends Controller }); } - $totalRecords = $query->count(); - // Pagination + + // Apply pagination if provided if ($request->has('page') && $request->has('size')) { - $page = (int) $request->get('page', 1); - $size = (int) $request->get('size', 10); - $offset = ($page - 1) * $size; + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + $query->skip($offset)->take($size); } - // Get filtered count + // Get the filtered count of records $filteredRecords = $query->count(); // Get data with necessary relationships $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get(); - // Calculate total pages - $pageCount = ceil($totalRecords / $request->get('size', 10)); + // Calculate the page count + $pageCount = ceil($totalRecords / $size); + // Calculate the current page number + $currentPage = max(1, $request->get('page', 1)); - - - // Calculate total pages - $pageCount = ceil($totalRecords / $request->get('size', 10)); - + // Return the response data as a JSON object return response()->json([ 'draw' => $request->get('draw'), 'recordsTotal' => $totalRecords, 'recordsFiltered' => $filteredRecords, 'pageCount' => $pageCount, - 'page' => $request->get('page', 1), + 'page' => $currentPage, 'totalCount' => $totalRecords, 'data' => $data, ]); diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index 44fbcc9..2bfc381 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -406,7 +406,9 @@ // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan - $legalitasJaminan = array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray()); + $legalitasJaminan = is_array($legalitasJaminan) + ? array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray()) + : []; $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get(); } diff --git a/app/Http/Controllers/LaporanPenilaiJaminanController.php b/app/Http/Controllers/LaporanPenilaiJaminanController.php index 1832dd1..6af0f1e 100644 --- a/app/Http/Controllers/LaporanPenilaiJaminanController.php +++ b/app/Http/Controllers/LaporanPenilaiJaminanController.php @@ -93,7 +93,7 @@ class LaporanPenilaiJaminanController extends Controller // dd($startDate); // Retrieve data from the database $query = Permohonan::query(); - + $query = $query->orderBy('nomor_registrasi', 'desc'); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); @@ -107,7 +107,7 @@ class LaporanPenilaiJaminanController extends Controller ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%') ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%'); - if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) { + if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) { $q->whereBetween('tanggal_permohonan', [$paramsSearch->tanggal_awal, $paramsSearch->tanggal_akhir]); } @@ -122,62 +122,50 @@ class LaporanPenilaiJaminanController extends Controller - // Default sorting if no sort provided + // Apply sorting if provided if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { $order = $request->get('sortOrder'); $column = $request->get('sortField'); $query->orderBy($column, $order); - } else { - $query->orderBy('nomor_registrasi', 'asc'); } - // Get total count of records before pagination - $totalRecords = $query->count(); - // Pagination + // Get the total count of records + $totalRecords = $query->count(); + $size = $request->get('size', 10); + if ($size == 0) { + $size = 10; + } + + // Apply pagination if provided if ($request->has('page') && $request->has('size')) { - $page = (int) $request->get('page', 1); - $size = (int) $request->get('size', 10); - $offset = ($page - 1) * $size; + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + $query->skip($offset)->take($size); } - // Get filtered count + // Get the filtered count of records $filteredRecords = $query->count(); - - $totalRecords = $query->count(); - - // Pagination - if ($request->has('page') && $request->has('size')) { - $page = (int) $request->get('page', 1); - $size = (int) $request->get('size', 10); - $offset = ($page - 1) * $size; - $query->skip($offset)->take($size); - } - - // Get filtered count - $filteredRecords = $query->count(); - // Get data with necessary relationships $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai'])->get(); - // Calculate total pages - $pageCount = ceil($totalRecords / $request->get('size', 10)); + // Calculate the page count + $pageCount = ceil($totalRecords / $size); + // Calculate the current page number + $currentPage = max(1, $request->get('page', 1)); - - - // Calculate total pages - $pageCount = ceil($totalRecords / $request->get('size', 10)); - + // Return the response data as a JSON object return response()->json([ 'draw' => $request->get('draw'), 'recordsTotal' => $totalRecords, 'recordsFiltered' => $filteredRecords, 'pageCount' => $pageCount, - 'page' => $request->get('page', 1), + 'page' => $currentPage, 'totalCount' => $totalRecords, 'data' => $data, ]); diff --git a/database/seeders/MasterDataSurveyorSeeder.php b/database/seeders/MasterDataSurveyorSeeder.php index 2552be0..c0cc080 100644 --- a/database/seeders/MasterDataSurveyorSeeder.php +++ b/database/seeders/MasterDataSurveyorSeeder.php @@ -12,10 +12,34 @@ class MasterDataSurveyorSeeder extends Seeder public function run(): void { - $nameTable =[ - 'faasilitas' - ] + $nameTable = [ + 'fasilitas_objek', + 'gol_mas_sekitar', + 'jenis_bangunan', + 'jenis_kapal', + 'jenis_kendaraan', + 'jenis_pesawat', + 'kondisi_bangunan', + 'kondisi_fisik_tanah', + 'kontur_tanah', + 'lalu_lintas_lokasi', + 'lantai', + 'merupakan_daerah', + 'perkerasan_jalan', + 'sifat_bangunan', + 'model_alat_berat', + 'posisi_kavling', + 'posisi_unit', + 'tingkat_keramaian', + 'sarana_pelengkap', + 'spek_kategori_bangunan', + 'spek_bangunan', + 'terletak_diarea', + 'view_unit' + ]; - DB::unprepared(file_get_contents(__DIR__ . '/sql/teams.sql')); + foreach ($nameTable as $table) { + DB::unprepared(file_get_contents(__DIR__ . '/sql/' . $table . '.sql')); + } } } diff --git a/database/seeders/MigrationPembandingSeeder.php b/database/seeders/MigrationPembandingSeeder.php index 89df7c7..690b51d 100644 --- a/database/seeders/MigrationPembandingSeeder.php +++ b/database/seeders/MigrationPembandingSeeder.php @@ -12,17 +12,17 @@ use Modules\Lpj\Models\Permohonan; class MigrationPembandingSeeder extends Seeder { - protected $errorLogFile = __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_error_2.csv'; + protected $errorLogFile = __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_error.csv'; /** * Run the database seeds. */ public function run() { // Path ke file csv - $filePath = realpath(__DIR__ . '/csv/inspeksi/mig_penilai_pembanding_2.csv'); + $filePath = realpath(__DIR__ . '/csv/inspeksi/mig_penilai_pembanding.csv'); if (!$filePath) { - Log::error('File csv tidak ditemukan: ' . __DIR__ . '/csv/inspeksi/mig_penilai_pembanding_2.csv'); + Log::error('File csv tidak ditemukan: ' . __DIR__ . '/csv/inspeksi/mig_penilai_pembanding.csv'); $this->command->error('File csv tidak ditemukan.'); return; } @@ -141,9 +141,10 @@ class MigrationPembandingSeeder extends Seeder // Pastikan kolom penting tersedia $urutan = (int)($row['mig_urutan'] ?? 999); $sumber = trim($row['mig_keterangan'] ?? ''); + $pembanding = trim($row['mig_pembanding'] ?? ''); $linkGambar = trim($row['mig_path'] ?? ''); - if (empty($sumber) || empty($linkGambar)) { + if (empty($pembanding) || empty($linkGambar)) { continue; } @@ -151,6 +152,7 @@ class MigrationPembandingSeeder extends Seeder $pembandingList[] = [ 'urutan' => $urutan, 'sumber' => $sumber, + 'keterangan' => $pembanding, 'foto_objek' => $linkGambar ]; } diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index 220c55f..f47b286 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -38,7 +38,7 @@ Pemohon: - {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }} diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index e42982d..3a68810 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -46,7 +46,7 @@ Pemohon: - {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + {{ $permohonan->user->nik ?? '' }} | {{ $permohonan->user->name ?? '' }} | {{ $permohonan->user->branch->name ?? '' }} @@ -84,7 +84,7 @@ Nilai Plafond: - {{ $permohonan->nilaiPlafond->name }} + {{ $permohonan->nilaiPlafond->name ?? '' }} @@ -293,7 +293,7 @@ - {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }} + {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] ?? '' }} diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php index 8cb86f0..1b7848a 100644 --- a/resources/views/component/print-out-dokument.blade.php +++ b/resources/views/component/print-out-dokument.blade.php @@ -17,7 +17,7 @@ @foreach ($value as $key => $item) @if (!empty($item)) - + {{ formatLabel($key) }} : diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index 9853fbf..c1985d6 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -95,7 +95,7 @@ @foreach($dokumen_jaminan as $index => $dokumen)
- {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] }} + {{ $loop->index+1 }}. Nomor : {{ $dokumen_nomor[$index] ?? '' }}
@if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo'])) diff --git a/resources/views/laporan-penilai-jaminan/index.blade.php b/resources/views/laporan-penilai-jaminan/index.blade.php index 7d29a7c..c378220 100644 --- a/resources/views/laporan-penilai-jaminan/index.blade.php +++ b/resources/views/laporan-penilai-jaminan/index.blade.php @@ -157,11 +157,7 @@ - - Jenis Jaminan - - - + Laporan @@ -265,13 +261,7 @@ `${data.tujuan_penilaian.name}` : '-'; }, }, - jenis_jaminan_id: { - title: 'Jenis Jaminan', - render: (item, data) => { - const jenisJaminan = data.dokumenjaminan.map(d => d.jenis_jaminan.name).join(', '); - return jenisJaminan || '-'; - } - }, + laporan: { title: 'Status', render: (item, data) => { diff --git a/resources/views/pemilik_jaminan/form.blade.php b/resources/views/pemilik_jaminan/form.blade.php index 12f9ffe..2ce0a27 100644 --- a/resources/views/pemilik_jaminan/form.blade.php +++ b/resources/views/pemilik_jaminan/form.blade.php @@ -37,7 +37,15 @@
-

{{ $debitur->name }} | {{ $debitur->address.', '.$debitur->village->name.', '.$debitur->city->name.', '.$debitur->province->name.', '.$debitur->postal_code }}

+

+ {{ $debitur->name ?? '' }} | {{ $debitur->address ?? '' }} + {{ $debitur->village?->name ?? '' }} + {{ $debitur->city?->name ?? '' }} + {{ $debitur->province?->name ?? '' }} + {{ $debitur->country?->name ?? '' }}, + {{ $debitur->postal_code ?? '' }} +

+
diff --git a/resources/views/penilai/components/analisa/informasi.blade.php b/resources/views/penilai/components/analisa/informasi.blade.php index bc711cf..ef95741 100644 --- a/resources/views/penilai/components/analisa/informasi.blade.php +++ b/resources/views/penilai/components/analisa/informasi.blade.php @@ -34,6 +34,7 @@ + @if (!empty($forminspeksi['fakta']['keterangan'])) Catatan yang Perlu @@ -56,6 +57,7 @@ @endif + @endif diff --git a/resources/views/penilai/components/analisa/lingkungan.blade.php b/resources/views/penilai/components/analisa/lingkungan.blade.php index cd37bdb..e2a2eef 100644 --- a/resources/views/penilai/components/analisa/lingkungan.blade.php +++ b/resources/views/penilai/components/analisa/lingkungan.blade.php @@ -35,41 +35,50 @@ : {{ $lingkungan['lebar_perkerasan_jalan'] ?? '-' }} m + {{-- mulai --}} Perkerasan Jalan : - {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ['-']) }} + {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }} Lalu Lintas : - {{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }} + {{ + $lingkungan['lalu_lintas'] + ? (is_array($lingkungan['lalu_lintas']) + ? implode(', ', $lingkungan['lalu_lintas']) + : $lingkungan['lalu_lintas']) + : '-' + }} Golongan Masyarakat Sekitar : - {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }} + {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }} Tingkat Keramaian : - {{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }} + {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }} Terletak di Area : - {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ['-']) }} + {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }} + + {{-- batas --}} Kondisi Bangunan Sekitar : diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php index bf37584..4bd01bf 100644 --- a/resources/views/penilai/components/header.blade.php +++ b/resources/views/penilai/components/header.blade.php @@ -84,7 +84,10 @@ position: relative; z-index: 1; } - + .break-before { + page-break-before: always; + break-before: page; + } .border { border: 1px solid #000; } @@ -93,10 +96,11 @@ page-break-inside: avoid; page-break-before: auto; page-break-after: auto; + } -@php +{{-- @php $data = ''; foreach ($permohonan->documents as $dokumen) { $data .= $dokumen->jenisJaminan->name . ', '; @@ -126,7 +130,7 @@ $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); $data = rtrim($data, ', '); -@endphp +@endphp --}} diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 3ebc2f9..656e7d8 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -11,7 +11,8 @@

LAPORAN PENILAIAN ATAS - {{ $data }}

+ {{ $data }} +

NO: {{ $nomorLaporan }}

@@ -35,13 +36,14 @@ Permintaan Cabang : - {{ $permohonan->debiture->branch->name ?? '' }} + + {{ $permohonan->debiture->branch->name ?? '' }} Permintaan (AO) : - {{ $permohonan->user->name }} + {{ $permohonan->user->name ?? '-' }} No Order @@ -597,35 +599,41 @@ : - {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ['-']) }} + {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }} - - Lalu Lintas - : - - {{ implode(', ', $lingkungan['lalu_lintas'] ?? ['-']) }} - - - Golongan Masyarakat Sekitar - : - - {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ['-']) }} - - - - Tingkat Keramaian - : - - {{ implode(', ', $lingkungan['tingkat_keramaian'] ?? ['-']) }} - - - + + + Lalu Lintas + : + {{ + $lingkungan['lalu_lintas'] + ? (is_array($lingkungan['lalu_lintas']) + ? implode(', ', $lingkungan['lalu_lintas']) + : $lingkungan['lalu_lintas']) + : '-' + }} + + + + Golongan Masyarakat Sekitar + : + {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }} + + + + Tingkat Keramaian + : + + {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }} + + + < Terletak di Area : - {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ['-']) }} + {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }} @@ -779,6 +787,10 @@
+ + @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0) + + b. Total Nilai Likuidasi @@ -796,6 +808,7 @@ {{ $lpjData['likuidasi_nilai_2'] ?? '' }} + @endif @@ -810,6 +823,7 @@ + @if (isset($forminspeksi['fakta']['fakta_positif']) && count($forminspeksi['fakta']['fakta_positif']) > 0) + @endif + @if (isset($forminspeksi['fakta']['fakta_negatif']) && count($forminspeksi['fakta']['fakta_negatif']) > 0) + @endif + @if (isset($forminspeksi['fakta']['batas_batas_input']) && count($forminspeksi['fakta']['batas_batas_input']) > 0) + @endif @@ -940,29 +959,32 @@
Faktor Positif @@ -824,6 +838,8 @@ @endisset
Faktor Negatif @@ -838,6 +854,8 @@ @endisset
Batas batas @@ -848,6 +866,7 @@ @endforeach
Informasi Dinas Tata Ruang
@php - use Modules\Usermanagement\Models\User; - $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path( - 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, - ); + use Modules\Usermanagement\Models\User; - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + // Penilai + $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null; + $imagePathPenilai = $penilaiUser && $penilaiUser->sign + ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign) + : null; - $imagePathEO = storage_path( - 'app/public/signatures/' . - User::role('EO Appraisal')->first()->id . - '/' . - User::role('EO Appraisal')->first()->sign, - ); + // Senior Officer + $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null; + $imagePathSo = $soUser && $soUser->sign + ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign) + : null; - $imagePathDD = storage_path( - 'app/public/signatures/' . - User::role('DD Appraisal')->first()->id . - '/' . - User::role('DD Appraisal')->first()->sign, - ); - @endphp + // Executive Officer + $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null; + $imagePathEO = $eoUser && $eoUser->sign + ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign) + : null; + + // Deputy Director + $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null; + $imagePathDD = $ddUser && $ddUser->sign + ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign) + : null; + @endphp + @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0) + @endif
@if (file_exists($imagePathPenilai)) diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 791fdf8..0e4172c 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -324,6 +324,7 @@
2. Total Nilai Likuidasi @@ -341,6 +342,7 @@ {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
@php @@ -375,27 +377,29 @@ @php use Modules\Usermanagement\Models\User; - $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first(); - $imagePathPenilai = storage_path( - 'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign, - ); + // Penilai + $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null; + $imagePathPenilai = $penilaiUser && $penilaiUser->sign + ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign) + : null; - $soUser = User::where('id', $senior_officer->id)->first(); - $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign); + // Senior Officer + $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null; + $imagePathSo = $soUser && $soUser->sign + ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign) + : null; - $imagePathEO = storage_path( - 'app/public/signatures/' . - User::role('EO Appraisal')->first()->id . - '/' . - User::role('EO Appraisal')->first()->sign, - ); + // Executive Officer + $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null; + $imagePathEO = $eoUser && $eoUser->sign + ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign) + : null; - $imagePathDD = storage_path( - 'app/public/signatures/' . - User::role('DD Appraisal')->first()->id . - '/' . - User::role('DD Appraisal')->first()->sign, - ); + // Deputy Director + $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null; + $imagePathDD = $ddUser && $ddUser->sign + ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign) + : null; @endphp diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php index 3458fbf..3457f2c 100644 --- a/resources/views/penilai/components/print-pembanding.blade.php +++ b/resources/views/penilai/components/print-pembanding.blade.php @@ -11,7 +11,8 @@ } } - $fields = [ + if ($inspeksi->is_mig != 1) { + $fields = [ 'jenis_aset' => 'Jenis properti', 'hak_properti' => 'Status Hak Tanah', 'address' => 'Alamat Lokasi', @@ -22,16 +23,28 @@ 'luas_bangunan' => 'Luas Bangunan', 'tanggal' => 'Tanggal Data', 'kordinat' => 'Titik Kordinat', - ]; + ]; + } + @endphp - @foreach ($exportData as $index => $data) + @foreach (array_slice($exportData, 0, 3) as $index => $data) + + @if ($inspeksi->is_mig == 1) + + + + + + @else @foreach ($fields as $key => $label) @@ -63,6 +76,7 @@ @endforeach + @endif
Pembanding {{ substr($index, -1) }}
Keterangan: + {{isset($data['keterangan']) ? parsePembandingMigration($data['keterangan']) : '' }} +
{{ $label }}
@endforeach diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 853834f..d0730bc 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -321,7 +321,7 @@ - @if($permohonan->jenisPenilaian->name=="Eksternal") + {{-- @if($permohonan->jenisPenilaian->name=="Eksternal") @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
@endif - @endif + @endif --}} @endif diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index cf027b1..bfc3038 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -216,7 +216,7 @@ @endif - @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan') + @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2, 3, 4]) && $permohonan->status === 'proses-paparan') @endif - @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan') + @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [2, 4]) &&$permohonan->status === 'proses-paparan')