perbaikan upload foto dan print out rap, standard dan resume
This commit is contained in:
@@ -277,7 +277,7 @@ class SurveyorController extends Controller
|
||||
|
||||
if ($request->hasFile('foto_denah') && isset($request->file('foto_denah')[$index])) {
|
||||
$file = $request->file('foto_denah')[$index];
|
||||
$denahItem['foto_denah'] = $this->uploadFile($file, $request->nomor_registrasi);
|
||||
$denahItem['foto_denah'] = $this->uploadFile($file, 'foto_denah');
|
||||
} elseif (isset($existingDenahs[$index]['foto_denah'])) {
|
||||
$denahItem['foto_denah'] = $existingDenahs[$index]['foto_denah'];
|
||||
}
|
||||
@@ -382,7 +382,7 @@ class SurveyorController extends Controller
|
||||
}
|
||||
|
||||
// Upload dan simpan file baru
|
||||
$formatFotojson[$file] = $this->uploadFile($request->file($file), $request->nomor_registrasi);
|
||||
$formatFotojson[$file] = $this->uploadFile($request->file($file), $file);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -455,7 +455,7 @@ class SurveyorController extends Controller
|
||||
|
||||
// Simpan file dengan nama asli
|
||||
$path = $file->storeAs(
|
||||
'surveyor/' . $request->nomor_registrasi . '/foto_lantai_unit',
|
||||
'surveyor/lantai_unit',
|
||||
$uniqueFileName . '/' . time() . '_' . $file->getClientOriginalName(),
|
||||
'public'
|
||||
);
|
||||
@@ -493,12 +493,13 @@ class SurveyorController extends Controller
|
||||
|
||||
foreach ($files as $index => $file) {
|
||||
|
||||
$fileExtension = $file->extension();
|
||||
$originalName = time() . '_' . $request->nomor_registrasi . '.' . $fileExtension;
|
||||
$timestamp = time();
|
||||
$originalName = $file->getClientOriginalName();
|
||||
$uniqueFileName = "{$timestamp}_{$originalName}";
|
||||
|
||||
|
||||
// Simpan file
|
||||
$path = $file->storeAs("surveyor/{$request->nomor_registrasi}", $originalName, 'public');
|
||||
$path = $file->storeAs("surveyor/{$paramName}", $uniqueFileName, 'public');
|
||||
|
||||
$fotoData = [
|
||||
'path' => $path,
|
||||
@@ -656,7 +657,7 @@ class SurveyorController extends Controller
|
||||
// Buat entri baru untuk file yang diunggah
|
||||
$newPhotoEntry = [
|
||||
$nameField => $newNames[$key],
|
||||
$photoField => $this->uploadFile($file, $request->nomor_registrasi),
|
||||
$photoField => $this->uploadFile($file, $photoField . '.' . $key),
|
||||
$descriptionField => $newDescriptions[$key] ?? '',
|
||||
];
|
||||
|
||||
@@ -780,7 +781,7 @@ class SurveyorController extends Controller
|
||||
// Create new photo entry
|
||||
$newPhotoEntry = [
|
||||
$nameField => $newNames[$key] ?? '', // Use new name if provided
|
||||
$photoField => $this->uploadFile($file, $request->nomor_registrasi)
|
||||
$photoField => $this->uploadFile($file, $photoField . '.' . $key)
|
||||
];
|
||||
|
||||
// Add description if field exists
|
||||
@@ -2620,9 +2621,8 @@ class SurveyorController extends Controller
|
||||
if ($request->hasFile($fileKey)) {
|
||||
$file = $request->file($fileKey);
|
||||
if ($file->isValid()) {
|
||||
$fileExtension = $file->extension();
|
||||
$fileName = time() . '_' . $request->nomor_registrasi . '.' . $fileExtension;
|
||||
$path = $file->storeAs("public/surveyor/{$request->nomor_registrasi}", $fileName);
|
||||
$fileName = time() . '_' . $file->getClientOriginalName();
|
||||
$path = $file->storeAs("public/surveyor/{$request->type}", $fileName);
|
||||
|
||||
if ($path === false) {
|
||||
throw new Exception("Failed to store file for {$fileKey}");
|
||||
@@ -3097,8 +3097,7 @@ class SurveyorController extends Controller
|
||||
throw new Exception("Invalid file upload for {$type}");
|
||||
}
|
||||
|
||||
$fileExtension = $file->extension();
|
||||
$fileName = time() . '_' . $type . '.' . $fileExtension;
|
||||
$fileName = time() . '_' . $file->getClientOriginalName();
|
||||
$path = $file->storeAs("public/surveyor/{$type}", $fileName);
|
||||
|
||||
if ($path === false) {
|
||||
|
||||
Reference in New Issue
Block a user