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

Merge pull request 'feature/senior-officer' (#136) from feature/senior-officer into staging

Browse Source 
Reviewed-on: #136
This commit is contained in:
putrakuningan
2025-03-21 05:28:37 +01:00
parent bb052decae d5a4c019cb
commit fbd8805b84
5 changed files with 262 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -563,7 +563,7 @@ class PenilaiController extends Controller
if (!Auth::user()->hasRole('administrator')) {
$query->whereHas('penilaian.userPenilai', function ($q) {
$q
->where('role', ['surveyor','penilai'])
->whereIn('role', ['surveyor', 'penilai'])
->where('user_id', Auth::user()->id);
});
}
@@ -834,6 +834,15 @@ class PenilaiController extends Controller
}
// $cekLpj = $this->checkDataLpj($type, $statusLpj);
// if ($permohonan->status_bayar === 'sudah_bayar' && $cekLpj) {
// return response()->json([
// 'success' => false,
// 'message' => 'Harap mengisi LPJ terlebih dahulu',
// ]);
// }
$permohonan->update([
'status' => 'proses-laporan',
]);
@@ -853,14 +862,69 @@ class PenilaiController extends Controller
public function uploadTempPhoto(Request $request)
{
$validatedData = $request->validate([
'permohonan_id' => 'required|integer',
'dokument_id' => 'required|integer',
]);
$memo = Penilai::firstOrNew([
'permohonan_id' => $validatedData['permohonan_id'],
'dokument_id' => $validatedData['dokument_id'],
]);
$existingData = $memo->exists && $memo->memo ? json_decode($memo->memo, true) : [];
$existingData['foto'] = $existingData['foto'] ?? [];
if ($request->hasFile('file')) {
$file = $request->file('file');
$filename = time() . '_' . $file->getClientOriginalName();
$path = $file->storeAs('temp_photos', $filename, 'public');
return response()->json(['success' => true, 'id' => $path]);
$files = $request->file('file');
if (!is_array($files)) {
$files = [$files];
}
foreach ($files as $file) {
$filename = time() . '_' . $file->getClientOriginalName();
$path = $file->storeAs('temp_photos', $filename, 'public');
$existingData['foto'][] = $path;
}
// Simpan data memo
$memo->memo = json_encode($existingData);
$memo->save();
return response()->json(['success' => true, 'data' => $existingData]);
}
return response()->json(['success' => false], 400);
}
public function deleteTempPhoto(Request $request)
{
$validatedData = $request->validate([
'permohonan_id' => 'required|integer',
'dokument_id' => 'required|integer',
'path' => 'required|string',
]);
$memo = Penilai::firstOrNew([
'permohonan_id' => $validatedData['permohonan_id'],
'dokument_id' => $validatedData['dokument_id'],
]);
$fotoMemo = json_decode($memo->memo, true);
if (isset($fotoMemo['foto']) && is_array($fotoMemo['foto'])) {
$fotoMemo['foto'] = array_filter($fotoMemo['foto'], function ($photo) use ($validatedData) {
return basename($photo) !== basename($validatedData['path']);
});
$fotoMemo['foto'] = array_values($fotoMemo['foto']);
$memo->memo = json_encode($fotoMemo);
$memo->save();
return response()->json(['success' => true, 'message' => 'Foto berhasil dihapus']);
}
return response()->json(['success' => false], 400);
return response()->json(['success' => false, 'message' => 'Foto tidak ditemukan'], 400);
}
public function storeResume(Request $request)
@@ -955,42 +1019,20 @@ class PenilaiController extends Controller
'memo' => 'required',
]);
$memoData = json_decode($validatedData['memo'], true);
$newMemoData = json_decode($validatedData['memo'], true);
$memo = Penilai::updateOrCreate(
$memo = Penilai::firstOrNew(
[
'permohonan_id' => $validatedData['permohonan_id'],
'dokument_id' => $validatedData['document_id'],
],
[
'memo' => json_encode($memoData),
]
);
// $existingPhotos = isset($memo->memo) ? json_decode($memo->memo) : [];
// dd($existingPhotos);
// Simpan foto-foto
if ($request->hasFile('foto_0')) {
$photoUrls = [];
$index = 0;
while ($request->hasFile("foto_$index")) {
$file = $request->file("foto_$index");
$fileName = time() . '_' . $file->getClientOriginalName();
$filePath = $file->storeAs('public/memo_photos', $fileName);
$photoUrls[] = Storage::url($filePath);
$index++;
}
$existingMemoData = isset($memo->memo) ? json_decode($memo->memo, true) : [];
$mergedMemoData = array_merge($existingMemoData, $newMemoData);
// $memoData['foto'] = array_merge($existingPhotos, $photoUrls);
// }else{
// $memoData['foto'] = $existingPhotos;
// Tambahkan URL foto ke data memo
$memoData['foto'] = $photoUrls;
$memo->memo = json_encode($memoData);
$memo->memo = json_encode($mergedMemoData);
$memo->save();
}
return response()->json([
'success' => true,
@@ -1068,7 +1110,7 @@ class PenilaiController extends Controller
'message' => 'Berhasil menyimpan LPJ',
'data' => $result
], 200);
}catch (\Throwable $e) {
} catch (\Throwable $e) {
DB::rollBack();
return response()->json([
'success' => false,

16
app/Http/Controllers/PenilaianController.php
View File

@@ -194,6 +194,8 @@ class PenilaianController extends Controller
DB::beginTransaction();
$penilaian = Penilaian::where('nomor_registrasi', $request->nomor_registrasi)->first();
$surveyTeam = null;
$penilaiTeam = null;
$penilaianId = $penilaian->id;
$penilainTeam = PenilaianTeam::where('penilaian_id', $penilaianId)->get();
@@ -205,6 +207,7 @@ class PenilaianController extends Controller
'user_id' => $request->surveyor_id,
'role' => 'surveyor',
]);
$surveyTeam = $item->team_id;
}
if ($item->role === 'penilai' && $item->user_id === null) {
@@ -212,10 +215,21 @@ class PenilaianController extends Controller
'user_id' => $request->penilai_id,
'role' => 'penilai',
]);
}
if ($item->role === 'penilai' && $surveyTeam) {
$penilaiTeam = $item->team_id;
}
}
$permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi);
if ($surveyTeam && $penilaiTeam) {
$permohonan->update([
'region_id' => $penilaiTeam,
]);
}
$permohonan->update([
'status' => 'assign',
]);
@@ -515,7 +529,7 @@ class PenilaianController extends Controller
}
if ($status == 'done' && $permohonan->status_bayar === 'sudah_bayar' && $permohonan->penilai->type_penilai === 'standar' || $permohonan->penilai->type_penilai === 'sederhana') {
$_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
$_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find($permohonan->id);
if (isset($_permohonan->penilai->lpj)) {
$npw = json_decode($_permohonan->penilai->lpj, true);

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

@@ -186,7 +186,8 @@
<div class="flex flex-wrap items-baseline w-full">
<input type="date-time" id="tanggal_survey" name="tanggal_survey"
class="input w-full" placeholder="Masukkan Tanggal Survey"
value="{{ $permohonan->penilaian->updated_at ?? old('tanggal_survey') }}" @readonly(true)>
value="{{ $permohonan->penilaian->updated_at ?? old('tanggal_survey') }}"
@readonly(true)>
</div>
</div>
@@ -315,10 +316,11 @@
<div class="flex card-footer justify-end gap-5">
@if (Auth::user()->hasAnyRole(['senior-officer', 'surveyor', 'administrator']))
<a class="btn btn-primary" onclick="saveMemo()" {{ $permohonan->status == 'proses-paparan' || $permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor']) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i>
Simpan
</a>
<a class="btn btn-primary" onclick="saveMemo()"
{{ $permohonan->status == 'proses-paparan' || ($permohonan->status == 'proses-laporan' && Auth::user()->hasAnyRole(['surveyor'])) ? 'disabled' : '' }}>
<i class="ki-filled ki-save-2"></i>
Simpan
</a>
@endif
@if (Auth::user()->hasAnyRole(['administrator', 'senior-officer', 'EO Appraisal', 'DD Appraisal']))
<a class="btn btn-info"
@@ -347,11 +349,13 @@
document.addEventListener('DOMContentLoaded', function() {
myDropzone = new Dropzone("#dropzone-upload", {
url: "{{ route('penilai.uploadTempPhoto') }}", // Temporary upload route
url: "{{ route('penilai.uploadTempPhoto') }}?permohonan_id={{ $permohonan->id }}&dokument_id={{ request('documentId') }}", // Temporary upload route
paramName: "file",
maxFilesize: 5, // MB
acceptedFiles: "image/*",
addRemoveLinks: true,
uploadMultiple: false,
parallelUploads: 1,
autoProcessQueue: true,
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
@@ -370,132 +374,175 @@
const existingPhotosContainer = document.getElementById('existing-photos');
if (!existingPhotosContainer) return;
@if(isset($memo) && isset($memo->foto))
let existingPhotos;
try {
existingPhotos = @json($memo->foto);
} catch (e) {
console.error('Error parsing existing photos:', e);
return;
}
@if (isset($memo) && isset($memo->foto))
let existingPhotos;
try {
existingPhotos = @json($memo->foto);
} catch (e) {
console.error('Error parsing existing photos:', e);
return;
}
if (Array.isArray(existingPhotos)) {
existingPhotos.forEach(function(photoPath) {
if (typeof photoPath === 'string') {
const photoDiv = document.createElement('div');
photoDiv.className = 'col-md-3 mb-3';
if (Array.isArray(existingPhotos)) {
const BASE_URL = "{{ asset('storage/') }}";
existingPhotos.forEach(function(photoPath) {
if (typeof photoPath === 'string') {
const photoDiv = document.createElement('div');
photoDiv.className = 'col-md-3 mb-3';
const img = document.createElement('img');
img.src = photoPath;
img.className = 'img-fluid';
img.style.maxHeight = '150px';
const img = document.createElement('img');
img.src = BASE_URL + '/' + photoPath;
img.className = 'img-fluid';
img.style.maxHeight = '150px';
const deleteButton = document.createElement('button');
photoDiv.appendChild(img);
existingPhotosContainer.appendChild(photoDiv);
deleteButton.className = 'btn btn-danger btn-sm mt-2';
deleteButton.textContent = 'Hapus';
deleteButton.type = 'button';
deleteButton.onclick = function() {
handleDeletePhoto(photoPath, photoDiv);
};
if (myDropzone) {
let mockFile = { name: photoPath.split('/').pop(), size: 12345 };
myDropzone.emit("addedfile", mockFile);
myDropzone.emit("thumbnail", mockFile, photoPath);
myDropzone.emit("complete", mockFile);
mockFile.previewElement.classList.add("dz-success");
mockFile.previewElement.classList.add("dz-complete");
}
}
});
} else {
console.error('Existing photos is not an array:', existingPhotos);
}
@endif
}
photoDiv.appendChild(img);
photoDiv.appendChild(deleteButton);
existingPhotosContainer.appendChild(photoDiv);
function saveMemo() {
const form = document.getElementById('form-memo');
const formData = new FormData(form);
const jsonData = {
kepada: formData.get('kepada'),
dari: formData.get('dari'),
nomor_memo: formData.get('nomor_memo'),
tanggal: formData.get('tanggal'),
perihal: formData.get('perihal'),
jenis_asset_tidak_sesuai: formData.get('jenis_asset_tidak_sesuai'),
lokasi: {
lokasi: formData.get('lokasi') || '',
address: formData.get('address') || '',
province_code: formData.get('province_code') || '',
city_code: formData.get('city_code') || '',
district_code: formData.get('district_code') || '',
village_code: formData.get('village_code') || '',
tanggal_survey: formData.get('tanggal_survey') || '',
penilai: formData.get('penilai') || '',
},
terlampir: (formData.getAll('terlampir[]') || []),
hasil_survey: (formData.getAll('hasil_survey[]') || []),
kesimpulan_saran: (formData.getAll('kesimpulan_saran[]') || []),
};
showLoadingSwal('Mengirim data ke server...');
const urlParams = new URLSearchParams(window.location.search);
const permohonanId = urlParams.get('permohonanId');
const documentId = urlParams.get('documentId');
// Create a new FormData object to send both JSON and files
const sendFormData = new FormData();
sendFormData.append('permohonan_id', permohonanId);
sendFormData.append('document_id', documentId);
sendFormData.append('memo', JSON.stringify(jsonData));
// Append all files from Dropzone
myDropzone.getAcceptedFiles().forEach((file, index) => {
sendFormData.append(`foto_${index}`, file);
});
const requestUrl = `{{ route('penilai.storeMemoWithPhotos') }}`;
$.ajax({
url: requestUrl,
type: 'POST',
data: sendFormData,
processData: false,
contentType: false,
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
success: function(response) {
hideLoadingSwal();
if (response.success) {
Swal.fire({
title: 'Berhasil!',
text: response.message,
icon: 'success',
confirmButtonText: 'OK'
}).then((response) => {
if (response.isConfirmed) {
// window.location.reload();
if (myDropzone) {
let mockFile = {
name: photoPath.split('/').pop(),
size: 12345
};
myDropzone.emit("addedfile", mockFile);
myDropzone.emit("thumbnail", mockFile, photoPath);
myDropzone.emit("complete", mockFile);
mockFile.previewElement.classList.add("dz-success");
mockFile.previewElement.classList.add("dz-complete");
}
}
});
} else {
console.error('Existing photos is not an array:', existingPhotos);
}
@endif
}
function handleDeletePhoto(photoPath, photoDiv) {
const BASE_URL = "{{ asset('storage/') }}";
Swal.fire({
title: 'Hapus Foto?',
text: "Foto ini akan dihapus secara permanen!",
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Ya, hapus!'
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
url: "{{ route('penilai.deleteTempPhoto') }}",
method: 'DELETE',
data: {
path: photoPath,
permohonan_id: {{ $permohonan->id ?? 0 }},
dokument_id: '{{ request('documentId') ?? '' }}',
},
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
success: function() {
Swal.fire('Dihapus!', 'Foto berhasil dihapus.', 'success');
photoDiv.remove();
},
error: function() {
Swal.fire('Gagal!', 'Foto gagal dihapus.', 'error');
}
})
}
});
}
function saveMemo() {
const form = document.getElementById('form-memo');
const formData = new FormData(form);
const jsonData = {
kepada: formData.get('kepada'),
dari: formData.get('dari'),
nomor_memo: formData.get('nomor_memo'),
tanggal: formData.get('tanggal'),
perihal: formData.get('perihal'),
jenis_asset_tidak_sesuai: formData.get('jenis_asset_tidak_sesuai'),
lokasi: {
lokasi: formData.get('lokasi') || '',
address: formData.get('address') || '',
province_code: formData.get('province_code') || '',
city_code: formData.get('city_code') || '',
district_code: formData.get('district_code') || '',
village_code: formData.get('village_code') || '',
tanggal_survey: formData.get('tanggal_survey') || '',
penilai: formData.get('penilai') || '',
},
terlampir: (formData.getAll('terlampir[]') || []),
hasil_survey: (formData.getAll('hasil_survey[]') || []),
kesimpulan_saran: (formData.getAll('kesimpulan_saran[]') || []),
};
showLoadingSwal('Mengirim data ke server...');
const urlParams = new URLSearchParams(window.location.search);
const permohonanId = urlParams.get('permohonanId');
const documentId = urlParams.get('documentId');
// Create a new FormData object to send both JSON and files
const sendFormData = new FormData();
sendFormData.append('permohonan_id', permohonanId);
sendFormData.append('document_id', documentId);
sendFormData.append('memo', JSON.stringify(jsonData));
const requestUrl = `{{ route('penilai.storeMemoWithPhotos') }}`;
$.ajax({
url: requestUrl,
type: 'POST',
data: sendFormData,
processData: false,
contentType: false,
headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}'
},
success: function(response) {
hideLoadingSwal();
if (response.success) {
Swal.fire({
title: 'Berhasil!',
text: response.message,
icon: 'success',
confirmButtonText: 'OK'
}).then((response) => {
if (response.isConfirmed) {
window.location.reload();
}
});
} else {
Swal.fire({
title: 'Error!',
text: response.message || 'Terjadi kesalahan',
icon: 'error',
confirmButtonText: 'OK'
});
}
console.log(response);
},
error: function(xhr, status, error) {
hideLoadingSwal();
Swal.fire({
title: 'Error!',
text: response.message || 'Terjadi kesalahan',
text: 'Terjadi kesalahan saat mengirim data',
icon: 'error',
confirmButtonText: 'OK'
});
}
console.log(response);
},
error: function(xhr, status, error) {
hideLoadingSwal();
Swal.fire({
title: 'Error!',
text: 'Terjadi kesalahan saat mengirim data',
icon: 'error',
confirmButtonText: 'OK'
});
}
});
}
</script>
@endpush
});
}
</script>
@endpush

2
resources/views/penilai/index.blade.php
View File

@@ -237,7 +237,7 @@
if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data
.status === 'paparan' || data.status === 'proses-paparan' || data.status ===
'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data
.status === 'revisi-paparan' || data.status === 'unfreeze-sla') {
.status === 'revisi-paparan' || data.status === 'unfreeze-sla' || data.status === 'reject-freeze') {
return `
<div class="flex flex-nowrap justify-center gap-1.5">
<a class="btn btn-sm btn-icon btn-clear btn-info" href="penilai/${data.id}/show">

1
routes/web.php
View File

@@ -632,6 +632,7 @@ Route::middleware(['auth'])->group(function () {
Route::post('storeMemo', [PenilaiController::class, 'storeMemo'])->name('storeMemo');
Route::post('store-memo-with-photos', [PenilaiController::class, 'storeMemoWithPhotos'])->name('storeMemoWithPhotos');
Route::post('upload-temp-photo', [PenilaiController::class, 'uploadTempPhoto'])->name('uploadTempPhoto');
Route::delete('delete-temp-photo', [PenilaiController::class, 'deleteTempPhoto'])->name('deleteTempPhoto');
Route::post('storeRap', [PenilaiController::class, 'storeRap'])->name('storeRap');
Route::post('storeLpjSederhanadanStandard', [PenilaiController::class, 'storeLpjSederhanadanStandard'])->name('storeLpjSederhanadanStandard');