From 26f58b8156324f09f5fc24680b45b844f6998fd6 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Tue, 25 Dec 2018 20:56:46 +0100 Subject: metrics: Fix users stats --- src/Controllers/Metrics/Stats.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Controllers/Metrics/Stats.php b/src/Controllers/Metrics/Stats.php index 11643e46..c841be10 100644 --- 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'); } /** -- cgit v1.2.3-54-g00ecf