fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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::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){
switch($sFilter){
case 'TAS_UID':

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

@@ -731,69 +731,105 @@ var processmap=function(){
r.make();
}.extend(this)},
*/
{image:"/images/event_messageThrow.png",text:"intermediate message 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_MESSAGE,
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:"message"
}.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)},
{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();
{
image:"/images/event_messageThrow.png",text:"intermediate message 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_MESSAGE,
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:"message"
}.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)
},
{
image:"/images/event_conditional.png",text:"conditional message 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_MESSAGE,
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:"conditional"
}.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)
},
{
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)}
]}
]}
]
});
@@ -2664,3 +2700,8 @@ function showLogCaseSchedulerList(PRO_UID)
}.extend(this);
oRPC.make();
}
function exitEditor()
{
location.href = '../processes/mainInit';
}