Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocalculation of timespent in monthy mode

Browse Source
This commit is contained in:
Laurent Destailleur
2020-03-23 22:04:40 +01:00
parent 063cf15bcb
commit f56de9f177
3 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,11 @@ function updateTotal(days,mode)
total.setHours(0);
total.setMinutes(0);
var nbline = document.getElementById('numberOfLines').value;
for (var i=-1; i<nbline; i++)
var startline = 0;
if (document.getElementById('numberOfFirstLine')) {
startline = parseInt(document.getElementById('numberOfFirstLine').value);
}
for (var i=-1; i < nbline; i++)
{
var id='timespent['+i+']['+days+']';
var taskTime= new Date(0);
@@ -213,17 +217,27 @@ function updateTotal(days,mode)
console.log(total.getMinutes())
}
});
if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+days).addClass("bold");
else jQuery('.totalDay'+days).removeClass("bold");
jQuery('.totalDay'+days).text(pad(total.getHours())+':'+pad(total.getMinutes()));
var stringdays = days;
if (startline >= 1 && startline <= 9 && stringdays < 10) {
stringdays = '0'+stringdays;
}
if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+stringdays).addClass("bold");
else jQuery('.totalDay'+stringdays).removeClass("bold");
jQuery('.totalDay'+stringdays).text(pad(total.getHours())+':'+pad(total.getMinutes()));
var totalhour = 0;
var totalmin = 0;
for (var i=0; i<7; i++)
{
stringdays = (i + startline);
if (startline >= 1 && startline <= 9 && stringdays < 10) {
stringdays = '0'+stringdays;
}
var taskTime= new Date(0);
result=parseTime(jQuery('.totalDay'+i).text(),taskTime);
result=parseTime(jQuery('.totalDay'+stringdays).text(),taskTime);
if (result >= 0)
{
totalhour = totalhour + taskTime.getHours();
@@ -273,8 +287,14 @@ function updateTotal(days,mode)
}
}
if (total) jQuery('.totalDay'+days).addClass("bold");
else jQuery('.totalDay'+days).removeClass("bold");
jQuery('.totalDay'+days).text(total);
var stringdays = days;
if (startline >= 1 && startline <= 9 && stringdays < 10) {
stringdays = '0'+stringdays;
console.log(stringdays);
}
if (total) jQuery('.totalDay'+stringdays).addClass("bold");
else jQuery('.totalDay'+stringdays).removeClass("bold");
jQuery('.totalDay'+stringdays).text(total);
}
}