Merge lp:~openerp-dev/openerp-web/7.0-gantt-percent-chm6 into lp:openerp-web/7.0

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openerp-web/7.0-gantt-percent-chm6]

3670. By Christophe Matthieu (OpenERP) on 2013-01-02

[IMP] view gantt: model can use quantity_current attribute without the quantity_desired attribute

3671. By Christophe Matthieu (OpenERP) on 2013-01-02

[IMP] view gantt: change name of attribute 'quantity_current' into 'progress'

3672. By Christophe Matthieu (OpenERP) on 2013-01-02

[MERGE] from 7.0

[Thibault Delavallée (OpenERP) (tde-openerp)]

IMHO, the whole proposal (server/addons/web) are more related to a new feature than to bug fixing. The branches should be proposed for merging into trunk, not into 7.0.

However the IE fix should be merged into 7.0.

review: Disapprove

[Christophe Matthieu (OpenERP) (chm-openerp)]

OK, wait for 7.1

Unmerged revisions

3673. By Christophe Matthieu (OpenERP) on 2013-01-29

[MERGE] from 7.0

3672. By Christophe Matthieu (OpenERP) on 2013-01-02

[MERGE] from 7.0

3671. By Christophe Matthieu (OpenERP) on 2013-01-02

[IMP] view gantt: change name of attribute 'quantity_current' into 'progress'

3670. By Christophe Matthieu (OpenERP) on 2013-01-02

[IMP] view gantt: model can use quantity_current attribute without the quantity_desired attribute

3669. By Christophe Matthieu (OpenERP) on 2012-12-28

[IMP] gantt: no reset percent if there are no date_end

3668. By Christophe Matthieu (OpenERP) on 2012-12-28

[IMP] view gantt: add optional attribute in the gantt view: quantity_desired and quantity_current. when this values are set, the gantt view display the percent of completion.

3667. By Christophe Matthieu (OpenERP) on 2012-12-28

[IMP] view gant: dhtmlxgantt add a default minWidthResize param and set the value to one hour in place of one day

=== modified file 'addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js'
--- addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js	2012-01-27 13:35:08 +0000
+++ addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js	2013-01-02 13:51:23 +0000
@@ -386,6 +386,7 @@
 
     this.hourInPixelsWork = this.dayInPixels / this.hoursInDay;
     this.hourInPixels = this.dayInPixels / 24;
+    this.minWidthResize = this.hourInPixels;
     this.countDays = 0;
     this.startDate = null;
     this.initialPos = 0;
@@ -4812,7 +4813,7 @@
         childParentPosX = posChildTaskItem;
     }
 
-    this.minWidthResize = this.Chart.dayInPixels;
+    this.minWidthResize = this.Chart.minWidthResize;
 
     if (this.childTask.length > 0)
     {

=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js	2012-12-13 14:09:14 +0000
+++ addons/web_gantt/static/src/js/gantt.js	2013-01-02 13:51:23 +0000
@@ -44,7 +44,7 @@
             n_group_bys = group_bys;
         }
         // gather the fields to get
-        var fields = _.compact(_.map(["date_start", "date_delay", "date_stop"], function(key) {
+        var fields = _.compact(_.map(["date_start", "date_delay", "date_stop", "progress"], function(key) {
             return self.fields_view.arch.attrs[key] || '';
         }));
         fields = _.uniq(fields.concat(n_group_bys));
@@ -75,7 +75,7 @@
     on_data_loaded_2: function(tasks, group_bys) {
         var self = this;
         $(".oe_gantt", this.$el).html("");
-        
+
         //prevent more that 1 group by
         if (group_bys.length > 0) {
             group_bys = [group_bys[0]];
@@ -114,6 +114,11 @@
         var task_ids = {};
         // creation of the chart
         var generate_task_info = function(task, plevel) {
+            if (_.isNumber(task[self.fields_view.arch.attrs.progress])) {
+                var percent = task[self.fields_view.arch.attrs.progress] || 0;
+            } else {
+                var percent = 100;
+            }
             var level = plevel || 0;
             if (task.__is_group) {
                 var task_infos = _.compact(_.map(task.tasks, function(sub_task) {
@@ -128,7 +133,7 @@
                     return memo === undefined || date > memo ? date : memo;
                 }, undefined);
                 var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
-                var group_name = instance.web.format_value(task.name, self.fields[group_bys[level]]);
+                var group_name = task.name ? instance.web.format_value(task.name, self.fields[group_bys[level]]) : "-";
                 if (level == 0) {
                     var group = new GanttProjectInfo(_.uniqueId("gantt_project_"), group_name, task_start);
                     _.each(task_infos, function(el) {
@@ -136,7 +141,7 @@
                     });
                     return group;
                 } else {
-                    var group = new GanttTaskInfo(_.uniqueId("gantt_project_task_"), group_name, task_start, duration, 100);
+                    var group = new GanttTaskInfo(_.uniqueId("gantt_project_task_"), group_name, task_start, duration || 1, percent);
                     _.each(task_infos, function(el) {
                         group.addChildTask(el.task_info);
                     });
@@ -151,7 +156,7 @@
                 if (self.fields_view.arch.attrs.date_stop) {
                     task_stop = instance.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_stop]);
                     if (!task_stop)
-                        return;
+                        task_stop = task_start;
                 } else { // we assume date_duration is defined
                     var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
                         self.fields[self.fields_view.arch.attrs.date_delay]);
@@ -161,7 +166,7 @@
                 }
                 var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
                 var id = _.uniqueId("gantt_task_");
-                var task_info = new GanttTaskInfo(id, task_name, task_start, ((duration / 24) * 8), 100);
+                var task_info = new GanttTaskInfo(id, task_name, task_start, ((duration / 24) * 8) || 1, percent);
                 task_info.internal_task = task;
                 task_ids[id] = task_info;
                 return {task_info: task_info, task_start: task_start, task_stop: task_stop};
@@ -195,6 +200,8 @@
             $(rendered).prependTo(td);
             $(".oe_gantt_button_create", this.$el).click(this.on_task_create);
         }
+        // Fix for IE to display the content of gantt view.
+        this.$el.find(".oe_gantt td:first > div, .oe_gantt td:eq(1) > div > div").css("overflow", "");
     },
     on_task_changed: function(task_obj) {
         var self = this;