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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2024-12-18 09:01:36 +07:00
parent 510df4ea4c 562f1fb846
commit c5d31c7d56
25 changed files with 2547 additions and 1174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/KJPPController.php
View File

@@ -498,7 +498,7 @@ class KJPPController extends Controller
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->get();
$data = $query->with('city')->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));

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

@@ -9,7 +9,7 @@ use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Exports\KertasKerjaExport;
use App\Http\Controllers\SurveyorController;
use Modules\Lpj\Http\Controllers\SurveyorController;
class PenilaiController extends Controller
{
@@ -62,22 +62,43 @@ class PenilaiController extends Controller
$basicData = $data->getCommonData();
$permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id);
return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'basicData'));
$jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id;
$inspeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
$forminspeksi = null;
if ($inspeksi) {
$forminspeksi = json_decode($inspeksi->data_form, true);
}
return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'basicData', 'forminspeksi', 'inspeksi'));
}
public function standard($id)
{
$permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id);
return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan'));
$jaminanId = $permohonan->debiture->documents->first()->jenis_jaminan_id;
$inspeksi = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
$forminspeksi = null;
if ($inspeksi) {
$forminspeksi = json_decode($inspeksi->data_form, true);
}
$data = new SurveyorController();
$basicData = $data->getCommonData();
return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi'));
}
public function resume(){
return view('lpj::resume.index');
public function resume($id)
{
$permohonan = Permohonan::with(['debiture.documents.jenisjaminan', 'region.teams.teamsUsers.user', 'penilaian'])->find($id);
return view('lpj::penilai.components.resume', compact('permohonan'));
}
public function memo(){
public function memo()
{
return view('lpj::resume.index');
}
}
/**
@@ -192,19 +213,24 @@ class PenilaiController extends Controller
]);
}
public function kertas_kerja($id, $jeniJaminan)
public function kertas_kerja($id, $jaminanId)
{
$data = Inspeksi::where('permohonan_id', $id)->where('jenis_jaminan_id', $jaminanId)->first();
$headerInfo = [
'tanggal_penilaian' => '',
'nama_pemilik' => '',
'nama_pemberi_tugas' => '',
'lokasi_lengkap' => '',
'nama_debitur' => ''
];
// $data = null;
// $headerInfo = [
// 'tanggal_penilaian' => '',
// 'nama_pemilik' => '',
// 'nama_pemberi_tugas' => '',
// 'lokasi_lengkap' => '',
// 'nama_debitur' => ''
// ];
return Excel::download(new KertasKerjaExport($data, $headerInfo), 'kertas-kerja.xlsx');
// $datas = json_decode($data->data_pembanding);
// return response()->json(['data' =>$datas ]);
// return view('lpj::component.kertas-kerja', compact('data'));
return Excel::download(new KertasKerjaExport($data), 'kertas-kerja.xlsx');
}

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

@@ -164,7 +164,6 @@ class SurveyorController extends Controller
return response()->json([
'success' => true,
'message' => 'Data berhasil disimpan',
'data' => $processedData
], 200);
} catch (\Exception $e) {
@@ -178,30 +177,38 @@ class SurveyorController extends Controller
private function getActionSpecificRules($data, $action, $request): array
{
$pisah = explode(',', $action);
$allRules = [
'tanah' => $this->getTanahData($data, $request),
'bangunan' => $this->getBangunanData($data, $request),
'kapal' => $this->getKapalData($data, $request),
'kendaraan' => $this->getKendaraanData($data, $request),
'mesin' => $this->getMesinData($data, $request),
'pesawat' => $this->getPesawatData($data, $request),
'alat-berat' => $this->getAlatBeratData($data, $request),
'apartemen-kantor' => $this->getUnitData($data, $request),
'lingkungan' => $this->getLingkunganData($data, $request),
'fakta' => $this->getFactData($data, $request),
$allowedActions = [
'apartemen-kantor' => 'getUnitData',
'tanah' => 'getTanahData',
'bangunan' => 'getBangunanData',
'kapal' => 'getKapalData',
'kendaraan' => 'getKendaraanData',
'mesin' => 'getMesinData',
'pesawat' => 'getPesawatData',
'alat-berat' => 'getAlatBeratData',
'lingkungan' => 'getLingkunganData',
'fakta' => 'getFactData'
];
$rules = [];
$hasAssetDescriptionRules = false;
$pisah = array_filter(
explode(',', $action),
function($act) use ($allowedActions) {
return isset($allowedActions[trim($act)]);
}
);
foreach ($pisah as $act) {
if (isset($allRules[$act])) {
$rules = array_merge($rules, $allRules[$act]);
if ($act == 'tanah' || $act == 'bangunan' || $act == 'apartemen-kantor') {
$hasAssetDescriptionRules = true;
}
$act = trim($act);
$method = $allowedActions[$act];
$actionRules = $this->$method($data, $request);
$rules = array_merge($rules, $actionRules);
if (in_array($act, ['apartemen-kantor', 'tanah', 'bangunan'])) {
$hasAssetDescriptionRules = true;
}
}
@@ -217,28 +224,39 @@ class SurveyorController extends Controller
{
try {
$maxSize = getMaxFileSize('Foto');
$validatedData = $request->validate([
'foto_denah' => 'required|file|mimes:jpeg,jpg,png,pdf,svg|max:'. $maxSize,
$validationRules = [
'luas' => 'required|numeric',
'permohonan_id' => 'required',
'jenis_jaminan_id' => 'required'
]);
];
$validatedData['foto_denah'] = $this->uploadFile($request->file('foto_denah'), 'foto_denah');
if ($request->hasFile('foto_denah')) {
$maxSize = getMaxFileSize('Foto');
$validationRules['foto_denah'] = 'file|mimes:jpeg,jpg,png,pdf,svg|max:'. $maxSize;
}
$validatedData = $request->validate($validationRules);
$formatJsonDenah = [
'foto_denah' => $validatedData['foto_denah'],
'luas' => $validatedData['luas'],
];
if ($request->hasFile('foto_denah')) {
$formatJsonDenah['foto_denah'] = $this->uploadFile($request->file('foto_denah'), 'foto_denah');
}
$inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))
->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))
->first();
if ($inspeksi) {
$existingDenah = json_decode($inspeksi->denah_form, true) ?? [];
$updatedDenah = array_merge($existingDenah, $formatJsonDenah);
$inspeksi->update([
'denah_form' => json_encode($formatJsonDenah)
'denah_form' => json_encode($updatedDenah)
]);
} else {
Inspeksi::create([
@@ -537,7 +555,7 @@ class SurveyorController extends Controller
$penilaian->update([
'authorized_status' => 1,
]);
$data['status'] = 'success';
$data['message']= 'Jadwal '.$request->noReg.' berhasil di aprove';
} catch (\Exception $e) {
@@ -573,7 +591,7 @@ class SurveyorController extends Controller
->first();
if ($inspeksi) {
$existingData = $inspeksi->data_pembanding ?? [];
$existingData = json_decode($inspeksi->data_pembanding, true) ?? [];
}
}
@@ -582,8 +600,8 @@ class SurveyorController extends Controller
$existingFoto = null;
if ($existingData && isset($existingData[$i]['foto_objek'])) {
$existingFoto = $existingData[$i]['foto_objek'];
if ($existingData && isset($existingData['data_pembanding'][$i]['foto_objek'])) {
$existingFoto = $existingData['data_pembanding'][$i]['foto_objek'];
}
// Penanganan foto pembanding
@@ -602,8 +620,8 @@ class SurveyorController extends Controller
return $dataPembanding;
}
private function formatSinglePembanding($request, $index)
{
$fields = [
@@ -613,12 +631,12 @@ class SurveyorController extends Controller
'peruntukan', 'penawaran_transaksi', 'nomor_tlp',
'kordinat_lat', 'kordinat_lng', 'jenis_aset','foto_objek'
];
$pembanding = [];
foreach ($fields as $field) {
$inputName = "{$field}_pembanding";
$inputValue = $request->input($inputName);
// Pastikan input adalah array dan index valid
if (is_array($inputValue) && isset($inputValue[$index])) {
$pembanding[$field] = $inputValue[$index];
@@ -627,10 +645,10 @@ class SurveyorController extends Controller
}
}
return $pembanding;
}
private function handleupdateOrDeleteFile($file, $type, $prefix)
@@ -662,54 +680,54 @@ class SurveyorController extends Controller
'status_nara_sumber', 'harga', 'nama_nara_sumber',
'kordinat_lat', 'kordinat_lng', 'jenis_aset',
];
$inspeksi = Inspeksi::where('permohonan_id', $request->input('permohonan_id'))
->where('jenis_jaminan_id', $request->input('jenis_jaminan_id'))
->first();
if ($inspeksi) {
$needsSave = false;
// Handle foto_form
$fotoForm = json_decode($inspeksi->foto_form, true) ?: [];
if (!isset($fotoForm['object_jaminan'])) {
$fotoForm['object_jaminan'] = [['foto_objek' => null]];
$needsSave = true;
}
// Handle data_form
$dataForm = json_decode($inspeksi->data_form, true) ?: [];
// Inisialisasi struktur data jika belum ada
if(!isset($dataForm['bangunan'])) {
$dataForm['bangunan'] = [];
$needsSave = true;
}
if(!isset($dataForm['tanah'])) {
$dataForm['tanah'] = [];
$needsSave = true;
}
if (!isset($dataForm['asset'])) {
$dataForm['asset'] = [];
$needsSave = true;
}
// Update data dengan mempertahankan struktur sesuai/tidak sesuai
foreach ($fields as $field) {
if ($request->filled($field)) {
$newValue = $request->input($field);
// Fields untuk tanah
if (in_array($field, ['luas_tanah'])) {
$cekLuas = $dataForm['tanah']['luas_tanah'] == 'sesuai' ? 'sesuai' : 'tidak sesuai';
$cekLuas = $dataForm['tanah']['luas_tanah'] == 'sesuai' ? 'sesuai' : 'tidak sesuai';
$dataForm['tanah'][$field][$cekLuas] = $newValue;
}
// Fields untuk bangunan
else if (in_array($field, ['luas_tanah_bagunan'])) {
$cekBanguan = $dataForm['bangunan']['luas_tanah_bagunan'] == 'sesuai' ? 'sesuai' : 'tidak sesuai';
$cekBanguan = $dataForm['bangunan']['luas_tanah_bagunan'] == 'sesuai' ? 'sesuai' : 'tidak sesuai';
$dataForm['bangunan'][$field][$cekBanguan] = $newValue;
}
// Fields untuk alamat dalam asset
@@ -718,12 +736,12 @@ class SurveyorController extends Controller
if (!isset($dataForm['asset']['alamat'])) {
$dataForm['asset']['alamat'] = [];
}
$alamatStatus = $dataForm['asset']['alamat'] == 'sesuai' ? 'sesuai' : 'tidak sesuai';
if (!isset($dataForm['asset']['alamat'][$alamatStatus])) {
$dataForm['asset']['alamat'][$alamatStatus] = [];
}
$dataForm['asset']['alamat'][$alamatStatus][$field] = $newValue;
}
// Jenis asset dalam asset
@@ -737,19 +755,19 @@ class SurveyorController extends Controller
else {
$dataForm['asset'][$field] = $newValue;
}
$needsSave = true;
}
}
if ($needsSave) {
$inspeksi->foto_form = json_encode($fotoForm);
$inspeksi->data_form = json_encode($dataForm);
$inspeksi->save();
}
$existingFoto = $fotoForm['object_jaminan'][0]['foto_objek'] ?? null;
// Gabungkan data dari tanah, bangunan, dan asset
$objekPenilaian = array_merge(
['foto_objek' => $existingFoto],
@@ -772,7 +790,7 @@ class SurveyorController extends Controller
return $carry;
}, [])
);
} else {
// Inisialisasi data baru
$objekPenilaian = array_reduce($fields, function ($carry, $field) use ($request) {
@@ -780,10 +798,10 @@ class SurveyorController extends Controller
return $carry;
}, ['foto_objek' => null]);
}
return $objekPenilaian;
}
private function saveInspeksi($formattedData)
@@ -855,6 +873,7 @@ class SurveyorController extends Controller
'data_pembanding' => $this->formatDataPembanding($request)
];
$inspeksi = $this->saveInspeksi($formattedData);
DB::commit();
@@ -1023,7 +1042,6 @@ class SurveyorController extends Controller
if (json_last_error() !== JSON_ERROR_NONE) {
throw new \Exception('Error decoding comparison data: ' . json_last_error_msg());
}
}
$fotoForm = json_decode($inspeksi->foto_form, true);
@@ -1037,8 +1055,6 @@ class SurveyorController extends Controller
$districts = District::where('city_code', $this->getCodeAlamat('city_code', $inspectionData))->get();
$villages = Village::where('district_code', $this->getCodeAlamat('district_code', $inspectionData))->get();
return view('lpj::surveyor.components.data-pembanding', compact(
'permohonan',
'id',
@@ -1050,7 +1066,8 @@ class SurveyorController extends Controller
'cities',
'districts',
'villages',
'provinces'
'provinces',
'inspeksi'
));
} catch (\Exception $e) {
@@ -1544,7 +1561,7 @@ class SurveyorController extends Controller
private function getCommonData()
public function getCommonData()
{
return [
'branches' => Branch::all(),
@@ -1660,7 +1677,7 @@ class SurveyorController extends Controller
true
),
'hadap_mata_angin' => [
$data['hadap_mata_angin'] => ($data['hadap_mata_angin'] == 'sesuai') ? $data['hadap_mata_angin_sesuai'] : $data['hadap_mata_angin_tidak_sesuai']
$data['hadap_mata_angin'] => $data['hadap_mata_angin'] == 'sesuai' ? $data['hadap_mata_angin_sesuai'] : $data['hadap_mata_angin_tidak_sesuai'] ?? null
],
'bentuk_tanah' => $this->getFieldData(
$data,
@@ -1791,11 +1808,9 @@ class SurveyorController extends Controller
'jarak_tps' => $data['jarak_tps'] ?? null,
'nama_tps' => $data['nama_tps'] ?? null,
'merupakan_daerah' => $data['merupakan_daerah'] ?? null,
'fasilitas_dekat_object' => $this->getFieldData(
$data,
'fasilitas_dekat_object',
false,
'lainnya'
'fasilitas_dekat_object' => $this->mapArrayWithInputs(
$data['fasilitas_dekat_object'] ?? [],
$data['fasilitas_dekat_object_input'] ?? []
),
]
];