metrics: Fix users stats

6 years ago · 26f58b8156
parent 31d9efb2b8
commit 26f58b8156
1 changed files with 3 additions and 2 deletions
--- a/src/Controllers/Metrics/Stats.php
+++ b/src/Controllers/Metrics/Stats.php
@ -37,7 +37,7 @@ class Stats
            $query
                ->leftJoin('UserWorkLog', 'UserWorkLog.user_id', '=', 'users.id')
                ->leftJoin('ShiftEntry', 'ShiftEntry.UID', '=', 'users.id')
-                ->groupBy('users.id');
+                ->distinct();

            $query->where(function ($query) use ($working) {
                /** @var QueryBuilder $query */
@ -48,6 +48,7 @@ class Stats

                    return;
                }
+
                $query
                    ->whereNull('ShiftEntry.SID')
                    ->whereNull('UserWorkLog.work_hours');
@ -56,7 +57,7 @@ class Stats
        }

        return $query
-            ->count();
+            ->count('users.id');
    }

    /**