odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed DATA_ERROR, dhtmlx is not supported datetime formate, Then when render parent task it reduce the hours. 

bzr revid: sma@tinyerp.com-20110715130540-y7par5uca2xxmlpp
This commit is contained in:
sma (Tiny) 2011-07-15 18:35:40 +05:30
parent 22f73d68e6
commit 344a48ab55
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/base_gantt/static/src/js/gantt.js
View File

@ -246,7 +246,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
for (i in all_events){
res = all_events[i];
if ((typeof(res['evt'][3])) == "object"){
res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3]);
res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true);
}
k = res['evt'][0].toString().indexOf('_');
@ -356,14 +356,14 @@ init: function(view_manager, session, element_id, dataset, view_id) {
return dat;
},
hours_between: function(date1, date2) {
hours_between: function(date1, date2, parent_task) {
var ONE_DAY = 1000 * 60 * 60 * 24;
var date1_ms = date1.getTime();
var date2_ms = date2.getTime();
var difference_ms = Math.abs(date1_ms - date2_ms);
d = Math.floor(difference_ms / ONE_DAY);
d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY);
h = (difference_ms % ONE_DAY)/(1000 * 60 * 60);
num = (d * this.day_length) + h;
return parseFloat(num.toFixed(2));