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

perbaikan foto objek jaminan ketika di update tidak hilang

Browse Source
This commit is contained in:
majid
2024-12-20 16:25:54 +07:00
parent 145b677dbc
commit 01408bbac3
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,15 +305,19 @@ class SurveyorController extends Controller
$formatFotojson = $existingData; $formatFotojson = $existingData;
// Process each photo category
foreach ($photoCategories as $category => $fields) { foreach ($photoCategories as $category => $fields) {
// Only update if new files are provided $photoField = $fields[0];
if ($this->categoryHasNewFiles($request, $fields)) { $nameField = $fields[1];
// Delete old files for this category only $descriptionField = $fields[2] ?? null;
if (isset($existingData[$category])) {
$this->deleteFilesForCategory($existingData[$category]); if ($request->hasFile($photoField)) {
} $newPhotos = $this->processPhotoCategory(
$formatFotojson[$category] = $this->processPhotoCategory($request, $fields); $request,
$fields,
$existingData[$category] ?? []
);
$formatFotojson[$category] = $newPhotos;
} }
} }
@@ -342,29 +346,40 @@ class SurveyorController extends Controller
/** /**
* Process a photo category and its subcategories * Process a photo category and its subcategories
*/ */
private function processPhotoCategory(Request $request, array $fields, array $existingPhotos = [])
private function processPhotoCategory(Request $request, array $fields)
{ {
$result = []; $result = $existingPhotos; // Start with existing photos
$photoField = $fields[0]; $photoField = $fields[0];
$nameField = $fields[1];
$descriptionField = $fields[2] ?? null;
if ($request->hasFile($photoField)) { if ($request->hasFile($photoField)) {
foreach ($request->file($photoField, []) as $key => $value) { $newFiles = $request->file($photoField, []);
$item = []; $newNames = $request->input($nameField, []);
$item[$fields[1]] = $request->input($fields[1] . '.' . $key); $newDescriptions = $descriptionField ? $request->input($descriptionField, []) : [];
$item[$photoField] = $this->uploadFile($value, $photoField . '.' . $key);
if (isset($fields[2])) { // Process each new file
$item[$fields[2]] = $request->input($fields[2] . '.' . $key); 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; return $result;
} }
private function categoryHasNewFiles(Request $request, array $fields): bool private function categoryHasNewFiles(Request $request, array $fields): bool
{ {
$photoField = $fields[0]; // First element is usually the photo field $photoField = $fields[0]; // First element is usually the photo field