Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-opw-583658-port-pna into lp:openerp-web/7.0

  1. 7.0-opw-583658-port-pna
  2. Merge into 7.0
Proposed by Pinakin Nayi (OpenERP)
Status: Rejected
Rejected by: Xavier (Open ERP)
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-583658-port-pna
Merge into: lp:openerp-web/7.0
Diff against target: 39 lines (+9/-6)
1 file modified
addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js (+9/-6)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-583658-port-pna
Reviewer Review Type Date Requested Status
Xavier (Open ERP) (community) Abstain
Review via email: mp+141893@code.launchpad.net

Description of the change

Hello,

I fixed issue in gantt view duration as it is misleading, it display wrong duration.

code is forward port from 6.1
Branch : http://bazaar.launchpad.net/~openerp/openerp-web/6.1/revision/2389

Thanks,
pna

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) :
review: Abstain
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

Apparently nobody can be arsed to review this branch, so closing it.

Unmerged revisions

3684. By Olivier Dony

[FIX]web_gantt: hide internal dhtmlx duration for tasks/phases, as it is misleading

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js'
2--- addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2012-01-27 13:35:08 +0000
3+++ addons/web_gantt/static/lib/dhtmlxGantt/sources/dhtmlxgantt.js 2013-01-04 11:07:35 +0000
4@@ -3139,9 +3139,10 @@
5 //data of task
6 var tblInfo = this.Chart.divInfo.lastChild;
7 tblInfo.rows[0].cells[0].innerHTML = "<div style='font-family: Arial, Helvetica, Sans-serif; font-size: 12px; font-weight: bold; color: #688060; margin: 0 0 4px 0;'>" + this.TaskInfo.Name + "</div>";
8- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>EST:&nbsp;</span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
9- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration:&nbsp;</span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
10- // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete:&nbsp;</span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
11+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Start Date:&nbsp;</span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
12+ // Hidden because currently misleading or unavailable:
13+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration:&nbsp;</span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
14+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete:&nbsp;</span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
15
16 //show predecessor task
17 if (this.predTask)
18@@ -3804,8 +3805,9 @@
19 var tblInfo = this.Chart.divInfo.lastChild;
20 tblInfo.rows[0].cells[0].innerHTML = "<div style='font-family: Arial, Helvetica, Sans-serif; font-size: 12px; font-weight: bold; color: #688060; margin:0 0 4px 0;'>" + this.Project.Name + "</div>";
21 tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Start Date:&nbsp;</span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
22- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration:&nbsp;</span><span class='ut'>" + this.Duration + " hours</span><br/>";
23- // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete:&nbsp;</span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
24+ // Hidden because currently misleading or unavailable:
25+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration:&nbsp;</span><span class='ut'>" + this.Duration + " hours</span><br/>";
26+ // tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete:&nbsp;</span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
27
28 this.Chart.divInfo.style.cssText = "z-index:2;position: absolute;display: inline;";
29
30@@ -4081,7 +4083,8 @@
31 taskItem.childNodes[1].firstChild.width = width + "px";
32
33 //resize info
34- this.cTaskItem[0].childNodes[1].firstChild.rows[0].cells[0].innerHTML = countHours;
35+ // Hidden because currently misleading:
36+ // this.cTaskItem[0].childNodes[1].firstChild.rows[0].cells[0].innerHTML = countHours;
37 taskItem.childNodes[2].childNodes[0].style.width = width + "px";
38 taskItem.childNodes[2].childNodes[1].style.left = width - 10 + "px";
39 };