From 7ce1aad7ecbbe66f99bd345fa6b0028e64b65386 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 25 Jan 2012 09:53:10 +0100 Subject: [IMP] terminate statements, remove extraneous statement terminations bzr revid: xmo@openerp.com-20120125085310-zzwjrll47n61hw8w --- addons/web_process/static/src/js/process.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_process/static/src') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 5bfd1d39587..150db955cf3 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -169,7 +169,7 @@ openerp.web_process = function (openerp) { // Node text process_node_text = r.text(n.node.x, n.node.y, (n.node.name)) .attr({"fill": "#fff", "font-weight": "bold", "cursor": "pointer"}); - process_node_text.translate((process_node.getBBox().width/ 2) + 5, 10) + process_node_text.translate((process_node.getBBox().width / 2) + 5, 10); if(n.node.subflow) { process_node_text.click(function() { self.process_id = n.node.subflow[0]; -- cgit v1.2.3 From b4e7377b540684ad793205b5580420b7f5c1de8d Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Mon, 30 Jan 2012 16:45:41 +0530 Subject: [FIX] state of current process. lp bug: https://launchpad.net/bugs/919175 fixed bzr revid: vda@tinyerp.com-20120130111541-6mpeb9253fzzk46c --- addons/web_process/static/src/js/process.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'addons/web_process/static/src') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 150db955cf3..fb745689a3c 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -28,6 +28,11 @@ openerp.web_process = function (openerp) { }, initialize_process_view: function() { var self = this; + this.record_id = false; + if(this.active_view == 'page' || this.active_view == 'form') { + this.record_id = this.views[this.active_view].controller.datarecord.id; + } + $.when(this.help(), this.get_process_object()).pipe(function(help, process) { self.process_help = help; if(process && process.length) { @@ -65,7 +70,7 @@ openerp.web_process = function (openerp) { this.process_id = parseInt(this.process_id, 10); this.process_dataset - .call("graph_get",[this.process_id, this.model || this.dataset.model, false, [80,80,150,100]]) + .call("graph_get",[this.process_id, this.model || this.dataset.model, this.record_id, [80,80,150,100]]) .done(function(res) { self.process_dataset .call("search_by_model",[self.model || self.dataset.model,self.session.context]) @@ -194,6 +199,10 @@ openerp.web_process = function (openerp) { to += from; } } + + if(n.node.res) + new_notes = n.node.res.name + '\n' + new_notes; + process_node_desc = r.text(n.node.x+85, n.node.y+50, (new_notes)); r['image']('/web/static/src/img/icons/gtk-info.png', n.node.x+20, n.node.y+70, 16, 16) .attr({"cursor": "pointer", "title": "Help"}) @@ -220,7 +229,7 @@ openerp.web_process = function (openerp) { node['res_model'] = self.model, node['res_id'] = false, node['id'] = node_id; - process_graph.addNode(node['name'], {node: node,render: process_renderer}); + process_graph.addNode(node.id, {node: node,render: process_renderer}); }); _.each(res['transitions'], function(transitions) { @@ -228,7 +237,7 @@ openerp.web_process = function (openerp) { var dst = res['nodes'][transitions['target']]; // make active transitions['active'] = src.active && !dst.gray; - process_graph.addEdge(src['name'], dst['name'], {directed : true}); + process_graph.addEdge(src.id, dst.id, {directed : true}); }); var width = $(document).width(); var height = $(document).height(); -- cgit v1.2.3 From f2ad8bd914fda1a81a871453e9b7ae8f9f4d9f7d Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Mon, 30 Jan 2012 17:07:45 +0530 Subject: [FIX] img of current state node. bzr revid: vda@tinyerp.com-20120130113745-fe7w9hhuenahhdx1 --- addons/web_process/static/src/js/process.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addons/web_process/static/src') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index fb745689a3c..a62c19160ec 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -162,6 +162,8 @@ openerp.web_process = function (openerp) { //Image part bg = n.node.kind == "subflow" ? "node-subflow" : "node"; bg = n.node.gray ? bg + "-gray" : bg; + bg = n.node.active ? 'node-current': bg; + img_src = '/web_process/static/src/img/'+ bg + '.png'; r['image'](img_src, n.node.x, n.node.y,150, 100) -- cgit v1.2.3 From a6c106365a0a1ea7d7e2b28a57f08d8d6dea259e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 31 Jan 2012 11:58:46 +0100 Subject: [REM] unused variables in process bzr revid: xmo@openerp.com-20120131105846-wvqyxko2lux2gwnj --- addons/web_process/static/src/js/process.js | 33 ++++++++++------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'addons/web_process/static/src') diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 75a8891fb6b..cd30dad1f13 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -4,7 +4,6 @@ openerp.web_process = function (openerp) { openerp.web.ViewManager.include({ start: function() { this._super(); - var self = this; this.process_check(); this.process_help = this.action ? this.action.help : 'Help: Not Defined'; this.model = this.dataset.model; @@ -83,8 +82,7 @@ openerp.web_process = function (openerp) { return def.promise(); }, help : function() { - var self = this, - def = $.Deferred(); + var def = $.Deferred(); if(!this.subflow_model) { def.resolve(this.action ? (this.action.help!=false ? this.action.help : 'Help: Not Defined') : 'Help: Not Defined'); } else { @@ -147,24 +145,14 @@ openerp.web_process = function (openerp) { var self = this, process_graph = new Graph(); var process_renderer = function(r, n) { - var process_node, - process_node_text, - process_node_desc, - process_set; - - var node_button, - node_menu, - img_src; - - var bg = "node", - clip_rect = "".concat(n.node.x,",",n.node.y,",150,100"); + var clip_rect = "".concat(n.node.x,",",n.node.y,",150,100"); //Image part - bg = n.node.kind == "subflow" ? "node-subflow" : "node"; + var bg = n.node.kind == "subflow" ? "node-subflow" : "node"; bg = n.node.gray ? bg + "-gray" : bg; bg = n.node.active ? 'node-current': bg; - img_src = '/web_process/static/src/img/'+ bg + '.png'; + var img_src = '/web_process/static/src/img/'+ bg + '.png'; r['image'](img_src, n.node.x, n.node.y,150, 100) .attr({"clip-rect": clip_rect}) @@ -172,9 +160,9 @@ openerp.web_process = function (openerp) { return false; }); //Node - process_node = r['rect'](n.node.x, n.node.y, 150, 100).attr({stroke: "none"}); + var process_node = r['rect'](n.node.x, n.node.y, 150, 100).attr({stroke: "none"}); // Node text - process_node_text = r.text(n.node.x, n.node.y, (n.node.name)) + var process_node_text = r.text(n.node.x, n.node.y, (n.node.name)) .attr({"fill": "#fff", "font-weight": "bold", "cursor": "pointer"}); process_node_text.translate((process_node.getBBox().width / 2) + 5, 10); if(n.node.subflow) { @@ -186,9 +174,10 @@ openerp.web_process = function (openerp) { }); } //Node Description - new_notes = n.node.notes; + var new_notes = n.node.notes; if(n.node.notes.length > 25) { - var new_notes= temp_str = ''; + var to; + var temp_str = new_notes = ''; var from = to = 0; while (1) { from = 25; @@ -205,7 +194,7 @@ openerp.web_process = function (openerp) { if(n.node.res) new_notes = n.node.res.name + '\n' + new_notes; - process_node_desc = r.text(n.node.x+85, n.node.y+50, (new_notes)); + r.text(n.node.x+85, n.node.y+50, (new_notes)); r['image']('/web/static/src/img/icons/gtk-info.png', n.node.x+20, n.node.y+70, 16, 16) .attr({"cursor": "pointer", "title": "Help"}) .click(function() { @@ -220,7 +209,7 @@ openerp.web_process = function (openerp) { }); } - process_set = r.set().push(process_node); + var process_set = r.set().push(process_node); process_set.mousedown(function() { return false; }); -- cgit v1.2.3