extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP timesheet timers: round duration and total time to full minutes

Browse Source 
done because our UI only shows full minutes
This commit is contained in:
ralf 2022-10-13 17:37:34 +02:00
parent 69ce014aa6
commit 383dfb9a04
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timesheet/src/Events.php
View File

@ -265,6 +265,10 @@ class Events extends Api\Storage\Base
/** /**
* Evaluate events * Evaluate events
* *
* Returned time and offset/duration are always rounded to full minutes, independent of their actual unit!
* This is done, as we only show full minutes in the UI, and we want to avoid seconds in timestamps
* leading to unexpected results in the minutes display.
*
* @param array& $timer array with keys 'start', 'offset' and 'paused' * @param array& $timer array with keys 'start', 'offset' and 'paused'
* @param array $row * @param array $row
* @return int? time in ms for stop or pause events, null for start * @return int? time in ms for stop or pause events, null for start
@ -278,7 +282,7 @@ class Events extends Api\Storage\Base
} }
elseif ($timer['start']) elseif ($timer['start'])
{ {
$timer['offset'] += $time = 1000 * ($row['tse_time']->getTimestamp() - $timer['start']->getTimestamp()); $timer['offset'] += $time = 60000 * round(($row['tse_time']->getTimestamp() - $timer['start']->getTimestamp())/60);
$timer['start'] = null; $timer['start'] = null;
$timer['paused'] = ($row['tse_type'] & self::PAUSE) === self::PAUSE; $timer['paused'] = ($row['tse_type'] & self::PAUSE) === self::PAUSE;
} }