Merge branch 'spidev' into 'master'
Zeiterfassung Bugfix Zeiterfassung See merge request fronk/thetool!1313
This commit is contained in:
@@ -239,6 +239,14 @@ class TimerecordingController extends mfBaseController
|
||||
$return['hours'] = $isTime25;
|
||||
$return['hours_overtime'] = $isTime50;
|
||||
}
|
||||
|
||||
if ($return['hours_overtime'] && $return['hours_overtime'] > $overtime) {
|
||||
$excess = $return['hours_overtime'] - $overtime;
|
||||
$return['hours_overtime'] = $overtime;
|
||||
// überschüssige Sekunden 1:1 zu normalen Stunden
|
||||
$return['hours'] += $excess * 1.5;
|
||||
}
|
||||
|
||||
if ($ajax == 1) {
|
||||
if ($r->ajax == 1) {
|
||||
if ($isTime < 0) {
|
||||
|
||||
Reference in New Issue
Block a user