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

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-03-11 11:51:50 +07:00
parent 5a8b93b5f7 06e12225b2
commit 727c7a0dca
9 changed files with 320 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/Http/Controllers/DokumenJaminanController.php
View File

@@ -9,6 +9,7 @@
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Http\UploadedFile;
use Log; use Log;
use Modules\Location\Models\City; use Modules\Location\Models\City;
use Modules\Location\Models\District; use Modules\Location\Models\District;
@@ -249,7 +250,7 @@
'jenis_legalitas_jaminan_id' => $value, 'jenis_legalitas_jaminan_id' => $value,
'name' => $request->name[$key], 'name' => $request->name[$key],
'keterangan' => $request->keterangan[$key], 'keterangan' => $request->keterangan[$key],
'details' => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : '' 'details' => isset($request->custom_field[$key]) ? json_encode(array_values($request->custom_field[$key])) : ''
]; ];
$dokumenJaminan = []; $dokumenJaminan = [];
@@ -279,7 +280,6 @@
} }
// Setelah loop, periksa apakah ada dokumen yang dihapus // Setelah loop, periksa apakah ada dokumen yang dihapus
$existingDetail = $existingDetails->get($request->detail_dokumen_jaminan_id[$key] ?? null); $existingDetail = $existingDetails->get($request->detail_dokumen_jaminan_id[$key] ?? null);
@@ -287,32 +287,69 @@
$existingDokumen = json_decode($existingDetail->dokumen_jaminan, true) ?? []; $existingDokumen = json_decode($existingDetail->dokumen_jaminan, true) ?? [];
$existingNomor = json_decode($existingDetail->dokumen_nomor, true) ?? []; $existingNomor = json_decode($existingDetail->dokumen_nomor, true) ?? [];
$newDokumenJaminan = [];
$newDokumenNomor = [];
$allFilesDeleted = true;
// Jika jumlah dokumen berkurang, berarti ada yang dihapus foreach ($existingDokumen as $index => $existingFile) {
if (count($existingDokumen) > count($dokumenJaminan)) { if (isset($request->dokumen_jaminan[$key][$index])) {
$dokumenJaminan = $existingDokumen; $allFilesDeleted = false;
$dokumenNomor = $existingNomor; $file = $request->dokumen_jaminan[$key][$index];
foreach ($request->dokumen_jaminan[$key] as $index => $file) { if ($file instanceof \Illuminate\Http\UploadedFile) {
if ($file === null) { // File baru diupload
// Hapus dokumen yang tidak ada lagi $file_name = $file->getClientOriginalName();
unset($dokumenJaminan[$index]); $file->storeAs('public/jaminan/' . $debitur->id . '/' . $document->id . '/', $file_name);
unset($dokumenNomor[$index]); $newDokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
$newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
} elseif (is_string($file) && !empty($file)) { } elseif (is_string($file) && !empty($file)) {
// Update nomor dokumen untuk file yang tidak diubah // File tidak diubah
$dokumenNomor[$index] = $request->dokumen_nomor[$key][$index] ?? '-'; $newDokumenJaminan[] = $existingFile;
$newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? $existingNomor[$index];
}
} else {
// File dihapus, hapus dari storage jika ada
if (Storage::exists('public/' . $existingFile)) {
Storage::delete('public/' . $existingFile);
} }
} }
// Reset array keys }
$dokumenJaminan = array_values($dokumenJaminan);
$dokumenNomor = array_values($dokumenNomor); // Tambahkan file baru yang mungkin ditambahkan
foreach ($request->dokumen_jaminan[$key] ?? [] as $index => $file) {
if ($file instanceof UploadedFile) {
$allFilesDeleted = false;
$file_name = $file->getClientOriginalName();
$path = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
if (!in_array($path, $newDokumenJaminan)) {
$file->storeAs('public/' . dirname($path), $file_name);
$newDokumenJaminan[] = $path;
$newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
}
} elseif (is_string($file) && !empty($file) && !in_array($file, $newDokumenJaminan)) {
$allFilesDeleted = false;
$newDokumenJaminan[] = $file;
$newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
} }
} }
if ($allFilesDeleted) {
$dokumenJaminan = [];
$dokumenNomor = [];
} else {
$dokumenJaminan = $newDokumenJaminan;
$dokumenNomor = $newDokumenNomor;
}
}
if (!empty($dokumenJaminan)) { if (!empty($dokumenJaminan)) {
$detailData['dokumen_jaminan'] = json_encode($dokumenJaminan); $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
$detailData['dokumen_nomor'] = json_encode($dokumenNomor); $detailData['dokumen_nomor'] = json_encode($dokumenNomor);
} else if(empty($dokumenJaminan)){
$detailData['dokumen_jaminan'] = null;
$detailData['dokumen_nomor'] = null;
} }
if (isset($request->detail_dokumen_jaminan_id[$key])) { if (isset($request->detail_dokumen_jaminan_id[$key])) {

67
app/Http/Controllers/RegistrasiController.php
View File

@@ -9,12 +9,12 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Maatwebsite\Excel\Facades\Excel; use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\Debiture;
use Modules\Lpj\Models\DokumenJaminan;
use Modules\Lpj\Models\JenisPenilaian; use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Models\Penilai; use Modules\Lpj\Models\Penilai;
use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Regions; use Modules\Lpj\Models\Regions;
use Modules\Lpj\Models\DokumenJaminan;
use Modules\Lpj\Models\Debiture;
class RegistrasiController extends Controller class RegistrasiController extends Controller
{ {
@@ -98,7 +98,8 @@ class RegistrasiController extends Controller
return view('lpj::registrasi.edit', compact('id')); return view('lpj::registrasi.edit', compact('id'));
} }
public function setData(Request $request): JsonResponse public function setData(Request $request)
: JsonResponse
{ {
$data = []; $data = [];
$datas = []; $datas = [];
@@ -131,7 +132,34 @@ class RegistrasiController extends Controller
return response()->json($data); return response()->json($data);
} }
public function update(Request $request, $id): JsonResponse public function show($id)
{
$permohonan = Permohonan::find($id);
$debitur = Debiture::find($permohonan->debiture_id);
$documents = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
}
public function storeRevisi(Request $request, $id)
{
try {
$permohonan = Permohonan::find($id);
$permohonan->update([
'status' => 'registered'
]);
return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
} catch (Exception $e) {
return redirect()
->route('registrasi.index')
->with('error', 'Failed to create permohonan' . $e->getMessage());
}
}
public function update(Request $request, $id)
: JsonResponse
{ {
// init // init
$data = []; $data = [];
@@ -170,11 +198,16 @@ class RegistrasiController extends Controller
$modal->update($dataku); $modal->update($dataku);
if ($modal && $request->jenis_laporan) { if ($modal && $request->jenis_laporan) {
foreach ($modal->documents as $document) {
Penilai::updateOrCreate( Penilai::updateOrCreate(
['permohonan_id' => $id], [
'permohonan_id' => $id,
'dokument_id' => $document->id
],
['type' => $request->jenis_laporan] ['type' => $request->jenis_laporan]
); );
} }
}
// //
$data['status'] = 'success'; $data['status'] = 'success';
$data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully']; $data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
@@ -229,28 +262,4 @@ class RegistrasiController extends Controller
return $data; return $data;
} }
public function show($id)
{
$permohonan = Permohonan::find($id);
$debitur = Debiture::find($permohonan->debiture_id);
$documents = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
}
public function storeRevisi(Request $request, $id)
{
try {
$permohonan = Permohonan::find($id);
$permohonan->update([
'status' => 'registered'
]);
return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
} catch (Exception $e) {
return redirect()->route('registrasi.index')->with('error', 'Failed to create permohonan' . $e->getMessage());
}
}
} }

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

