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

perbaikan form inspeksi dan ganti surveyor

Browse Source
This commit is contained in:
majid
2025-02-17 12:07:26 +07:00
parent f567e3da40
commit f626aeecfe
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ActivityController.php
View File

@@ -98,10 +98,10 @@ class ActivityController extends Controller
$permohonan = Permohonan::findOrFail($permohonanId);
// Validasi status permohonan
if ($permohonan->status !== 'assign') {
if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey') {
return response()->json([
'status' => 'error',
'message' => 'Tidak bisa ganti tim, permohonan ini sudah mengatur jadwal.',
'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.',
]);
}
@@ -392,7 +392,7 @@ class ActivityController extends Controller
$q->where('user_id', $id);
})
->whereHas('permohonan', function ($q) {
$q->whereIn('status', ['assign', 'proses-laporan', 'done']);
$q->whereIn('status', ['assign', 'proses-laporan', 'done', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-laporan', 'survey']);
});