diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2018-08-29 23:10:05 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2018-08-29 23:46:32 +0200 |
commit | 5456fea5031000a6325cdcae5f1e9d4c16b6ed50 (patch) | |
tree | b3cc057c232f21541e8ef35a506d54fb3060ef5a /includes/model | |
parent | e8f8fc7f5f5eba315290bc8d45348c3a4d4bee79 (diff) |
$bugfixes
Diffstat (limited to 'includes/model')
-rw-r--r-- | includes/model/Shifts_model.php | 4 | ||||
-rw-r--r-- | includes/model/User_model.php | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 94513ff3..cf6f5609 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -293,7 +293,9 @@ function Shift_free_entries($needed_angeltype, $shift_entries) $taken++; } } - return max(0, $needed_angeltype['count'] - $taken); + + $neededAngels = !empty($needed_angeltype) ? $needed_angeltype['count'] : 0; + return max(0, $neededAngels - $taken); } /** diff --git a/includes/model/User_model.php b/includes/model/User_model.php index d2498462..cbdb5efe 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -39,6 +39,10 @@ function User_tshirt_score($user) $user['UID'], time() ]); + if (!isset($result_shifts['tshirt_score'])) { + $result_shifts = ['tshirt_score' => 0]; + } + $result_worklog = DB::selectOne(' SELECT SUM(`work_hours`) AS `tshirt_score` FROM `User` @@ -49,6 +53,9 @@ function User_tshirt_score($user) $user['UID'], time() ]); + if (!isset($result_worklog['tshirt_score'])) { + $result_worklog = ['tshirt_score' => 0]; + } return $result_shifts['tshirt_score'] + $result_worklog['tshirt_score']; } |