daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(penilai/surveyor): perbaikkan print out laporan judul di tengah dan tanggal submit surveyor/penilai

Browse Source
This commit is contained in:
majid
2025-03-12 01:27:05 +07:00
committed by putrakuningan
parent 72f7a13897
commit 01de1b5b5e
6 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/SurveyorController.php
View File

@@ -766,9 +766,15 @@ class SurveyorController extends Controller
$permohonan->update([ $permohonan->update([
'status' => 'survey-completed', 'status' => 'survey-completed',
'submitted_at' => now()
]); ]);
$penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
$penilaian->update([
'status' => 'survey-completed',
]);
if($permohonan->jenisPenilaian->name=="External") { if($permohonan->jenisPenilaian->name=="External") {
LaporanExternal::updateOrCreate( LaporanExternal::updateOrCreate(
['permohonan_id' => $permohonan->id], ['permohonan_id' => $permohonan->id],

2
resources/views/penilai/components/footer.blade.php
View File

@@ -43,7 +43,7 @@
'foto_gistaru' => 'Gistaru', 'foto_gistaru' => 'Gistaru',
'foto_bhumi' => 'Bhumi', 'foto_bhumi' => 'Bhumi',
'foto_argis_region' => 'Blad Tata Ruang ', 'foto_argis_region' => 'Blad Tata Ruang ',
'foto_tempat' => 'Tempat', 'foto_tempat' => 'Peta Lokasi',
]; ];
// Memindahkan foto_tempat ke depan jika ada // Memindahkan foto_tempat ke depan jika ada
if (($key = array_search('upload_gs', $fotoTypes)) !== false) { if (($key = array_search('upload_gs', $fotoTypes)) !== false) {

8
resources/views/penilai/components/header.blade.php
View File

@@ -123,7 +123,7 @@
} }
} }
use Modules\Usermanagement\Models\User; use Modules\Usermanagement\Models\User;
$surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first(); $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
$data = rtrim($data, ', '); $data = rtrim($data, ', ');
@endphp @endphp
@@ -138,12 +138,12 @@
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
<p style="margin: 0; padding:0; font-size:10px;"> <p style="margin: 0; padding:0; font-size:10px;">
Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
</p> </p>
<p style="margin: 0; padding:0; font-size:10px;"> <p style="margin: 0; padding:0; font-size:10px;">
Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
</p> </p>
<p style="margin: 0; padding:0; font-size:10px;">User: {{ $surveyorUser->name }}</p> <p style="margin: 0; padding:0; font-size:10px;">User: {{ $penilaiUser->name }}</p>
</td> </td>
</tr> </tr>
</table> </table>

31
resources/views/penilai/components/print-memo.blade.php
View File

