fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG-12339 Al crear un report table el sistema direcciona a una lista... SOLVED

Browse Source 
- No se diferenciaba desde que listado se llamaba a la creacion de un report table.

- Se agrego un flag PROCESSMAP que indica que se esta utilizando desde el processmap.
This commit is contained in:
Marco Antonio Nina
2013-07-11 11:56:41 -04:00
parent c8fc67ca73
commit b4b47d0bb6
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/js/maborak/core/maborak.loader.js
View File

@@ -814,7 +814,7 @@ else
{this.panels.buildingBlocks.clearContent();}
var bbk={outputs:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_OUTPUT_DOCUMENTS)
panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=outputs&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();processmapOutputsPanel=panel;}.extend(this),inputs:function()
{var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_INPUT_DOCUMENTS);panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=inputs&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),triggers:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_TRIGGERS);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=triggers&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),messages:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_MESSAGES);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=messages&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),reportTables2:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_REPORT_TABLES);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=reportTables&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),reportTables:function(){var url="../pmTables?PRO_UID="+this.options.uid;var isIE=(navigator.userAgent.toLowerCase().indexOf("msie")!=-1)?1:0;if(isIE==1){this.panels.buildingBlocks.remove();var w=screen.width-150;var h=screen.height-300;var windowAux=window.open(url,"reportTable","width="+w+", height="+h+", resizable=no, toolbar=no, menubar=no, scrollbars=yes, status=no, location=no, left="+((screen.width/2)-(w/2))+", top="+((screen.height/2)-(h/2)+50));}else{var panel=this.panels.buildingBlocks;panel.addContentTitle("");panel.clearContent();var iframe=document.createElement("iframe");iframe.setAttribute("id","reportTablesIframe");iframe.src=url;iframe.frameBorder=0;iframe.style.width=_client.width-40;iframe.style.height=_client.height-70;panel.addContent(iframe);}}.extend(this),dynaforms:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_DYNAFORMS);panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=dynaforms&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this)
{var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_INPUT_DOCUMENTS);panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=inputs&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),triggers:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_TRIGGERS);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=triggers&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),messages:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_MESSAGES);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=messages&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),reportTables2:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_PROCESSMAP_REPORT_TABLES);panel.clearContent();panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=reportTables&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this);r.make();}.extend(this),reportTables:function(){var url="../pmTables?PRO_UID="+this.options.uid+"&PROCESSMAP=1";var isIE=(navigator.userAgent.toLowerCase().indexOf("msie")!=-1)?1:0;if(isIE==1){this.panels.buildingBlocks.remove();var w=screen.width-150;var h=screen.height-300;var windowAux=window.open(url,"reportTable","width="+w+", height="+h+", resizable=no, toolbar=no, menubar=no, scrollbars=yes, status=no, location=no, left="+((screen.width/2)-(w/2))+", top="+((screen.height/2)-(h/2)+50));}else{var panel=this.panels.buildingBlocks;panel.addContentTitle("");panel.clearContent();var iframe=document.createElement("iframe");iframe.setAttribute("id","reportTablesIframe");iframe.src=url;iframe.frameBorder=0;iframe.style.width=_client.width-40;iframe.style.height=_client.height-70;panel.addContent(iframe);}}.extend(this),dynaforms:function(){var panel=this.panels.buildingBlocks;panel.addContentTitle(G_STRINGS.ID_DYNAFORMS);panel.loader.show();var r=new this.parent.module.rpc.xmlhttp({url:this.options.dataServer,args:"action=dynaforms&data="+{pro_uid:this.options.uid}.toJSONString()});r.callback=function(rpc){panel.loader.hide();var scs=rpc.xmlhttp.responseText.extractScript();panel.addContent(rpc.xmlhttp.responseText);scs.evalScript();this.buildLoading=false;}.extend(this)
r.make();}.extend(this)};bbk[lanzado]();},panel:function()
{var panel;panel=this.panels.toolbar=new leimnud.module.panel();this.panels.toolbar.options={limit:true,size:{w:220,h:31},position:{x:this.options.target.clientWidth-278,y:4},title:"",theme:"processmaker",target:this.options.target,titleBar:false,statusBar:false,elementToDrag:"content",cursorToDrag:"default",control:{drag:true,resize:false},fx:{opacity:true,shadow:false}};panel.setStyle={containerWindow:{border:"1px solid buttonshadow"},frontend:{backgroundColor:"buttonface"},content:{border:"1px solid transparent",backgroundColor:"transparent",margin:0,overflow:"hidden",padding:1}};this.panels.toolbar.make();var div=document.createElement("div");this.parent.dom.setStyle(div,{textAlign:"center"});var dr1=document.createElement("img");dr1.src=this.options.images_dir+"0.gif";dr1.title=_("ID_PROCESSMAP_SEQUENTIAL");div.appendChild(dr1);var dr2=document.createElement("img");dr2.src=this.options.images_dir+"1.gif";dr2.title=_("ID_PROCESSMAP_SELECTION");div.appendChild(dr2);var dr3=document.createElement("img");dr3.src=this.options.images_dir+"2.gif";dr3.title=_("ID_PROCESSMAP_EVALUATION");div.appendChild(dr3);var dr4=document.createElement("img");dr4.src=this.options.images_dir+"3.gif";dr4.title=_("ID_PROCESSMAP_PARALLEL_FORK");div.appendChild(dr4);var dr5=document.createElement("img");dr5.src=this.options.images_dir+"4.gif";dr5.title=_("ID_PROCESSMAP_PARALLEL_EVALUATION_FORK");div.appendChild(dr5);var dr6=document.createElement("img");dr6.src=this.options.images_dir+"5.gif";dr6.title=_("ID_PROCESSMAP_PARALLEL_JOIN");div.appendChild(dr6);var fin=document.createElement("img");fin.src=this.options.images_dir+"6.gif";fin.title=_("ID_END_OF_PROCESS");div.appendChild(fin);var ini=document.createElement("img");ini.src=this.options.images_dir+"7.gif";ini.title=_("ID_START_TASK");div.appendChild(ini);[dr1,dr2,dr3,dr4,dr5,dr6,fin,ini].map(function(el){el.className="processmap_toolbarItem___"+this.options.theme}.extend(this));this.dragables.derivation=new this.parent.module.drag({elements:[dr1,dr2,dr3,dr4,dr5,dr6,fin,ini],fx:{type:"clone",target:this.panels.editor.elements.content,zIndex:11}});this.dragables.derivation.typesDerivation=["simple","double","conditional","conditional1","conditional2","conditional3","final","initial"];this.dragables.derivation.events={init:[function(){this.dragables.derivation.noDrag=true;}.extend(this)],move:this.dropables.derivation.capture.args(this.dragables.derivation),finish:this.parent.closure({instance:this,method:function(){this.parent.dom.remove(this.dropables.derivation.drag||this.dragables.derivation.currentElementDrag);this.parent.dom.remove(this.dragables.derivation.currentElementDrag);if(this.dropables.derivation.selected!==false)
{this.dropables.derivation.launchEvents(this.dropables.derivation.elements[this.dropables.derivation.selected].events.out);vAux=this.dropables.derivation.launchEvents(this.dropables.derivation.elements[this.dropables.derivation.selected].events.click);this.dropables.derivation.selected=false;return vAux;}

2
workflow/engine/controllers/pmTables.php
View File

@@ -36,6 +36,7 @@ class pmTables extends Controller
$this->setView( 'pmTables/list' );
//assigning js variables
$this->setJSVar( 'PROCESSMAP', (isset($_REQUEST['PROCESSMAP'])) ? $_REQUEST['PROCESSMAP'] : 0);
$this->setJSVar( 'FORMATS', $c->getFormats() );
$this->setJSVar( 'CONFIG', $Config );
$this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
@@ -102,6 +103,7 @@ class pmTables extends Controller
$this->includeExtJS( 'pmTables/' . $jsFile );
$this->setJSVar( 'PROCESSMAP', (isset($_REQUEST['PROCESSMAP'])) ? $_REQUEST['PROCESSMAP'] : 0);
$this->setJSVar( 'ADD_TAB_UID', $addTabUid );
$this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
$this->setJSVar( 'TABLE', $table );

2
workflow/engine/js/processmap/core/processmap.js
View File

@@ -157,7 +157,7 @@ var processmap=function(){
r.make();
}.extend(this),
reportTables:function(){
var url = "../pmTables?PRO_UID=" + this.options.uid;
var url = "../pmTables?PRO_UID=" + this.options.uid+"&PROCESSMAP=1";
var isIE = (navigator.userAgent.toLowerCase().indexOf("msie") != -1)? 1 : 0;
if (isIE == 1) {

6
workflow/engine/templates/pmTables/editReport.js
View File

@@ -936,8 +936,8 @@ Ext.onReady(function(){
}, {
text:_("ID_CANCEL"),
handler: function() {
proParam = PRO_UID !== false ? '?PRO_UID='+PRO_UID : '';
location.href = '../pmTables' + proParam; //history.back();
proParam = (typeof('PROCESSMAP') != 'undefined' && PROCESSMAP == 1) ? (PRO_UID !== false ? '?PROCESSMAP=1&PRO_UID='+PRO_UID : '') : '';
location.href = '../pmTables' + proParam; //history.back();
}
}]
});
@@ -1087,7 +1087,7 @@ function createReportTable()
Ext.MessageBox.hide();
if (result.success) {
proParam = PRO_UID !== false ? '?PRO_UID='+PRO_UID : '';
proParam = (typeof('PROCESSMAP') != 'undefined' && PROCESSMAP == 1) ? (PRO_UID !== false ? '?PROCESSMAP=1&PRO_UID='+PRO_UID : '') : '';
location.href = '../pmTables' + proParam; //history.back();
} else {
PMExt.error(_('ID_ERROR'), result.type +': '+result.msg);

12
workflow/engine/templates/pmTables/list.js
View File

@@ -413,11 +413,13 @@ capitalize = function(s){
DoNothing = function(){};
//Load New PM Table Forms
NewReportTable = function(){
if(PRO_UID !== false)
location.href = 'pmTables/edit?PRO_UID='+PRO_UID+'&tableType=report';
else
location.href = 'pmTables/edit?tableType=report';
NewReportTable = function() {
var processmap = (typeof('PROCESSMAP') != 'undefined') ? PROCESSMAP : 0;
if(PRO_UID !== false) {
location.href = 'pmTables/edit?PRO_UID='+PRO_UID+'&tableType=report&PROCESSMAP='+processmap;
} else {
location.href = 'pmTables/edit?tableType=report&PROCESSMAP='+processmap;
}
};
NewReportTableOld = function(){