Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX : Total per day shows 00:00 if the total time spent is equal to 12:00

Browse Source
This commit is contained in:
ATM-Nicolas
2019-04-15 11:38:49 +02:00
parent 6cd24ab210
commit 93365addd1
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/js/timesheet.js
View File

@@ -91,17 +91,11 @@ function parseTime(timeStr, dt)
dt = new Date(); dt = new Date();
} }
var time = timeStr.match(/(\d+)(?::(\d\d))?\s*(p?)/i); var time = timeStr.match(/(\d+)(?::(\d\d))?/i);
if (!time) { if (!time) {
return -1; return -1;
} }
var hours = parseInt(time[1], 10); var hours = parseInt(time[1], 10);
if (hours == 12 && !time[3]) {
hours = 0;
}
else {
hours += (hours < 12 && time[3]) ? 12 : 0;
}
dt.setHours(hours); dt.setHours(hours);
dt.setMinutes(parseInt(time[2], 10) || 0); dt.setMinutes(parseInt(time[2], 10) || 0);