Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2025-03-11 11:51:50 +07:00
9 changed files with 320 additions and 276 deletions

View File

@@ -98,7 +98,6 @@
@include('lpj::component.print-out-dokument')
<tr>
<td style="width: 20%; padding: 2px;">Atas Nama</td>
<td style="width: 1%; padding: 2px;">:</td>
@@ -106,31 +105,25 @@
</tr>
@if (!empty($memo['lokasi']['address']))
<tr>
<td width="20%">Terletak di</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['address'] ?? '' }}</td>
</tr>
<tr>
<td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kecamatan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['district_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td>
</tr>
<tr>
<td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td>
</tr>
@php
$alamatFields = [
'Terletak di' => 'address',
'Desa/Kelurahan' => 'village_code',
'Kecamatan' => 'district_code',
'Kabupaten/Kota' => 'city_code',
'Provinsi' => 'province_code'
];
@endphp
@foreach ($alamatFields as $label => $field)
@if (!empty($alamat[$field]))
<tr>
<td width="20%">{{ $label }}</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat[$field] }}</td>
</tr>
@endif
@endforeach
@endif
</table>

View File

@@ -323,11 +323,11 @@
</div>
</div>
@if($permohonan->jenisPenilaian->name=="External")
@if($permohonan->jenisPenilaian->name=="Eksternal")
@if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
<div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
<button class="dropdown-toggle btn btn-primary">
Laporan External
Laporan Eksternal
</button>
<div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]">
<div class="menu menu-default flex flex-col w-full">