diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 83d30e9..b80617b 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -293,7 +293,23 @@ function holidays()
 
 function countPermohonanForUser($userId)
 {
-    $validStatuses = ['assign', 'proses-laporan', 'done'];
+    $validStatuses = [
+        'assign',
+        'survey-completed',
+        'proses-laporan',
+        'paparan',
+        'proses-paparan',
+        'revisi-laporan',
+        'revisi-paparan',
+        'survey',
+        'proses-survey',
+        'request-reschedule',
+        'reschedule',
+        'rejected-reschedule',
+        'approved-reschedule',
+        'revisi-survey',
+        'revisi-pembayaran'
+    ];
 
     $result = Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
         $query->where('user_id', $userId);
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 22105b6..8670fe3 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -392,7 +392,23 @@ class ActivityController extends Controller
             $q->where('user_id', $id);
         })
         ->whereHas('permohonan', function ($q) {
-            $q->whereNotIn('status', ['done']);
+            $q->whereIn('status', [
+                'assign',
+                'survey-completed',
+                'proses-laporan',
+                'paparan',
+                'proses-paparan',
+                'revisi-laporan',
+                'revisi-paparan',
+                'survey',
+                'proses-survey',
+                'request-reschedule',
+                'reschedule',
+                'rejected-reschedule',
+                'approved-reschedule',
+                'revisi-survey',
+                'revisi-pembayaran'
+            ]);
         });