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

Updated saving start Event

Browse Source
This commit is contained in:
girish
2011-02-14 10:20:08 +00:00
parent f82135a162
commit 83786a88f0
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
workflow/engine/classes/class.processMap.php
View File

@@ -6460,22 +6460,7 @@ function saveExtddEvents($oData)
if(preg_match("/Start/", $aData['EVN_TYPE']) || preg_match("/Inter/", $aData['EVN_TYPE'])){ if(preg_match("/Start/", $aData['EVN_TYPE']) || preg_match("/Inter/", $aData['EVN_TYPE'])){
$aData['EVN_RELATED_TO'] = 'SINGLE'; $aData['EVN_RELATED_TO'] = 'SINGLE';
} }
if($mode == 'updateTask'){ if($mode == 'ddEvent'){
$aData['TAS_UID'] = $oData->tas_uid;
$oTaskData = $oTask->load($aData['TAS_UID']);
if($oTaskData['TAS_EVN_UID'] == ''){
$sEvn_uid = $oEvent->create($aData);
}else{
$aData['EVN_UID'] = $oTaskData['TAS_EVN_UID'];
$sEvn_uid = $aData['EVN_UID'];
$oEvent->update($aData);
}
$aTask['TAS_UID'] = $oData->tas_uid;
$aTask['TAS_EVN_UID'] = $sEvn_uid;
$aTask['TAS_START'] = 'TRUE';
$oTask->update($aTask);
}
else if($mode == 'ddEvent'){
$sEvn_uid = $oData->evn_uid; $sEvn_uid = $oData->evn_uid;
$oEventData = EventPeer::retrieveByPK($sEvn_uid); $oEventData = EventPeer::retrieveByPK($sEvn_uid);
if (is_null($oEventData)) { if (is_null($oEventData)) {
@@ -6491,4 +6476,27 @@ function saveExtddEvents($oData)
} }
function saveExtEvents($oData)
{
$oTask = new Task();
$oEvent = new Event();
$sEvn_uid = '';
$sEvn_type = $oData->evn_type;
$aData = array();
if(preg_match("/Start/", $sEvn_type)){
$aDataTask['TAS_UID'] = $oData->tas_uid;
$aDataTask['TAS_START'] = $oData->tas_start;
$aDataTask['EVN_TYPE'] = $oData->evn_type;
$aDataTask['TAS_EVN_UID'] = $oData->evn_uid;
$oTask->update($aDataTask);
$aDataEvent['EVN_UID'] = $oData->evn_uid;
$aDataEvent['EVN_TAS_UID_TO'] = $oData->tas_uid;
$aDataEvent['EVN_TYPE'] = $oData->evn_type;
$aDataEvent['EVN_RELATED_TO'] = 'MULTIPLE';
$output = $oEvent->update($aDataEvent);
return $output;
}
}
} }

4
workflow/engine/methods/bpmn/processes_Ajax.php
View File

@@ -198,6 +198,10 @@ if ( isset ($_REQUEST['action']) ) {
if (!is_null($oEvent)) if (!is_null($oEvent))
$oEvent->update($aData); $oEvent->update($aData);
break; break;
case 'saveEvents':
$sOutput = $oProcessMap->saveExtEvents($oData);
echo $sOutput;
break;
case 'addEvent': case 'addEvent':
$sOutput = $oProcessMap->saveExtddEvents($oData); $sOutput = $oProcessMap->saveExtddEvents($oData);
echo $sOutput; echo $sOutput;

12
workflow/engine/templates/bpmn/MyWorkflow.js
View File

@@ -1456,19 +1456,17 @@ MyWorkflow.prototype.getStartEventConn = function(oShape,sPort,sPortType)
*/ */
MyWorkflow.prototype.saveEvents = function(oEvent,sTaskUID) MyWorkflow.prototype.saveEvents = function(oEvent,sTaskUID)
{ {
var pro_uid = this.getUrlVars();
var task_uid = new Array(); var task_uid = new Array();
var next_task_uid = new Array(); var next_task_uid = new Array();
if(oEvent.type.match(/Start/))
if(oEvent.type.match(/Start/) && oEvent.type.match(/Empty/))
{ {
var tas_start = 'TRUE'; var tas_start = 'TRUE';
var urlparams = '?action=saveStartEvent&data={"tas_uid":"'+sTaskUID+'","tas_start":"'+tas_start+'"}'; var urlparams = '?action=saveEvents&data={"tas_uid":"'+sTaskUID+'","tas_start":"'+tas_start+'","evn_type":"'+oEvent.type+'","evn_uid":"'+oEvent.id+'"}';
} }
else if(oEvent.type.match(/Start/) && (oEvent.type.match(/Message/) || oEvent.type.match(/Timer/)) ) /*else if(oEvent.type.match(/Start/) && (oEvent.type.match(/Message/) || oEvent.type.match(/Timer/)) )
{ {
urlparams = '?action=addEvent&data={"uid":"'+ pro_uid +'","tas_uid":"'+sTaskUID+'","tas_type":"'+oEvent.type+'"}'; urlparams = '?action=saveEvents&data={"uid":"'+ pro_uid +'","tas_uid":"'+sTaskUID+'","tas_type":"'+oEvent.type+'"}';
} }*/
else if(oEvent.type.match(/Inter/)) else if(oEvent.type.match(/Inter/))
{ {
var ports = oEvent.getPorts(); var ports = oEvent.getPorts();