@@ -762,13 +762,14 @@ class SurveyorController extends Controller
} }
// If validation passes, update permohonan status // If validation passes, update permohonan status
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::with('jenisPenilaian')->findOrFail($id);
$permohonan->update([ $permohonan->update([
'status' => 'survey-completed', 'status' => 'survey-completed',
'submitted_at' => now() 'submitted_at' => now()
]); ]);
if($permohonan->jenisPenilaian->name=="External") {
LaporanExternal::updateOrCreate( LaporanExternal::updateOrCreate(
['permohonan_id' => $permohonan->id], ['permohonan_id' => $permohonan->id],
[ [
@@ -777,6 +778,7 @@ class SurveyorController extends Controller
'created_by' => Auth::id(), 'created_by' => Auth::id(),
] ]
); );
}
return response()->json([ return response()->json([

6
app/Models/LampiranDokumen.php
View File

@@ -27,10 +27,8 @@ class LampiranDokumen extends Base
{ {
$user = Auth::user(); $user = Auth::user();
if ($user && ($user->hasRole('penilai') || $user->hasRole('administrator'))) { if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin'])) {
$file = $fileData['file']; $file = $fileData['file'];
$keterangan = $fileData['keterangan'] ?? null;
$fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName(); $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName();
$filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public'); $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public');
@@ -38,7 +36,7 @@ class LampiranDokumen extends Base
'permohonan_id' => $fileData['permohonan_id'] ?? null, 'permohonan_id' => $fileData['permohonan_id'] ?? null,
'nama_file' => $fileName, 'nama_file' => $fileName,
'path_file' => $filePath, 'path_file' => $filePath,
'keterangan' => $keterangan, 'keterangan' => $fileData['keterangan'] ?? null,
]); ]);
} }

