diff options
author | Philip Häusler <msquare@notrademark.de> | 2014-12-17 17:22:35 +0100 |
---|---|---|
committer | Philip Häusler <msquare@notrademark.de> | 2014-12-17 17:22:35 +0100 |
commit | a791a75b0a893308f35865542149c77f8761b3a0 (patch) | |
tree | 15635291aea7fe4d0b94a761bef885abcad708b0 /includes/model/ShiftEntry_model.php | |
parent | 634a3739b25bc5167c084b431c931d6d60944a1d (diff) |
integrate shift type into shifts
Diffstat (limited to 'includes/model/ShiftEntry_model.php')
-rw-r--r-- | includes/model/ShiftEntry_model.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index e1f0cd2e..5129f15a 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -76,7 +76,8 @@ function ShiftEntries_upcoming_for_user($user) { return sql_select(" SELECT * FROM `ShiftEntry` - JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID` + JOIN `Shifts` ON (`Shifts`.`SID` = `ShiftEntry`.`SID`) + JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . " AND `Shifts`.`end` > " . sql_escape(time()) . " ORDER BY `Shifts`.`end` |