fix(so) : perbaikkan assigment atar region dan rejecte freeze
This commit is contained in:
@@ -563,7 +563,7 @@ class PenilaiController extends Controller
|
||||
if (!Auth::user()->hasRole('administrator')) {
|
||||
$query->whereHas('penilaian.userPenilai', function ($q) {
|
||||
$q
|
||||
->where('role', ['surveyor','penilai'])
|
||||
->whereIn('role', ['surveyor', 'penilai'])
|
||||
->where('user_id', Auth::user()->id);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -194,6 +194,8 @@ class PenilaianController extends Controller
|
||||
DB::beginTransaction();
|
||||
$penilaian = Penilaian::where('nomor_registrasi', $request->nomor_registrasi)->first();
|
||||
|
||||
$surveyTeam = null;
|
||||
$penilaiTeam = null;
|
||||
$penilaianId = $penilaian->id;
|
||||
|
||||
$penilainTeam = PenilaianTeam::where('penilaian_id', $penilaianId)->get();
|
||||
@@ -205,6 +207,7 @@ class PenilaianController extends Controller
|
||||
'user_id' => $request->surveyor_id,
|
||||
'role' => 'surveyor',
|
||||
]);
|
||||
$surveyTeam = $item->team_id;
|
||||
}
|
||||
|
||||
if ($item->role === 'penilai' && $item->user_id === null) {
|
||||
@@ -212,10 +215,21 @@ class PenilaianController extends Controller
|
||||
'user_id' => $request->penilai_id,
|
||||
'role' => 'penilai',
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
if ($item->role === 'penilai' && $surveyTeam) {
|
||||
$penilaiTeam = $item->team_id;
|
||||
}
|
||||
}
|
||||
|
||||
$permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi);
|
||||
|
||||
if ($surveyTeam && $penilaiTeam) {
|
||||
$permohonan->update([
|
||||
'region_id' => $penilaiTeam,
|
||||
]);
|
||||
}
|
||||
$permohonan->update([
|
||||
'status' => 'assign',
|
||||
]);
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{
|
||||
"kepada": " rustam",
|
||||
"dari": "dasd",
|
||||
"nomor_memo": "C04\/250121588\/MAK\/REG0000014\/I\/25",
|
||||
"tanggal": "2025-03-21",
|
||||
"perihal": "te",
|
||||
"jenis_asset_tidak_sesuai": "Alat Berat",
|
||||
"lokasi": {
|
||||
"lokasi": "dsad",
|
||||
"address": "Jl. Kali Pasir Kecil No.1, RT.2\/RW.1, Cikini, Kec. Menteng, Kota Jakarta Pusat, Daerah Khusus Ibukota Jakarta 10330",
|
||||
"province_code": "12",
|
||||
"city_code": "",
|
||||
"district_code": "",
|
||||
"village_code": "",
|
||||
"tanggal_survey": "2025-01-21 04:13:33",
|
||||
"penilai": "rrer"
|
||||
},
|
||||
"terlampir": ["llorem"],
|
||||
"hasil_survey": ["lorm"],
|
||||
"kesimpulan_saran": ["loren"],
|
||||
"foto": [
|
||||
"temp_photos\/1742524956_1. Tampak Akses Jalan Menuju Objek Penilaian.png",
|
||||
"temp_photos\/1742524957_2. Tampak Akses Jalan Menuju Objek penilaian.png"
|
||||
]
|
||||
}
|
||||
@@ -237,7 +237,7 @@
|
||||
if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data
|
||||
.status === 'paparan' || data.status === 'proses-paparan' || data.status ===
|
||||
'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data
|
||||
.status === 'revisi-paparan' || data.status === 'unfreeze-sla') {
|
||||
.status === 'revisi-paparan' || data.status === 'unfreeze-sla' || data.status === 'reject-freeze') {
|
||||
return `
|
||||
<div class="flex flex-nowrap justify-center gap-1.5">
|
||||
<a class="btn btn-sm btn-icon btn-clear btn-info" href="penilai/${data.id}/show">
|
||||
|
||||
Reference in New Issue
Block a user