diff options
| author | leaneb <lea-e@bluewin.ch> | 2016-11-26 11:39:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-26 11:39:47 +0100 |
| commit | e1cc80ec411d63a4a309fa76a53776c80c10e6f7 (patch) | |
| tree | 01753d802435861ebd7c0624bb7050cf24e8c24d /includes/model/Shifts_model.php | |
| parent | 67df8da061f74322863354490409666eb87935b0 (diff) | |
| parent | 561e8ec36c50b2ace9fe7352dfb4e11f57d0e82e (diff) | |
Merge pull request #2 from engelsystem/master
Merge Changes from esys Master to own Repo
Diffstat (limited to 'includes/model/Shifts_model.php')
| -rw-r--r-- | includes/model/Shifts_model.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 2db0a3d3..b1d4ca5e 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -261,9 +261,12 @@ function Shift_create($shift) { /** * Return users shifts. */ -function Shifts_by_user($user) { +function Shifts_by_user($user, $include_freeload_comments = false) { $result = sql_select(" - SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.* + SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, + `ShiftEntry`.`id`, `ShiftEntry`.`SID`, `ShiftEntry`.`TID`, `ShiftEntry`.`UID`, `ShiftEntry`.`freeloaded`, `ShiftEntry`.`Comment`, + " . ($include_freeload_comments ? "`ShiftEntry`.`freeload_comment`, " : "") . " + `Shifts`.*, `Room`.* FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) |