jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

handle negative duration (#1510)

Browse Source
This commit is contained in:
Kevin Papst
2020-03-01 13:46:37 +01:00
committed by GitHub
parent 72b73bc9a6
commit 8d3a305ec3
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/plugins/KimaiActiveRecordsDuration.js
View File

@@ -49,7 +49,7 @@ export default class KimaiActiveRecordsDuration extends KimaiPlugin {
const since = record.getAttribute('data-since');
const format = record.getAttribute('data-format');
const duration = this.formatDuration(since, format);
if (record.getAttribute('data-title') !== null) {
if (record.getAttribute('data-title') !== null && duration !== '?') {
durations.push(duration);
}
record.textContent = duration;
@@ -75,6 +75,10 @@ export default class KimaiActiveRecordsDuration extends KimaiPlugin {
let minutes = duration.minutes();
let seconds = duration.seconds();
if (hours < 0 || minutes < 0 || seconds < 0) {
return '?';
}
// special case for hours, as they can overflow the 24h barrier - Kimai does not support days as duration unit
if (hours.length === 1) {
hours = '0' + hours;