@@ -35,32 +35,29 @@
<td style="text-align: center; margin-top: 5px;"> <td style="text-align: center; margin-top: 5px;">
<h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;"> <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
MEMO ANTAR KANTOR</h2> MEMO ANTAR KANTOR</h2>
<p style="font-size: 12px; margin: 0;">NO: {{ $nomorLaporan ?? '' }}</p>
</td> </td>
</tr> </tr>
</table> </table>
<hr/>
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Kepada</td> <td style="width: 25%; padding: 2px;">Kepada</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $memo['kepada'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $memo['kepada'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Dari</td> <td style="width: 25%; padding: 2px;">Dari</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $memo['dari'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $memo['dari'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">No memo</td> <td style="width: 25%; padding: 2px;">Tanggal</td>
<td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
</tr>
<tr>
<td style="width: 20%; padding: 2px;">Tanggal</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ formatTanggalIndonesia($memo['tanggal']) }}</td> <td style="width: 79%; padding: 2px;">{{ formatTanggalIndonesia($memo['tanggal']) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Perihal</td> <td style="width: 25%; padding: 2px;">Perihal</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $memo['perihal'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $memo['perihal'] ?? '' }}</td>
</tr> </tr>
@@ -86,12 +83,12 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Nama Calon Debitur</td> <td style="width: 25%; padding: 2px;">Nama Calon Debitur</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Jenis Aset</td> <td style="width: 25%; padding: 2px;">Jenis Aset</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $data ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $data ?? '' }}</td>
</tr> </tr>
@@ -99,7 +96,7 @@
@include('lpj::component.print-out-dokument') @include('lpj::component.print-out-dokument')
<tr> <tr>
<td style="width: 20%; padding: 2px;">Atas Nama</td> <td style="width: 25%; padding: 2px;">Atas Nama</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>
@@ -118,7 +115,7 @@
@foreach ($alamatFields as $label => $field) @foreach ($alamatFields as $label => $field)
@if (!empty($alamat[$field])) @if (!empty($alamat[$field]))
<tr> <tr>
<td width="20%">{{ $label }}</td> <td width="25%">{{ $label }}</td>
<td style="width: 1%; vertical-align: top;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat[$field] }}</td> <td>{{ $alamat[$field] }}</td>
</tr> </tr>
@@ -139,25 +136,25 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Tanggal Kunjungan</td> <td style="width: 25%; padding: 2px;">Tanggal Kunjungan</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;"> <td style="width: 79%; padding: 2px;">
{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td> {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Surveyor</td> <td style="width: 25%; padding: 2px;">Surveyor</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $surveyor->userPenilaiTeam->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Pihak Pemohon</td> <td style="width: 25%; padding: 2px;">Pihak Pemohon</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->user->name ?? '' }} - <td style="width: 79%; padding: 2px;">{{ $permohonan->user->name ?? '' }} -
{{ $permohonan->debiture->branch->name ?? '' }}</td> {{ $permohonan->debiture->branch->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Pihak Cadeb/Debitur</td> <td style="width: 25%; padding: 2px;">Pihak Cadeb/Debitur</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>

33
resources/views/penilai/components/print-out-call-report.blade.php
View File

@@ -39,25 +39,26 @@
</td> </td>
</tr> </tr>
</table> </table>
<hr />
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Kepada</td> <td style="width: 25%; padding: 2px;">Kepada</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['kepada'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $report['kepada'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Dari</td> <td style="width: 25%; padding: 2px;">Dari</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['dari'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $report['dari'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Tanggal</td> <td style="width: 25%; padding: 2px;">Tanggal</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ formatTanggalIndonesia($report['tanggal']) }}</td> <td style="width: 79%; padding: 2px;">{{ formatTanggalIndonesia($report['tanggal']) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Perihal</td> <td style="width: 25%; padding: 2px;">Perihal</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['perihal'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $report['perihal'] ?? '' }}</td>
</tr> </tr>
@@ -75,24 +76,24 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Nama Debitur</td> <td style="width: 25%; padding: 2px;">Nama Debitur</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">KJPP</td> <td style="width: 25%; padding: 2px;">KJPP</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}</td> <td style="width: 79%; padding: 2px;">{{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Jenis Aset</td> <td style="width: 25%; padding: 2px;">Jenis Aset</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $data ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $data ?? '' }}</td>
</tr> </tr>
@if (!empty($report['lokasi']['address'])) @if (!empty($report['lokasi']['address']))
<tr> <tr>
<td style="width: 20%; padding: 2px;">Lokasi Objek Penilaian</td> <td style="width: 25%; padding: 2px;">Lokasi Objek Penilaian</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['lokasi']['address'] ?? '' }}, <td style="width: 79%; padding: 2px;">{{ $report['lokasi']['address'] ?? '' }},
{{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }}, {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }},
@@ -103,22 +104,22 @@
@include('lpj::component.print-out-dokument') @include('lpj::component.print-out-dokument')
<tr> <tr>
<td style="width: 20%; padding: 2px;">Tanggal Penilaian</td> <td style="width: 25%; padding: 2px;">Tanggal Penilaian</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}</td> <td style="width: 79%; padding: 2px;">{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Lelang ke</td> <td style="width: 25%; padding: 2px;">Lelang ke</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td> <td style="width: 25%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td> <td style="width: 79%; padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;"> <td style="width: 25%; padding: 2px;">
Nilai Likuidasi Nilai Likuidasi
{{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }} {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
</td> </td>
@@ -142,25 +143,25 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td style="width: 20%; padding: 2px;">Staf Subdit Appraisal </td> <td style="width: 25%; padding: 2px;">Staf Subdit Appraisal </td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;"> <td style="width: 79%; padding: 2px;">
{{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td> {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Pihak KJPP</td> <td style="width: 25%; padding: 2px;">Pihak KJPP</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Pihak BAGI Cab </td> <td style="width: 25%; padding: 2px;">Pihak BAGI Cab </td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->user->name ?? '' }} - <td style="width: 79%; padding: 2px;">{{ $permohonan->user->name ?? '' }} -
{{ $permohonan->debiture->branch->name ?? '' }}</td> {{ $permohonan->debiture->branch->name ?? '' }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 20%; padding: 2px;">Debitur/perwakilan debitur </td> <td style="width: 25%; padding: 2px;">Debitur/perwakilan debitur </td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
<td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td> <td style="width: 79%; padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
</tr> </tr>

4
resources/views/surveyor/components/print-out/main.blade.php
View File

@@ -203,10 +203,10 @@
<td style="text-align: right;"> <td style="text-align: right;">
<div style=""> <div style="">
<p style="margin: 0; padding:0; font-size:10px;"> <p style="margin: 0; padding:0; font-size:10px;">
Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }} Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
</p> </p>
<p style="margin: 0; padding:0; font-size:10px;"> <p style="margin: 0; padding:0; font-size:10px;">
Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }} Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
</p> </p>
<p style="margin: 0; padding:0; font-size:10px;">User: {{ $surveyorUser->name }}</p> <p style="margin: 0; padding:0; font-size:10px;">User: {{ $surveyorUser->name }}</p>
</div> </div>