fix(so) : perbaikkan assigment atar region dan rejecte freeze

This commit is contained in:
majid
2025-03-21 10:37:19 +07:00
parent b6e71ac865
commit d5a4c019cb
4 changed files with 16 additions and 27 deletions

View File

@@ -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);
});
}

View File

@@ -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',
]);