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

🔧(penilai): Perbaiki total nilai & signature approval

Browse Source 
- Gabungkan header 'Total Nilai Pasar Wajar' dengan colspan=2
- Gunakan nilai likuidasi default 70% & data migrasi mig_mst_lpj_tot_nilai_likuidasi
- Tambah parameter laporan='sederhana' pada include signature-approval
- Perbaiki layout tabel di print-out-sederhana & print-out-standar
- Tambah parsing mig_permohonan dengan json_decode untuk data migrasi
- Sesuaikan width kolom agar tampilan lebih proporsional
- Hilangkan Carbon::createFromFormat & tambah kondisi laporan di signature-approval
- Tampilkan SENIOR OFFICER untuk laporan sederhana, EO untuk standar
This commit is contained in:
Daeng Deni Mardaeni
2025-10-28 13:40:11 +07:00
parent d6d0ed28b9
commit 73d0d238c0
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/penilai/components/print-out-sederhana.blade.php
View File

@@ -561,8 +561,7 @@
@endforeach
@endif
<tr>
<td style="padding: 3px; font-weight: bold; width:30%;">Total Nilai Pasar Wajar</td>
<td style="padding: 3px; text-align: right; font-weight: bold; width:30%"></td>
<td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="2">Total Nilai Pasar Wajar</td>
<td style="padding: 3px; text-align: left; font-weight: bold; width: 40%;">
<span style="padding-left: 20px; padding-right: 20px;">=</span>
<div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
@@ -578,7 +577,7 @@
</tr>
<tr>
<td style="padding: 3px; text-align: right; width:20%">
{{ $lpjData['likuidasi'] ?? '' }}%
{{ $lpjData['likuidasi'] ?? '70' }}%
</td>
<td style="padding: 3px; text-align: left; font-weight: bold; width:40%">
<span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar
@@ -586,7 +585,7 @@
</td>
<td style="padding: 3px; text-align: left; width:40%;">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
</td>
</tr>
</table>
@@ -636,7 +635,7 @@
maupun ekstern</td>
</tr>
<tr>
@include('lpj::penilai.components.signature-approval')
@include('lpj::penilai.components.signature-approval',['laporan' => 'sederhana'])
</tr>
</table>
</div>

13
resources/views/penilai/components/print-out-standar.blade.php
View File

@@ -9,6 +9,8 @@
$dokument = $dokumen;
}
$data = rtrim($data, ', ');
$permohonan_migrasi = json_decode($permohonan->mig_permohonan);
@endphp
<main class="content">
@php
@@ -375,8 +377,7 @@
@endforeach
@endif
<tr>
<td style="padding: 3px; font-weight: bold; width:10%;">Total Nilai Pasar Wajar</td>
<td style="padding: 3px; text-align: right; font-weight: bold; width:10%"></td>
<td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="2">Total Nilai Pasar Wajar</td>
<td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
<span style="padding-left: 20px; padding-right: 20px;">=</span>
<div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
@@ -386,7 +387,7 @@
</tr>
<!-- Total Nilai Likuidasi -->
@if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
@if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
<tr>
<td colspan="3" style="padding: 8px; text-align: left">
2. Total Nilai Likuidasi
@@ -394,14 +395,14 @@
</tr>
<tr>
<td style="padding: 3px; text-align: right; width:10%">
{{ $lpjData['likuidasi'] ?? '' }}%
{{ $lpjData['likuidasi'] ?? '70' }}%
</td>
<td style="padding: 3px; text-align: left; font-weight: bold; width:10%">
<td style="padding: 3px; text-align: left; font-weight: bold; width:20%">
<span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
</td>
<td style="padding: 3px; text-align: left; width:70%;">
<span style="padding-left:20px; padding-right: 20px"> = </span> Rp
{{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
</td>
</tr>
@endif

9
resources/views/penilai/components/signature-approval.blade.php
View File

@@ -1,7 +1,8 @@
<table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
@php
use Modules\Usermanagement\Models\User;
use Modules\Usermanagement\Models\User;
$laporan = $laporan ?? '';
$penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
$imagePathPenilai = $penilaiUser && $penilaiUser->sign
? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign)
@@ -111,7 +112,7 @@
</span>
</br>
<span>
{{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia(\Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : '' }}
{{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) : '' }}
</span>
</td>
@if($soUser->name==$eoUser->name)
@@ -119,7 +120,11 @@
<td style=" padding: 4px;">
{{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
<span>
@if($laporan=='sederhana')
<b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
@else
<b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
@endif
</span>
</br>
<span>