From 794df6f99e9e24a605dbe3998cf5d67b5bc8c4d9 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Thu, 27 Dec 2018 19:53:48 +0100
Subject: fixes #548: users with only worklog and no shifts had 0 minutes on
 admin-active. query fixed

---
 includes/model/User_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 8a7ee517..d47b2915 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -262,11 +262,11 @@ function User_get_shifts_sum_query()
 {
     $nightShifts = config('night_shifts');
     if (!$nightShifts['enabled']) {
-        return 'SUM(`end` - `start`)';
+        return 'COALESCE(SUM(`end` - `start`), 0)';
     }
 
     return sprintf('
-            SUM(
+            COALESCE(SUM(
                 (1 +
                     (
                       (HOUR(FROM_UNIXTIME(`Shifts`.`end`)) > %1$d AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) < %2$d)
@@ -276,7 +276,7 @@ function User_get_shifts_sum_query()
                 )
                 * (`Shifts`.`end` - `Shifts`.`start`)
                 * (1 - (%3$d + 1) * `ShiftEntry`.`freeloaded`)
-            )
+            ), 0)
         ',
         $nightShifts['start'],
         $nightShifts['end'],
-- 
cgit v1.2.3-54-g00ecf