diff options
Diffstat (limited to 'includes/model/User_model.php')
| -rw-r--r-- | includes/model/User_model.php | 6 |
1 files 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'], |