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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-12-20 16:32:53 +07:00
parent 46fad96f7a 01408bbac3
commit 15651f889b
2 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,15 +305,19 @@ class SurveyorController extends Controller
$formatFotojson = $existingData;
// Process each photo category
foreach ($photoCategories as $category => $fields) {
// Only update if new files are provided
if ($this->categoryHasNewFiles($request, $fields)) {
// Delete old files for this category only
if (isset($existingData[$category])) {
$this->deleteFilesForCategory($existingData[$category]);
}
$formatFotojson[$category] = $this->processPhotoCategory($request, $fields);
$photoField = $fields[0];
$nameField = $fields[1];
$descriptionField = $fields[2] ?? null;
if ($request->hasFile($photoField)) {
$newPhotos = $this->processPhotoCategory(
$request,
$fields,
$existingData[$category] ?? []
);
$formatFotojson[$category] = $newPhotos;
}
}
@@ -342,29 +346,40 @@ class SurveyorController extends Controller
/**
* Process a photo category and its subcategories
*/
private function processPhotoCategory(Request $request, array $fields)
private function processPhotoCategory(Request $request, array $fields, array $existingPhotos = [])
{
$result = [];
$result = $existingPhotos; // Start with existing photos
$photoField = $fields[0];
$nameField = $fields[1];
$descriptionField = $fields[2] ?? null;
if ($request->hasFile($photoField)) {
foreach ($request->file($photoField, []) as $key => $value) {
$item = [];
$item[$fields[1]] = $request->input($fields[1] . '.' . $key);
$item[$photoField] = $this->uploadFile($value, $photoField . '.' . $key);
$newFiles = $request->file($photoField, []);
$newNames = $request->input($nameField, []);
$newDescriptions = $descriptionField ? $request->input($descriptionField, []) : [];
if (isset($fields[2])) {
$item[$fields[2]] = $request->input($fields[2] . '.' . $key);
// Process each new file
foreach ($newFiles as $key => $file) {
// Create new photo entry
$newPhotoEntry = [
$nameField => $newNames[$key] ?? '', // Use new name if provided
$photoField => $this->uploadFile($file, $photoField . '.' . $key)
];
// Add description if field exists
if ($descriptionField) {
$newPhotoEntry[$descriptionField] = $newDescriptions[$key] ?? '';
}
$result[] = $item;
// Add to result
$result[] = $newPhotoEntry;
}
}
return $result;
}
private function categoryHasNewFiles(Request $request, array $fields): bool
{
$photoField = $fields[0]; // First element is usually the photo field
@@ -465,7 +480,9 @@ class SurveyorController extends Controller
{
try {
// Get all inspeksi records for this permohonan
$inspeksiRecords = Inspeksi::where('permohonan_id', $id)->get();
$inspeksiRecords = Inspeksi::with(['dokument.jenisJaminan'])
->where('permohonan_id', $id)
->get();
if ($inspeksiRecords->isEmpty()) {
return response()->json(['buttonDisable' => true]);
@@ -477,23 +494,20 @@ class SurveyorController extends Controller
$denahForm = json_decode($inspeksi->denah_form, true);
$dataPembanding = json_decode($inspeksi->data_pembanding, true);
// Get jenis jaminan to check if it needs denah
$jenisJaminan = JenisJaminan::find($inspeksi->dokument_id);
$jenisJaminan = $inspeksi->dokument->jenisJaminan->name ?? '';
$isTanahBangunan = !in_array(
strtoupper($jenisJaminan->name ?? ''),
['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT']
);
// Check if required forms are empty or incomplete
if (empty($dataForm) || empty($fotoForm)) {
return response()->json(['buttonDisable' => true]);
}
$isInvalid =
empty($dataForm) ||
empty($fotoForm) ||
(($isTanahBangunan && empty($denahForm)) ||
empty($dataPembanding));
if ($isTanahBangunan && empty($denahForm)) {
return response()->json(['buttonDisable' => true]);
}
if (empty($dataPembanding)) {
if ($isInvalid) {
return response()->json(['buttonDisable' => true]);
}
}