From 83aaefec5b281d666f042bd1813b912ec8463a6a Mon Sep 17 00:00:00 2001 From: cpa-openerp Date: Thu, 9 Jun 2011 15:27:05 +0530 Subject: [PATCH] [IMP] Set default group by from xml when no group by is selected. bzr revid: cpa@tinyerp.com-20110609095705-x3pobn8zdle44luk --- addons/base_gantt/static/src/js/gantt.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 9ca449f910e..b6c103a4fbb 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -160,6 +160,10 @@ init: function(view_manager, session, element_id, dataset, view_id) { if (duration == false) duration = 0 + if (self.grp.length == 0){ + self.grp.push({'group_by' : this.parent}) + } + if (self.grp != undefined){ for (j in self.grp){ var grp_key = res[self.grp[j]['group_by']]; @@ -220,7 +224,7 @@ init: function(view_manager, session, element_id, dataset, view_id) { var evt_date = ""; var evt_duration = ""; var evt_end_date = ""; - + for (i in final_events){ evt_id = final_events[i]; evt_date = all_events[evt_id]['evt'][2]; @@ -253,7 +257,6 @@ init: function(view_manager, session, element_id, dataset, view_id) { prt = project.getTaskById(res['parent']); prt.addChildTask(task); } - } ganttChartControl.create("GanttDiv"); @@ -286,10 +289,10 @@ init: function(view_manager, session, element_id, dataset, view_id) { var date2_ms = date2.getTime(); var difference_ms = Math.abs(date1_ms - date2_ms); - d = Math.round(difference_ms / ONE_DAY); - h = Math.round((difference_ms % ONE_DAY)/(1000 * 60 * 60)); - - return (d * this.day_length) + h; + d = 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)); },