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
2025-03-20 10:44:41 +07:00
parent 38390eb8b2 cb9a650bc4
commit 4a4b168084
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'; $status = 'reject-freeze';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'senior-officer') {
$status = 'revisi-laporan';
} elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') { } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
$permohonan->update([ $permohonan->update([
'approval_so' => 0, '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( LaporanExternal::updateOrCreate(
['permohonan_id' => $permohonan->id], ['permohonan_id' => $permohonan->id],
[ [
@@ -904,10 +904,10 @@ class SurveyorController extends Controller
'waktu_penilaian' => $validate['waktu_penilaian'], 'waktu_penilaian' => $validate['waktu_penilaian'],
'deskripsi_penilaian' => $validate['deskripsi_penilaian'], 'deskripsi_penilaian' => $validate['deskripsi_penilaian'],
]); ]);
return response()->json([ return response()->json([
'success' => true, 'success' => true,
'message' => 'Berhasil kirim jadwal kunjungan' 'message' => 'Berhasil kirim jadwal kunjungan'
], 200); ], 200);
} catch (\Exception $e) { } catch (\Exception $e) {
return response()->json([ return response()->json([
@@ -1384,13 +1384,37 @@ class SurveyorController extends Controller
// dd($request->all()); // dd($request->all());
$maxSize = getMaxFileSize('Foto'); $maxSize = getMaxFileSize('Foto');
$validator = $request->validate([ $validator = $request->validate(
[
'permohonan_id' => 'required|exists:permohonan,id', 'permohonan_id' => 'required|exists:permohonan,id',
'type' => 'nullable|string', 'type' => 'nullable|string',
'dokument_id' => 'required', 'dokument_id' => 'required',
'name_foto_objek' => 'nullable|string', 'name_foto_objek' => 'nullable|string',
'nomor_registrasi' => 'required|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']; $tanahBangunanTypes = ['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT', 'MESIN'];

2
resources/views/activity/progres_activity/index.blade.php
View File

@@ -413,7 +413,7 @@
`; `;
} else { } else {
subOptionsHtml = ` subOptionsHtml = `
<div> <div class="flex grid gap-2">
<select id="subOptionsPenugasan" class="input"> <select id="subOptionsPenugasan" class="input">
<option value="" selected disabled>Pilih Penugasan</option> <option value="" selected disabled>Pilih Penugasan</option>
<option value="surveyor">Surveyor</option> <option value="surveyor">Surveyor</option>

5
resources/views/surveyor/components/data-pembanding.blade.php
View File

@@ -721,10 +721,11 @@
}, },
error: function(xhr, status, error) { error: function(xhr, status, error) {
hideLoadingSwal(); hideLoadingSwal();
console.error('Error:', error); const response = JSON.parse(xhr.responseText);
console.error('Error:', response.message);
Swal.fire({ Swal.fire({
title: 'Error!', title: 'Error!',
text: 'Terjadi kesalahan pada server', text: response.message || 'Terjadi kesalahan',
icon: 'error', icon: 'error',
confirmButtonText: 'OK' confirmButtonText: 'OK'
}); });

8
resources/views/surveyor/components/pembanding-tanah-bangunan-unit.blade.php
View File

@@ -267,17 +267,17 @@
<td class="px-4 py-2"> <td class="px-4 py-2">
<div class="grid grid-cols-2 gap-2"> <div class="grid grid-cols-2 gap-2">
<input type="text" name="kordinat_lat" class="input" placeholder="Latitude" <input type="text" name="kordinat_lat" class="input" placeholder="Latitude"
value="{{ $inspectionData['asset']['kordinat_lat'] ?? '' }}"> value="{{ $inspectionData['asset']['kordinat_lat'] ?? '' }}" pattern="^-?((1[0-7]\d|\d{1,2})(\.\d+)?|180(\.0+)?)$">
<input type="text" name="kordinat_lng" class="input" placeholder="Longitude" <input type="text" name="kordinat_lng" class="input" placeholder="Longitude"
value="{{ $inspectionData['asset']['kordinat_lng'] ?? '' }}"> value="{{ $inspectionData['asset']['kordinat_lng'] ?? '' }}" pattern="^-?((1[0-7]\d|\d{1,2})(\.\d+)?|180(\.0+)?)$">
</div> </div>
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<div class="grid grid-cols-2 gap-2"> <div class="grid grid-cols-2 gap-2">
<input type="text" name="kordinat_lat_pembanding[]" class="input" <input type="text" name="kordinat_lat_pembanding[]" class="input"
placeholder="Latitude"> placeholder="Latitude" pattern="^-?((1[0-7]\d|\d{1,2})(\.\d+)?|180(\.0+)?)$">
<input type="text" name="kordinat_lng_pembanding[]" class="input" <input type="text" name="kordinat_lng_pembanding[]" class="input"
placeholder="Longitude"> placeholder="Longitude" pattern="^-?((1[0-7]\d|\d{1,2})(\.\d+)?|180(\.0+)?)$">
</div> </div>
</td> </td>
</tr> </tr>