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
2025-03-20 10:27:22 +07:00
parent 5e50138d8e 155fe5f011
commit cb9a650bc4
5 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -954,6 +954,8 @@ class PenilaianController extends Controller
}
$status = 'reject-freeze';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'senior-officer') {
$status = 'revisi-laporan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
$permohonan->update([
'approval_so' => 0,

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

@@ -777,7 +777,7 @@ class SurveyorController extends Controller
]);
if($permohonan->jenisPenilaian->name=="External") {
if ($permohonan->jenisPenilaian->name == "External") {
LaporanExternal::updateOrCreate(
['permohonan_id' => $permohonan->id],
[
@@ -904,10 +904,10 @@ class SurveyorController extends Controller
'waktu_penilaian' => $validate['waktu_penilaian'],
'deskripsi_penilaian' => $validate['deskripsi_penilaian'],
]);
return response()->json([
'success' => true,
'message' => 'Berhasil kirim jadwal kunjungan'
], 200);
return response()->json([
'success' => true,
'message' => 'Berhasil kirim jadwal kunjungan'
], 200);
} catch (\Exception $e) {
return response()->json([
@@ -1384,13 +1384,37 @@ class SurveyorController extends Controller
// dd($request->all());
$maxSize = getMaxFileSize('Foto');
$validator = $request->validate([
$validator = $request->validate(
[
'permohonan_id' => 'required|exists:permohonan,id',
'type' => 'nullable|string',
'dokument_id' => 'required',
'name_foto_objek' => 'nullable|string',
'nomor_registrasi' => 'required|string',
]);
'kordinat_lat' => [
'nullable',
'regex:/^(-?[1-8]?[0-9](\.\d+)?|90(\.0+)?)$/'
],
'kordinat_long' => [
'nullable',
'regex:/^(-?(1[0-7][0-9]|[1-9]?[0-9])(\.\d+)?|180(\.0+)?)$/'
],
'kordinat_lat_pembanding.*' => [
'nullable',
'regex:/^(-?[1-8]?[0-9](\.\d+)?|90(\.0+)?)$/'
],
'kordinat_lng_pembanding.*' => [
'nullable',
'regex:/^(-?(1[0-7][0-9]|[1-9]?[0-9])(\.\d+)?|180(\.0+)?)$/'
],
],
[
'kordinat_lat.regex' => 'Format koordinat latitude tidak valid.',
'kordinat_long.regex' => 'Format koordinat longitude tidak valid.',
'kordinat_lat_pembanding.*.regex' => 'Format koordinat latitude pembanding tidak valid.',
'kordinat_lng_pembanding.*.regex' => 'Format koordinat longitude pembanding tidak valid.',
]
);
$tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT', 'MESIN'];