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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source
This commit is contained in:
Daeng Deni Mardaeni
2024-12-31 09:00:15 +07:00
parent e933daaa41 800d0c2496
commit 848f103631
13 changed files with 408 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,7 +579,7 @@ class PenilaiController extends Controller
'luas_bangunan' => $request->input('luas_bangunan'),
'nilai_bangunan_1' => $request->input('nilai_bangunan_1'),
'nilai_bangunan_2' => $request->input('nilai_bangunan_2'),
'sarana_pelengkap' => $request->input('sarana_pelengkap', []),
'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'),
'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'),
'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'),
'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'),

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

@@ -599,18 +599,20 @@ class PenilaianController extends Controller
public function storePenilaiLaporan(Request $request)
{
DB::beginTransaction();
try {
$validatedRequest = app(FormSurveyorRequest::class);
$this->surveyorController->store($validatedRequest);
$data = [
'luas_tanah' => $request->input('luas_tanah'),
'luas_tanah_penilai' => $request->input('luas_tanah_penilai'),
'nilai_tanah_1' => $request->input('nilai_tanah_1'),
'nilai_tanah_2' => $request->input('nilai_tanah_2'),
'luas_bangunan' => $request->input('luas_bangunan'),
'luas_bangunan_penilai' => $request->input('luas_bangunan_penilai'),
'nilai_bangunan_1' => $request->input('nilai_bangunan_1'),
'nilai_bangunan_2' => $request->input('nilai_bangunan_2'),
'sarana_pelengkap' => $request->input('sarana_pelengkap', []),
'sarana_pelengkap_penilai' => $request->input('sarana_pelengkap_penilai'),
'nilai_sarana_pelengkap_1' => $request->input('nilai_sarana_pelengkap_1'),
'nilai_sarana_pelengkap_2' => $request->input('nilai_sarana_pelengkap_2'),
'total_nilai_pasar_wajar' => $request->input('total_nilai_pasar_wajar'),
@@ -633,12 +635,14 @@ class PenilaianController extends Controller
'lpj' => json_encode($data),
]
);
DB::commit();
return response()->json([
'success' => true,
'message' => 'Berhasil Update Laporan penilai',
'data' => $request->all(),
], 200);
} catch (\Throwable $e) {
DB::rollBack();
return response()->json([
'success' => false,
'message' => 'Terjadi kesalahan',

17
app/Http/Requests/FormSurveyorRequest.php
View File

@@ -351,17 +351,15 @@ class FormSurveyorRequest extends FormRequest
{
return [
'action' => 'required',
'tanggal_survey' => 'required',
'nama_wakil' => 'required',
'hub_calon_debitur' => 'required',
'dengan_wadeb' => 'required',
'nama_wakil' => 'required|string',
'hub_calon_debitur' => 'required|string',
'nama_jalan' => 'required',
'perumahan_gang' => 'required',
'blok' => 'required',
'desa_kelurahan' => 'required',
'kecamatan' => 'required',
'kota_madya' => 'required',
'provinsi' => 'required',
'blok_nomor' => 'required',
'village_code' => 'nullable|string',
'district_code' => 'nullable|string',
'city_code' => 'nullable|string',
'province_code' => 'nullable|string',
'jenis_model' => 'required',
'nomor_lambung' => 'required',
'model_unit' => 'required',
@@ -411,7 +409,6 @@ class FormSurveyorRequest extends FormRequest
{
return [
'action' => 'required',
'tanggal_survey' => 'required',
'nama_wakil' => 'required',
'hub_calon_debitur' => 'required',
'bandara' => 'required',

3
app/Http/Requests/SurveyorRequest.php
View File

@@ -85,6 +85,9 @@ class SurveyorRequest extends FormRequest
],
],
'foto-objek-jaminan' => [
'kategori' => 'required',
],
// Add more action specific rules here
default => [],
};