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

fix(surveyor/so): perbaikkan back di surveyor, luas denah decimal dan revisi di so

Browse Source
This commit is contained in:
majid
2025-03-05 14:31:55 +07:00
committed by putrakuningan
parent 16aabd5da0
commit 3ac83aa7fe
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -891,7 +891,7 @@ class PenilaianController extends Controller
public function revisiLaporan(Request $request, $id)
{
$permohonan = Permohonan::findOrFail($id);
$permohonan = Permohonan::find($id);
$userRole = Auth::user()->roles[0]->name;
$authorization = Authorization::where('permohonan_id', $permohonan->id)

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

@@ -292,7 +292,7 @@ class SurveyorController extends Controller
$validator = $request->validate([
'foto_denah.*' => 'nullable|file|mimes:jpg,jpeg,png,bmp,gif,webp,pdf',
'nama_denah.*' => 'nullable|string|max:255',
'luas_denah.*' => 'nullable|numeric',
'luas_denah.*' => 'nullable',
'permohonan_id' => 'required|exists:permohonan,id',
'dokument_id' => 'required',
'nomor_registrasi' => 'required'
@@ -2469,7 +2469,7 @@ class SurveyorController extends Controller
$hasil_tanah = $luas_tanah_key === 'sesuai'
? ($data['luas_tanah_sesuai'] ?? null)
: ($data['luas_tanah_tidak_sesuai'] ?? null);
$luas_tanah[$luas_tanah_key] = $hasil_tanah;
$luas_tanah[$luas_tanah_key] = preg_replace('/[^0-9.,]/', '', $hasil_tanah);
// Hadap mata angin key
$hadap_mata_angin_key = ($data['hadap_mata_angin'] ?? null) === 'sesuai' ? 'sesuai' : 'tidak sesuai';
@@ -2571,7 +2571,7 @@ class SurveyorController extends Controller
: ($data['luas_tanah_bagunan_tidak_sesuai'] ?? null);
// Masukkan key baru yang sesuai
$luas_tanah_bagunan[$luas_tanah_bagunan_key] = $hasil_tanah_bagunan;
$luas_tanah_bagunan[$luas_tanah_bagunan_key] = preg_replace('/[^0-9.,]/', '', $hasil_tanah_bagunan);
return [
@@ -3255,14 +3255,19 @@ class SurveyorController extends Controller
private function getUnitData($data, $request): array
{
$luas_unit_key = ($data['luas_unit'] ?? null) === 'sesuai' ? 'sesuai' : 'tidak sesuai';
$luas_unit = [];
$hasil_luas_unit = $luas_unit_key === 'sesuai'
? ($data['luas_unit_sesuai'] ?? null)
: ($data['luas_unit_tidak_sesuai'] ?? null);
// Masukkan key baru yang sesuai
$luas_luas_unit[$luas_luas_unit_key] = preg_replace('/[^0-9.,]/', '', $hasil_luas_unit);
return [
'action' => $data['action'] ?? null,
'luas_unit' => $this->getFieldData(
$data,
'luas_unit',
true
),
'luas_unit' => $luas_luas_unit,
'kondisi_unit' => $data['kondisi_unit'] ?? null,
'posisi_unit' => $data['posisi_unit'] ?? null,
'lantai' => $data['lantai'] ?? null,