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

fix(so): perbaikan team activity total task

Browse Source
This commit is contained in:
majid
2025-03-05 23:04:04 +07:00
parent 50029c6b07
commit 3f3c384f9a
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Helpers/Lpj.php
View File

@@ -293,7 +293,23 @@ function holidays()
function countPermohonanForUser($userId) 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) { $result = Penilaian::whereHas('userPenilai', function ($query) use ($userId) {
$query->where('user_id', $userId); $query->where('user_id', $userId);

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

@@ -392,7 +392,23 @@ class ActivityController extends Controller
$q->where('user_id', $id); $q->where('user_id', $id);
}) })
->whereHas('permohonan', function ($q) { ->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'
]);
}); });