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

fix(surveyor): perbaikkan proses jadwal dan hapus nib di form inspeksi

Browse Source
This commit is contained in:
majid
2025-03-07 11:17:31 +07:00
parent 85711db4d5
commit 345cbbe22c
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,8 +967,11 @@ class SurveyorController extends Controller
'keterangan' => 'required', 'keterangan' => 'required',
]); ]);
$penilaian = Penilaian::findOrFail($id); $penilaian = Penilaian::findOrFail($id);
$permohonan = Permohonan::where('nomor_registrasi', $penilaian->nomor_registrasi)->first();
;
if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) { if (Carbon::parse($validate['waktu_penilaian']) <= Carbon::parse($penilaian->tanggal_kunjungan)) {
return response()->json([ return response()->json([
'success' => false, 'success' => false,
@@ -986,7 +989,9 @@ class SurveyorController extends Controller
SendJadwalKunjunganEmailJob::dispatch($emailData); SendJadwalKunjunganEmailJob::dispatch($emailData);
$permohonan->update([
'status' => 'request-jadwal',
]);
$penilaian->update([ $penilaian->update([
@@ -2107,7 +2112,7 @@ class SurveyorController extends Controller
}); });
} }
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey' ]); $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?, ?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-survey', 'request-jadwal' ]);
if (!Auth::user()->hasRole('administrator')) { if (!Auth::user()->hasRole('administrator')) {
@@ -2457,7 +2462,7 @@ class SurveyorController extends Controller
'kordinat_lng' => $data['kordinat_lng'] ?? null, 'kordinat_lng' => $data['kordinat_lng'] ?? null,
'kordinat_lat' => $data['kordinat_lat'] ?? null, 'kordinat_lat' => $data['kordinat_lat'] ?? null,
'nomor_nib' => $data['nomor_nib'] ?? null // 'nomor_nib' => $data['nomor_nib'] ?? null
] ]
]; ];
} }

4
resources/views/surveyor/components/header.blade.php
View File

@@ -289,14 +289,14 @@
<div class="card-body w-full"> <div class="card-body w-full">
@include('lpj::component.detail-jaminan', ['status' => true]) @include('lpj::component.detail-jaminan', ['status' => true])
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full"> {{-- <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 w-full">
<label class="form-label font-medium max-w-56">Nomor NIB</label> <label class="form-label font-medium max-w-56">Nomor NIB</label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input type="text" name="nomor_nib" class="input w-full" <input type="text" name="nomor_nib" class="input w-full"
value="{{ isset($forminspeksi['asset']['nomor_nib']) ? $forminspeksi['asset']['nomor_nib'] : '' }}" value="{{ isset($forminspeksi['asset']['nomor_nib']) ? $forminspeksi['asset']['nomor_nib'] : '' }}"
placeholder="Masukkan Nomor NIB"> placeholder="Masukkan Nomor NIB">
</div> </div>
</div> </div> --}}
<div class=" mx-auto rounded-lg overflow-hidden"> <div class=" mx-auto rounded-lg overflow-hidden">
<div class="py-4 "> <div class="py-4 ">

2
resources/views/surveyor/index.blade.php
View File

@@ -500,7 +500,7 @@
id: permohonanId, id: permohonanId,
waktu_penilaian: tanggal, waktu_penilaian: tanggal,
deskripsi_penilaian: keterangan, deskripsi_penilaian: keterangan,
keterangan:'Tanggal Kunjungan: ' + tanggal + ', Keterangan: ' + keterangan keterangan:'Permintaan Jadwal Kujungan: ' + window.formatTanggalWaktuIndonesia(tanggal) + ', ' + keterangan
}; };
$.ajax({ $.ajax({