diff options
author | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
---|---|---|
committer | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
commit | 7af09433def2fda9ec47b12823b16e3392b5f6cf (patch) | |
tree | 5ee8e0fdf80cd92609263d28e9ae6e6bc3efeea7 /includes/model/User_model.php | |
parent | 7f722314e4fc21419552ec27eb91e6f7e6347b71 (diff) | |
parent | ddadaada9dc1bd288c82da840a4c4f02767d3e43 (diff) |
Merge branch 'master' of https://github.com/engelsystem/engelsystem
Diffstat (limited to 'includes/model/User_model.php')
-rw-r--r-- | includes/model/User_model.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/includes/model/User_model.php b/includes/model/User_model.php index fa24aac1..5a31e7b8 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -26,7 +26,7 @@ function User_delete($user_id) function User_tshirt_score($user) { $shift_sum_formula = config('shift_sum_formula'); - $result = DB::selectOne(' + $result_shifts = DB::selectOne(' SELECT ROUND((' . $shift_sum_formula . ') / 3600, 2) AS `tshirt_score` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` @@ -37,8 +37,18 @@ function User_tshirt_score($user) { $user['UID'], time() ]); + $result_worklog = DB::selectOne(' + SELECT SUM(`work_hours`) AS `tshirt_score` + FROM `User` + LEFT JOIN `UserWorkLog` ON `User`.`UID` = `UserWorkLog`.`user_id` + WHERE `User`.`UID` = ? + AND `UserWorkLog`.`work_timestamp` < ? + ',[ + $user['UID'], + time() + ]); - return $result['tshirt_score']; + return $result_shifts['tshirt_score'] + $result_worklog['tshirt_score']; } /** |