summaryrefslogtreecommitdiff
path: root/includes/model/ShiftEntry_model.php
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-11-25 13:58:43 +0100
committermsquare <msquare@notrademark.de>2016-11-25 13:58:43 +0100
commit476d1daeb76306faf3ecd70f2afc8e29e98b9553 (patch)
tree9494376cc798f71aa89fbc49256ebfac39d2bf00 /includes/model/ShiftEntry_model.php
parentbae3ede662426d362a3b9d33d9124253af7e847b (diff)
fixes #280 shift entries finished by user returns no freeloaded shifts
Diffstat (limited to 'includes/model/ShiftEntry_model.php')
-rw-r--r--includes/model/ShiftEntry_model.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 99f67028..dca7e1c1 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -115,6 +115,7 @@ function ShiftEntries_finished_by_user($user) {
JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id`
WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . "
AND `Shifts`.`end` < " . sql_escape(time()) . "
+ AND `ShiftEntry`.`freeloaded` = 0
ORDER BY `Shifts`.`end`
");
}