perabaikan team activity, form inspeksi rap,laporan memo, rap, resume dan penambahan basic data perizinan

2025-01-03 16:49:20 +07:00
parent 64ba6cf71e
commit b7767fbc92
26 changed files with 2401 additions and 478 deletions
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -250,8 +250,9 @@ class ActivityController extends Controller
        ])
        ->whereHas('userPenilai', function ($q) use ($id) {
            $q->where('user_id', $id);
-        })->whereHas('permohonan', function ($q) {
-            $q->where('status', 'assign');
+        })
+        ->whereHas('permohonan', function ($q) {
+            $q->whereIn('status', ['assign', 'proses-laporan', 'done']);
        });