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

fix(surveyor): perbaikkan foto dan print out hasil inspeksi

Browse Source
This commit is contained in:
majid
2025-03-07 10:11:26 +07:00
committed by putrakuningan
parent cf6e008502
commit 796b6fab92
3 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,6 +236,7 @@ class SurveyorController extends Controller
'alat-berat' => 'getAlatBeratData', 'alat-berat' => 'getAlatBeratData',
'lingkungan' => 'getLingkunganData', 'lingkungan' => 'getLingkunganData',
'fakta' => 'getFactData', 'fakta' => 'getFactData',
'informasi' => 'getFactData',
'rap' => 'getRapData', 'rap' => 'getRapData',
]; ];
@@ -2668,7 +2669,8 @@ class SurveyorController extends Controller
'foto_bhumi', 'foto_bhumi',
'foto_argis_region', 'foto_argis_region',
'foto_tempat', 'foto_tempat',
'foto_sentuh_tanahku' 'foto_sentuh_tanahku',
'upload_gs'
]; ];
if ($inspeksi) { if ($inspeksi) {
@@ -3638,7 +3640,7 @@ class SurveyorController extends Controller
$namaDebiture = $permohonan->debiture->name . '-' . $permohonan->nomor_registrasi; $namaDebiture = $permohonan->debiture->name . '-' . $permohonan->nomor_registrasi;
$fileName = 'inspeksi-' . $namaDebiture . '-data.pdf'; $fileName = 'inspeksi-' . $namaDebiture . '-data.pdf';
return $pdf->download($fileName); return $pdf->stream($fileName);
} }
public function approveReschedule(Request $request, $id) public function approveReschedule(Request $request, $id)

83
resources/views/penilai/components/foto-jaminan.blade.php
View File

@@ -30,8 +30,9 @@
/* Image Styling */ /* Image Styling */
.photo-item img { .photo-item img {
width: 300px; width: auto;
height: 300px; height: 400px;
max-height: 400px;
object-fit: contain; object-fit: contain;
background-color: #f0f0f0; background-color: #f0f0f0;
border-radius: 5px; border-radius: 5px;
@@ -46,24 +47,27 @@
/* Media Print */ /* Media Print */
@media print { @media print {
table { table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
td {
vertical-align: top; td {
text-align: center; vertical-align: top;
page-break-inside: avoid; text-align: center;
} page-break-inside: avoid;
.photo-image { }
width: auto;
height: 400px; .photo-image {
max-height: 400px; width: auto;
} height: 400px;
.page-break { max-height: 400px;
page-break-after: always; }
}
} .page-break {
page-break-after: always;
}
}
</style> </style>
@isset($basicData['foto']) @isset($basicData['foto'])
@@ -81,8 +85,6 @@
@if ($groupedPhotos->isEmpty()) @if ($groupedPhotos->isEmpty())
<p class="text-gray-500">Tidak ada foto yang tersedia.</p> <p class="text-gray-500">Tidak ada foto yang tersedia.</p>
@else @else
@foreach ($mainPhotos as $category => $photos) @foreach ($mainPhotos as $category => $photos)
@php @php
$groupedBySubcategory = $photos->groupBy('sub'); $groupedBySubcategory = $photos->groupBy('sub');
@@ -91,12 +93,13 @@
@foreach ($groupedBySubcategory as $subcategory => $subPhotos) @foreach ($groupedBySubcategory as $subcategory => $subPhotos)
@if (count($subPhotos) > 0) @if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos) @foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px"> <table width="100%" border="0"
@foreach ($chunkedPhotos as $item) style="align-content: center; text-align: center; margin-bottom: 20px">
@php @foreach ($chunkedPhotos as $item)
$imagePath = storage_path('app/public/' . $item['path']); @php
@endphp $imagePath = storage_path('app/public/' . $item['path']);
<tr> @endphp
<tr>
<td style="width: 100%; padding: 10px;" class="photo-item border"> <td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">{{ $category }} - <p style="font-weight: medium; font-size: 10px">{{ $category }} -
@isset($subcategory) @isset($subcategory)
@@ -114,10 +117,10 @@
@endisset @endisset
</td> </td>
</tr> </tr>
@endforeach @endforeach
@if (count($chunkedPhotos) < 2) @if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr> <tr style="width: 100%;"></tr>
@endif @endif
</table> </table>
<div class="page-break"></div> <div class="page-break"></div>
@endforeach @endforeach
@@ -129,12 +132,13 @@
@foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos) @foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
@if (count($subPhotos) > 0) @if (count($subPhotos) > 0)
@foreach ($subPhotos->chunk(2) as $chunkedPhotos) @foreach ($subPhotos->chunk(2) as $chunkedPhotos)
<table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px"> <table width="100%" border="0"
@foreach ($chunkedPhotos as $item) style="align-content: center; text-align: center; margin-bottom: 20px">
@php @foreach ($chunkedPhotos as $item)
$imagePath = storage_path('app/public/' . $item['path']); @php
@endphp $imagePath = storage_path('app/public/' . $item['path']);
<tr> @endphp
<tr>
<td style="width: 100%; padding: 10px;" class="photo-item border"> <td style="width: 100%; padding: 10px;" class="photo-item border">
<p style="font-weight: medium; font-size: 10px">Lainnya - <p style="font-weight: medium; font-size: 10px">Lainnya -
@isset($subcategory) @isset($subcategory)
@@ -151,7 +155,7 @@
<p style="font-size:9px">{{ $item['description'] }}</p> <p style="font-size:9px">{{ $item['description'] }}</p>
@endisset @endisset
</td> </td>
@endforeach @endforeach
</tr> </tr>
@if (count($chunkedPhotos) < 2) @if (count($chunkedPhotos) < 2)
<tr style="width: 100%;"></tr> <tr style="width: 100%;"></tr>
@@ -163,4 +167,3 @@
@endif @endif
@endif @endif
@endisset @endisset

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

@@ -365,7 +365,7 @@
<tr> <tr>
<td style="text-align: center; margin-top: 5px; "> <td style="text-align: center; margin-top: 5px; ">
<h2 style=" text-transform: uppercase; text-align: center; margin: 0;"> <h2 style=" text-transform: uppercase; text-align: center; margin: 0;">
Jaminan STATUS KEPEMILIKAN, HUBUNGAN DAN PENGHUNI
</h2> </h2>
</td> </td>
</tr> </tr>