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

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid76
2025-03-08 14:17:46 +07:00
parent e3f668fdc8 ad3dce4922
commit e546c5241d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/LaporanExternalController.php
View File

@@ -151,7 +151,7 @@ class LaporanExternalController extends Controller
$filteredRecords = $query->count(); $filteredRecords = $query->count();
// Get the data for the current page // Get the data for the current page
$data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp'])->get(); $data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp','permohonan.dokumenjaminan.jenisjaminan'])->get();
// Calculate the page count // Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size')); $pageCount = ceil($totalRecords / $request->get('size'));

1
resources/views/surveyor/components/header.blade.php
View File

@@ -189,6 +189,7 @@
@if (isset($basicData['jenisJaminan'])) @if (isset($basicData['jenisJaminan']))
@foreach ($basicData['jenisJaminan'] as $item) @foreach ($basicData['jenisJaminan'] as $item)
<option value="{{ $item->name }}" <option value="{{ $item->name }}"
{{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}>
{{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}> {{ old('jenis_asset_tidak_sesuai', $selectedValue) == $item->name ? 'selected' : '' }}>
{{ $item->name }} {{ $item->name }}
</option> </option>