Merge pull request #3724 from ColoredCow/fix/active-clients-count

Fix active clients count

app/Services/EmployeeService.php

@@ -12,7 +12,7 @@ public function index($filters = [])
             ->leftJoin('project_team_members', 'employees.user_id', '=', 'project_team_members.team_member_id')
             ->leftJoin('projects', 'project_team_members.project_id', '=', 'projects.id')
             ->leftJoin('clients', 'projects.client_id', '=', 'clients.id')
-            ->selectRaw('employees.*, team_member_id, count(case when projects.status = "active" and project_team_members.ended_on is null then 1 else null end) as active_project_count, count(distinct case when clients.status = "active" and project_team_members.ended_on is null then clients.id else null end) as active_clients_count')
+            ->selectRaw('employees.*, team_member_id, count(case when projects.status = "active" and project_team_members.ended_on is null then 1 else null end) as active_project_count, count(distinct case when clients.status = "active" and projects.status = "active" and project_team_members.ended_on is null then clients.id else null end) as active_clients_count')
             ->groupBy('employees.user_id')
             ->orderby('active_project_count', 'desc')
             ->get();