Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

This commit is contained in:
2025-02-14 08:51:10 +07:00
17 changed files with 426 additions and 246 deletions

View File

@@ -838,7 +838,7 @@ class PenilaianController extends Controller
{
$permohonan = Permohonan::findOrFail($id);
$permohonan->update([
'status' => 'done',
'status' => 'revisi-laporan',
'keterangan' => $request->message,
'submitted_at' => now()
]);

View File

@@ -29,7 +29,9 @@
}
// Retrieve data from the database
$query = Permohonan::query()->where('status', '=', 'preregister');
$query = Permohonan::query()
->whereIn('status', ['preregister', 'revisi']);
// Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) {

View File

@@ -2016,7 +2016,7 @@ class SurveyorController extends Controller
});
}
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule' ]);
$query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ? ,?,?)', ['assign', 'survey', 'proses-survey', 'request-reschedule', 'reschedule', 'rejected-reschedule', 'approved-reschedule', 'revisi-laporan' ]);
if (!Auth::user()->hasRole('administrator')) {