2
resources/views/component/detail-jaminan.blade.php
View File

@@ -390,7 +390,7 @@
@endforelse @endforelse
</div> </div>
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin'])) @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin','surveyor']))
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6"> <form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
@csrf @csrf
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}"> <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">

4
resources/views/component/print-out-dokument.blade.php
View File

@@ -22,10 +22,14 @@
</td> </td>
<td style="width:1%; padding: 2px; vertical-align: top;">:</td> <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
<td style="padding: 2px;"> <td style="padding: 2px;">
@if (strpos(strtolower($key), 'tanggal') !== false)
{{ formatTanggalIndonesia($item) }}
@else
{{ $item }} {{ $item }}
@if ($key == 'luas_bangunan' || $key == 'luas_tanah') @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
<sup>m2</sup> <sup>m2</sup>
@endif @endif
@endif
</td> </td>
</tr> </tr>
@endif @endif

1
resources/views/debitur/components/dokumen.blade.php
View File

@@ -308,6 +308,7 @@
</a> </a>
</span> </span>
<button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button> <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
</div> </div>
@if($detail->details) @if($detail->details)

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

@@ -98,7 +98,6 @@
@include('lpj::component.print-out-dokument') @include('lpj::component.print-out-dokument')
<tr> <tr>
<td style="width: 20%; padding: 2px;">Atas Nama</td> <td style="width: 20%; padding: 2px;">Atas Nama</td>
<td style="width: 1%; padding: 2px;">:</td> <td style="width: 1%; padding: 2px;">:</td>
@@ -106,32 +105,26 @@
</tr> </tr>
@if (!empty($memo['lokasi']['address'])) @if (!empty($memo['lokasi']['address']))
@php
$alamatFields = [
'Terletak di' => 'address',
'Desa/Kelurahan' => 'village_code',
'Kecamatan' => 'district_code',
'Kabupaten/Kota' => 'city_code',
'Provinsi' => 'province_code'
];
@endphp
@foreach ($alamatFields as $label => $field)
@if (!empty($alamat[$field]))
<tr> <tr>
<td width="20%">Terletak di</td> <td width="20%">{{ $label }}</td>
<td style="width: 1%; vertical-align: top;">:</td> <td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['address'] ?? '' }}</td> <td>{{ $alamat[$field] }}</td>
</tr>
<tr>
<td>Desa/Kelurahan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['village_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kecamatan</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['district_code'] ?? '' }}</td>
</tr>
<tr>
<td>Kabupaten/Kota</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td> {{ $alamat['city_code'] ?? '' }}</td>
</tr>
<tr>
<td>Provinsi</td>
<td style="width: 1%; vertical-align: top;">:</td>
<td>{{ $alamat['province_code'] ?? '' }}</td>
</tr> </tr>
@endif @endif
@endforeach
@endif
</table> </table>

4
resources/views/penilai/show.blade.php
View File

@@ -323,11 +323,11 @@
</div> </div>
</div> </div>
@if($permohonan->jenisPenilaian->name=="External") @if($permohonan->jenisPenilaian->name=="Eksternal")
@if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan)) @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
<div class="dropdown" data-dropdown="true" data-dropdown-trigger="click"> <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
<button class="dropdown-toggle btn btn-primary"> <button class="dropdown-toggle btn btn-primary">
Laporan External Laporan Eksternal
</button> </button>
<div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]"> <div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]">
<div class="menu menu-default flex flex-col w-full"> <div class="menu menu-default flex flex-col w-full">