fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 0000 Conditional Events feature

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2011-08-01 12:02:14 -04:00
parent c283b77222
commit 5ce46a00fe
2 changed files with 105 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/model/Event.php
View File

@@ -709,7 +709,8 @@ class Event extends BaseEvent {
$oCriteria->addSelectColumn(EventPeer::EVN_ACTION_PARAMETERS); $oCriteria->addSelectColumn(EventPeer::EVN_ACTION_PARAMETERS);
$oCriteria->addSelectColumn(EventPeer::TRI_UID); $oCriteria->addSelectColumn(EventPeer::TRI_UID);
$oCriteria->add(EventPeer::EVN_STATUS, 'ACTIVE' ); $oCriteria->add(EventPeer::EVN_STATUS, 'ACTIVE');
$oCriteria->add(EventPeer::EVN_ACTION, '', Criteria::NOT_EQUAL);
foreach($aFilers as $sFilter=>$sValue){ foreach($aFilers as $sFilter=>$sValue){
switch($sFilter){ switch($sFilter){
case 'TAS_UID': case 'TAS_UID':

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

@@ -731,69 +731,105 @@ var processmap=function(){
r.make(); r.make();
}.extend(this)}, }.extend(this)},
*/ */
{image:"/images/event_messageThrow.png",text:"intermediate message event",launch:function(event){ {
this.tmp.eventsPanel = panel =new leimnud.module.panel(); image:"/images/event_messageThrow.png",text:"intermediate message event",launch:function(event){
panel.options={ this.tmp.eventsPanel = panel =new leimnud.module.panel();
limit :true, panel.options={
size :{w:700,h:380}, limit :true,
position:{x:50,y:50,center:true}, size :{w:700,h:380},
title :G_STRINGS.ID_EVENT_MESSAGE, position:{x:50,y:50,center:true},
theme :this.options.theme, title :G_STRINGS.ID_EVENT_MESSAGE,
control :{close:true,resize:false},fx:{modal:true}, theme :this.options.theme,
statusBar:false, control :{close:true,resize:false},fx:{modal:true},
fx :{shadow:true,modal:true} statusBar:false,
}; fx :{shadow:true,modal:true}
panel.make(); };
panel.loader.show(); panel.make();
var r = new leimnud.module.rpc.xmlhttp({ panel.loader.show();
url:this.options.dataServer, var r = new leimnud.module.rpc.xmlhttp({
args:"action=events&data="+{ url:this.options.dataServer,
pro_uid :this.options.uid, args:"action=events&data="+{
type:"message" pro_uid :this.options.uid,
}.toJSONString() type:"message"
}); }.toJSONString()
r.callback=function(rpc,panel) });
{ r.callback=function(rpc,panel)
panel.loader.hide(); {
var scs = rpc.xmlhttp.responseText.extractScript(); panel.loader.hide();
panel.addContent(rpc.xmlhttp.responseText); var scs = rpc.xmlhttp.responseText.extractScript();
scs.evalScript(); panel.addContent(rpc.xmlhttp.responseText);
//Pm.objeto.innerHTML="asdasd"; scs.evalScript();
}.extend(this,panel); //Pm.objeto.innerHTML="asdasd";
r.make(); }.extend(this,panel);
}.extend(this)}, r.make();
{image:"/images/event_timer.png",text:"intermediate timer event ",launch:function(event){ }.extend(this)
this.tmp.eventsPanel = panel =new leimnud.module.panel(); },
panel.options={ {
limit :true, image:"/images/event_conditional.png",text:"conditional message event",launch:function(event){
size :{w:700,h:380}, this.tmp.eventsPanel = panel =new leimnud.module.panel();
position:{x:50,y:50,center:true}, panel.options={
title :G_STRINGS.ID_EVENT_MULTIPLE, limit :true,
theme :this.options.theme, size :{w:700,h:380},
control :{close:true,resize:false},fx:{modal:true}, position:{x:50,y:50,center:true},
statusBar:false, title :G_STRINGS.ID_EVENT_MESSAGE,
fx :{shadow:true,modal:true} theme :this.options.theme,
}; control :{close:true,resize:false},fx:{modal:true},
panel.make(); statusBar:false,
panel.loader.show(); fx :{shadow:true,modal:true}
var r = new leimnud.module.rpc.xmlhttp({ };
url:this.options.dataServer, panel.make();
args:"action=events&data="+{ panel.loader.show();
pro_uid :this.options.uid, var r = new leimnud.module.rpc.xmlhttp({
type:"multiple" url:this.options.dataServer,
}.toJSONString() args:"action=events&data="+{
}); pro_uid :this.options.uid,
r.callback=function(rpc,panel) type:"conditional"
{ }.toJSONString()
panel.loader.hide(); });
var scs = rpc.xmlhttp.responseText.extractScript(); r.callback=function(rpc,panel)
panel.addContent(rpc.xmlhttp.responseText); {
scs.evalScript(); panel.loader.hide();
//Pm.objeto.innerHTML="asdasd"; var scs = rpc.xmlhttp.responseText.extractScript();
}.extend(this,panel); panel.addContent(rpc.xmlhttp.responseText);
r.make(); scs.evalScript();
//Pm.objeto.innerHTML="asdasd";
}.extend(this,panel);
r.make();
}.extend(this)
},
{
image:"/images/event_timer.png",text:"intermediate timer event ",launch:function(event){
this.tmp.eventsPanel = panel =new leimnud.module.panel();
panel.options={
limit :true,
size :{w:700,h:380},
position:{x:50,y:50,center:true},
title :G_STRINGS.ID_EVENT_MULTIPLE,
theme :this.options.theme,
control :{close:true,resize:false},fx:{modal:true},
statusBar:false,
fx :{shadow:true,modal:true}
};
panel.make();
panel.loader.show();
var r = new leimnud.module.rpc.xmlhttp({
url:this.options.dataServer,
args:"action=events&data="+{
pro_uid :this.options.uid,
type:"multiple"
}.toJSONString()
});
r.callback=function(rpc,panel)
{
panel.loader.hide();
var scs = rpc.xmlhttp.responseText.extractScript();
panel.addContent(rpc.xmlhttp.responseText);
scs.evalScript();
//Pm.objeto.innerHTML="asdasd";
}.extend(this,panel);
r.make();
}.extend(this)} }.extend(this)}
]} ]}
] ]
}); });
@@ -2664,3 +2700,8 @@ function showLogCaseSchedulerList(PRO_UID)
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
function exitEditor()
{
location.href = '../processes/mainInit';
}