Merge branch 'pu/pm/HrWtrLimitWorkingTimeMaxDuration' into '2022.11'

fix(HR WTR) fixed limitWorkingTime BL max duration See merge request tine20/tine20!3700
tine20 · Apr 12, 2023 · 1dc3847 · 1dc3847
2 parents fc6a076 + 7fd8183
commit 1dc3847
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tine20/HumanResources/BL/DailyWTReport/LimitWorkingTime.php b/tine20/HumanResources/BL/DailyWTReport/LimitWorkingTime.php
@@ -6,7 +6,7 @@
  * @subpackage  BL
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Paul Mehrer <p.mehrer@metaways.de>
- * @copyright   Copyright (c) 2019-2022 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2019-2023 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -120,8 +120,9 @@ protected function _checkMaxDuration(HumanResources_BL_DailyWTReport_Data $_data
             $duration += $timeSlot->end->getTimestamp() - $timeSlot->start->getTimestamp();
 
             if ($duration > $maxDuration) {
-                if ($maxDuration - $duration !== $timeSlot->end->getTimestamp() - $timeSlot->start->getTimestamp()) {
-                    $timeSlot->end->subSecond($maxDuration - $duration);
+                $diff = $duration - $maxDuration;
+                if ($diff !== $timeSlot->end->getTimestamp() - $timeSlot->start->getTimestamp()) {
+                    $timeSlot->end->subSecond($diff);
                     if (!next($_data->timeSlots)) {
                         return;
                     }

diff --git a/tine20/HumanResources/Model/BLDailyWTReport/LimitWorkingTimeConfig.php b/tine20/HumanResources/Model/BLDailyWTReport/LimitWorkingTimeConfig.php
@@ -6,7 +6,7 @@
  * @subpackage  Model
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Paul Mehrer <p.mehrer@metaways.de>
- * @copyright   Copyright (c) 2019-2022 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2019-2023 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -63,6 +63,7 @@ class HumanResources_Model_BLDailyWTReport_LimitWorkingTimeConfig extends Tineba
             ],
             self::FLDS_MAX_DURATION     => [
                 self::TYPE                  => self::TYPE_INTEGER,
+                self::SPECIAL_TYPE          => self::SPECIAL_TYPE_DURATION_SEC,
                 self::LABEL                 => 'Maximum duration', // _('Maximum duration')
                 self::VALIDATORS            => [Zend_Filter_Input::ALLOW_EMPTY => true],
             ],