Vidhin Mehta (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-opw-575725-port-vme into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-opw-575725-port-vme/+merge/135888
Gantt View tooltip transltion done with some library changes for trunk.
Back port from
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-opw-576557-msh/+merge/113732
branch,
thanks to Mohammed Shekha.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-opw-575725-port-vme/+merge/135888
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-opw-575725-port-vme.
=== 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 2012-11-23 12:33:29 +0000
@@ -414,6 +414,7 @@
this.shortMonthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
this.monthNames = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+ this.tooltip_label = {"start_date": "Start Date", "duration":"Duration","percent_complete": "Percent Complete","est": "EST", "predecessor_task": "Predecessor Task", "child_tasks": "Child Tasks", "parent_task": "Parent Task"};
this._useShortMonthNames = true;
dhtmlxEventable(this);
@@ -3139,14 +3140,16 @@
//data of task
var tblInfo = this.Chart.divInfo.lastChild;
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>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>EST: </span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>EST: </span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
// tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete: </span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
-
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['est']+": </span><span class='ut'>" + this.TaskInfo.EST.getDate() + "." + (this.TaskInfo.EST.getMonth() + 1) + "." + this.TaskInfo.EST.getFullYear() + "</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['duration']+": </span><span class='ut'>" + this.TaskInfo.Duration + " hours </span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['percent_complete']+": </span><span class='ut'>" + this.TaskInfo.PercentCompleted + "% </span><br/>";
//show predecessor task
if (this.predTask)
{
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Predecessor Task: </span>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['predecessor_task']+": </span>";
tblInfo.rows[0].cells[0].innerHTML += "<span class='lt'>*" + this.TaskInfo.PredecessorTask.Name + "</span>";
}
@@ -3161,7 +3164,7 @@
//show parent task
if (this.TaskInfo.ParentTask) {
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Parent Task: </span>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['parent_task']+": </span>";
tblInfo.rows[0].cells[0].innerHTML += "<span class='lt'>*" + this.TaskInfo.ParentTask.Name + "</span>";
}
@@ -3803,9 +3806,12 @@
var tblInfo = this.Chart.divInfo.lastChild;
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>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Start Date: </span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
- tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.Duration + " hours</span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Start Date: </span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Duration: </span><span class='ut'>" + this.Duration + " hours</span><br/>";
// tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>Percent Complete: </span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['start_date']+": </span><span class='ut'>" + this.Project.StartDate.getDate() + "." + (this.Project.StartDate.getMonth() + 1) + "." + this.Project.StartDate.getFullYear() + "</span><br/>";
+ tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['duration']+": </span><span class='ut'>" + this.Duration + " hours</span><br/>";
+ //tblInfo.rows[0].cells[0].innerHTML += "<span class='st'>"+this.Chart.tooltip_label['percent_complete']+": </span><span class='ut'>" + this.percentCompleted + "%</span><br/>";
this.Chart.divInfo.style.cssText = "z-index:2;position: absolute;display: inline;";
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-10-30 14:06:30 +0000
+++ addons/web_gantt/static/src/js/gantt.js 2012-11-23 12:33:29 +0000
@@ -165,6 +165,15 @@
}
}
var gantt = new GanttChart();
+ gantt.tooltip_label = {
+ "start_date": _t("Start Date"),
+ "duration": _t("Duration"),
+ "percent_complete": _t("Percent Complete"),
+ "est": _t("EST"),
+ "predecessor_task": _t("Predecessor Task"),
+ "child_tasks": _t("Child Tasks"),
+ "parent_task": _t("Parent Task")
+ };
_.each(_.compact(_.map(groups, function(e) {return generate_task_info(e, 0);})), function(project) {
gantt.addProject(project);
});
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
