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

fix(surveyor/penilai): perbaikkan jadwal kunjungan dan print out memo

Browse Source
This commit is contained in:
majid
2025-03-17 14:54:43 +07:00
committed by putrakuningan
parent f2dda625f4
commit 65818ab063
6 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PenilaiController.php
View File

@@ -968,8 +968,8 @@ class PenilaiController extends Controller
] ]
); );
$existingPhotos = isset($memo->memo) ? json_decode($memo->memo)->foto : []; // $existingPhotos = isset($memo->memo) ? json_decode($memo->memo) : [];
dd($existingPhotos); // dd($existingPhotos);
// Simpan foto-foto // Simpan foto-foto
if ($request->hasFile('foto_0')) { if ($request->hasFile('foto_0')) {
$photoUrls = []; $photoUrls = [];
@@ -982,15 +982,15 @@ class PenilaiController extends Controller
$index++; $index++;
} }
$memoData['foto'] = array_merge($existingPhotos, $photoUrls); // $memoData['foto'] = array_merge($existingPhotos, $photoUrls);
}else{ // }else{
$memoData['foto'] = $existingPhotos; // $memoData['foto'] = $existingPhotos;
}
// Tambahkan URL foto ke data memo // Tambahkan URL foto ke data memo
$memoData['foto'] = $photoUrls; $memoData['foto'] = $photoUrls;
$memo->memo = json_encode($memoData); $memo->memo = json_encode($memoData);
$memo->save(); $memo->save();
}
return response()->json([ return response()->json([
'success' => true, 'success' => true,

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

@@ -47,14 +47,17 @@
]; ];
// 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) {
unset($fotoTypes[$key]); unset($fotoTypes[$key]);
array_unshift($fotoTypes, 'upload_gs'); array_unshift($fotoTypes, 'upload_gs');
} }
// Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
$validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) { // Filter fotoTypes untuk memastikan hanya yang memiliki imagePath valid
return isset($forminspeksi[$type]) && $validPhotoTypes = array_filter($fotoTypes, function ($type) use ($forminspeksi) {
file_exists(storage_path('app/public/' . $forminspeksi[$type])); // Check if value is a string (not an array) and file exists
}); return isset($forminspeksi[$type]) &&
is_string($forminspeksi[$type]) &&
file_exists(storage_path('app/public/' . $forminspeksi[$type]));
});
@endphp @endphp
<table width="100%" border="0"> <table width="100%" border="0">

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

@@ -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->updated_at)->format('d-m-Y') }} Tanggal: {{ \Carbon\Carbon::parse(date('Y-m-d'))->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->updated_at)->format('H:i') }} Waktu: {{ \Carbon\Carbon::parse(date('H:i:s'))->format('H:i:s') }}
</p> </p>
<p style="margin: 0; padding:0; font-size:10px;">User: {{ $penilaiUser->name }}</p> <p style="margin: 0; padding:0; font-size:10px;">User: {{ Auth::user()->name }}</p>
</td> </td>
</tr> </tr>
</table> </table>

4
resources/views/penilai/components/memo.blade.php
View File

@@ -184,9 +184,9 @@
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full"> <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label for="tanggal_survey" class="form-label max-w-56">Tanggal Survey</label> <label for="tanggal_survey" class="form-label max-w-56">Tanggal Survey</label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input type="date" id="tanggal_survey" name="tanggal_survey" <input type="date-time" id="tanggal_survey" name="tanggal_survey"
class="input w-full" placeholder="Masukkan Tanggal Survey" class="input w-full" placeholder="Masukkan Tanggal Survey"
value="{{ $memo->lokasi->tanggal_survey ?? old('tanggal_survey') }}"> value="{{ $permohonan->penilaian->updated_at ?? old('tanggal_survey') }}" @readonly(true)>
</div> </div>
</div> </div>

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

@@ -66,9 +66,9 @@
<table> <table>
<tr> <tr>
<td> <td>
Menindak lanjuti permintann penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang Menindak lanjuti permintan penilaian jaminan dari {{ $permohonan->user->name }} AO Cabang
{{ $permohonan->debiture->branch->name ?? '' }} {{ $permohonan->debiture->branch->name ?? '' }}
tanggal {{ formatTanggalIndonesia($memo['tanggal']) ?? '' }}, dapat di sampaikan sebagai berikut: tanggal {{ formatTanggalIndonesia($permohonan->created_at) ?? '' }}, dapat di sampaikan sebagai berikut:
</td> </td>
</tr> </tr>
</table> </table>
@@ -139,7 +139,7 @@
<td style="width: 25%; 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->updated_at) }}</td>
</tr> </tr>
<tr> <tr>
<td style="width: 25%; padding: 2px;">Surveyor</td> <td style="width: 25%; padding: 2px;">Surveyor</td>

3
resources/views/surveyor/index.blade.php
View File

@@ -613,8 +613,7 @@
</button> </button>
`; `;
} else { } else {
if (data.penilaian.waktu_penilaian == null || if (!data.penilaian.waktu_penilaian) {
(data.penilaian.waktu_penilaian && data.penilaian.authorized_status == null)) {
actionHtml += ` actionHtml += `
<a class="btn btn-sm btn-icon btn-clear btn-primary" <a class="btn btn-sm btn-icon btn-clear btn-primary"
onclick="prosesJadwalSurvey(${data.penilaian.id})" onclick="prosesJadwalSurvey(${data.penilaian.id})"