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

BUG 9553 Event setup duration unit of measure is not displayed SOLVED

Browse Source 
- According to the specifications.
- Was add the opcion Days/hours for creating events.
This commit is contained in:
Marco Antonio Nina
2012-08-21 09:56:15 -04:00
parent 9c9fdb2532
commit 3635ca0076
13 changed files with 238 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,11 @@ class Event extends BaseEvent {
try {
$oEvent = EventPeer::retrieveByPK($sUID);
if (!is_null($oEvent)) {
$aFields = '';
$aFields = $oEvent->toArray(BasePeer::TYPE_FIELDNAME);
if ($aFields ['EVN_TIME_UNIT'] == 'HOURS') {
$aFields ['EVN_TAS_ESTIMATED_DURATION'] = round($aFields ['EVN_TAS_ESTIMATED_DURATION'] * 24,2);
}
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
$this->setNew(false);
$this->setEvnDescription($aFields['EVN_DESCRIPTION'] = $this->getEvnDescription());
@@ -101,73 +105,83 @@ class Event extends BaseEvent {
$oEvent = new Event();
$oEvent->setEvnUid( $aData['EVN_UID'] );
$oEvent->setProUid( $aData['PRO_UID'] );
if(isset($aData['EVN_RELATED_TO'])){
if (isset($aData['EVN_RELATED_TO'])) {
$oEvent->setEvnRelatedTo( $aData['EVN_RELATED_TO'] );
if ( $aData['EVN_RELATED_TO'] == 'SINGLE' ) {
if(isset($aData['TAS_UID']))
$oEvent->setTasUid( $aData['TAS_UID'] );
$oEvent->setEvnTasUidTo( '');
$oEvent->setEvnTasUidFrom( '' );
}
else {
$oEvent->setTasUid('');
if(isset($aData['EVN_TAS_UID_TO']))
$oEvent->setEvnTasUidTo( $aData['EVN_TAS_UID_TO'] );
if(isset($aData['EVN_TAS_UID_FROM']))
$oEvent->setEvnTasUidFrom( $aData['EVN_TAS_UID_FROM'] );
if isset($aData['TAS_UID'])) {
$oEvent->setTasUid( $aData['TAS_UID'] );
}
$oEvent->setEvnTasUidTo( '');
$oEvent->setEvnTasUidFrom( '' );
} else {
$oEvent->setTasUid('');
if (isset($aData['EVN_TAS_UID_TO'])) {
$oEvent->setEvnTasUidTo( $aData['EVN_TAS_UID_TO'] );
}
if (isset($aData['EVN_TAS_UID_FROM'])) {
$oEvent->setEvnTasUidFrom( $aData['EVN_TAS_UID_FROM'] );
}
}
}
if(isset($aData['EVN_POSX']))
$oEvent->setEvnPosx($aData['EVN_POSX']);
if(isset($aData['EVN_POSY']))
$oEvent->setEvnPosy($aData['EVN_POSY']);
if (isset($aData['EVN_POSX'])) {
$oEvent->setEvnPosx($aData['EVN_POSX']);
}
if (isset($aData['EVN_POSY'])) {
$oEvent->setEvnPosy($aData['EVN_POSY']);
}
if (isset($aData['EVN_TYPE'])) {
$oEvent->setEvnType( $aData['EVN_TYPE'] );
}
if (isset($aData['EVN_TIME_UNIT'])) {
$oEvent->setEvnTimeUnit($aData['EVN_TIME_UNIT']);
if (trim($aData['EVN_TIME_UNIT']) == 'HOURS') {
$aData['EVN_TAS_ESTIMATED_DURATION'] = $aData['EVN_TAS_ESTIMATED_DURATION'] / 24;
}
}
if (isset($aData['EVN_TAS_ESTIMATED_DURATION'])) {
$oEvent->setEvnTasEstimatedDuration($aData['EVN_TAS_ESTIMATED_DURATION']);
}
if(isset($aData['EVN_TYPE']))
$oEvent->setEvnType( $aData['EVN_TYPE'] );
if(isset($aData['EVN_TAS_ESTIMATED_DURATION']))
$oEvent->setEvnTasEstimatedDuration( $aData['EVN_TAS_ESTIMATED_DURATION'] );
if(isset($aData['EVN_WHEN_OCCURS']))
if (isset($aData['EVN_WHEN_OCCURS'])) {
$oEvent->setEvnWhenOccurs( $aData['EVN_WHEN_OCCURS'] );
}
if(isset($aData['EVN_ACTION']))
if (isset($aData['EVN_ACTION'])) {
$oEvent->setEvnAction( $aData['EVN_ACTION'] );
}
if(isset($aData['EVN_CONDITIONS']))
if (isset($aData['EVN_CONDITIONS'])) {
$oEvent->setEvnConditions( $aData['EVN_CONDITIONS'] );
if(isset($aData['EVN_STATUS']))
$oEvent->setEvnStatus( $aData['EVN_STATUS'] );
if(isset($aData['EVN_WHEN']))
$oEvent->setEvnWhen( $aData['EVN_WHEN'] );
}
if (isset($aData['EVN_STATUS'])) {
$oEvent->setEvnStatus( $aData['EVN_STATUS'] );
}
if (isset($aData['EVN_WHEN'])) {
$oEvent->setEvnWhen( $aData['EVN_WHEN'] );
}
$oEvent->setEvnMaxAttempts( 3 );
//start the transaction
$oConnection->begin();
if (isset($aData['EVN_TYPE'])){
if($aData['EVN_TYPE']==='bpmnEventEmptyEnd')
unset($aData['TRI_UID']);
if (isset($aData['EVN_TYPE'])) {
if($aData['EVN_TYPE']==='bpmnEventEmptyEnd') {
unset($aData['TRI_UID']);
}
}
if(isset($aData['TRI_UID']))
{
if (isset($aData['TRI_UID'])) {
$oTrigger = new Triggers();
if( trim($aData['TRI_UID']) === "" || ( ! $oTrigger->TriggerExists ( $aData['TRI_UID'] ))){
//create an empty trigger
$aTrigger = array();
$aTrigger['PRO_UID'] = $aData['PRO_UID'];
$aTrigger['TRI_TITLE'] = 'For event: ' . $aData['EVN_DESCRIPTION'];
$aTrigger['TRI_DESCRIPTION'] = 'Autogenerated ' . $aTrigger['TRI_TITLE'];
$aTrigger['TRI_WEBBOT'] = '// ' . $aTrigger['TRI_DESCRIPTION'];;
$oTrigger->create($aTrigger);
if ( trim($aData['TRI_UID']) === "" || ( ! $oTrigger->TriggerExists ( $aData['TRI_UID'] ))) {
//create an empty trigger
$aTrigger = array();
$aTrigger['PRO_UID'] = $aData['PRO_UID'];
$aTrigger['TRI_TITLE'] = 'For event: ' . $aData['EVN_DESCRIPTION'];
$aTrigger['TRI_DESCRIPTION'] = 'Autogenerated ' . $aTrigger['TRI_TITLE'];
$aTrigger['TRI_WEBBOT'] = '// ' . $aTrigger['TRI_DESCRIPTION'];;
$oTrigger->create($aTrigger);
} else {
$oTrigger = TriggersPeer::retrieveByPk($aData['TRI_UID']);
$oTrigger = TriggersPeer::retrieveByPk($aData['TRI_UID']);
}
$oEvent->setTriUid( $oTrigger->getTriUid() );
@@ -176,7 +190,7 @@ class Event extends BaseEvent {
$parameters->hash = md5 ($oTrigger->getTriWebbot());
if( isset( $aData['EVN_ACTION_PARAMETERS']->SUBJECT ) ) {
if ( isset( $aData['EVN_ACTION_PARAMETERS']->SUBJECT ) ) {
$parameters->SUBJECT = $aData['EVN_ACTION_PARAMETERS']->SUBJECT;
$parameters->TO = $aData['EVN_ACTION_PARAMETERS']->TO;
$parameters->CC = $aData['EVN_ACTION_PARAMETERS']->CC;
@@ -188,24 +202,24 @@ class Event extends BaseEvent {
}
if ($oEvent->validate()) {
$iResult = $oEvent->save();
if(isset($aData['EVN_DESCRIPTION']))
$oEvent->setEvnDescription($aData['EVN_DESCRIPTION']);
$oConnection->commit();
return $aData['EVN_UID'];
}
else {
$sMessage = '';
$aValidationFailures = $oEvent->getValidationFailures();
foreach($aValidationFailures as $oValidationFailure) {
$sMessage .= $oValidationFailure->getMessage() . '<br />';
}
throw(new Exception('The row Event cannot be created!<br />' . $sMessage));
$iResult = $oEvent->save();
if (isset($aData['EVN_DESCRIPTION'])) {
$oEvent->setEvnDescription($aData['EVN_DESCRIPTION']);
}
$oConnection->commit();
return $aData['EVN_UID'];
} else {
$sMessage = '';
$aValidationFailures = $oEvent->getValidationFailures();
foreach($aValidationFailures as $oValidationFailure) {
$sMessage .= $oValidationFailure->getMessage() . '<br />';
}
throw(new Exception('The row Event cannot be created!<br />' . $sMessage));
}
}
catch (Exception $oError) {
$oConnection->rollback();
throw($oError);
$oConnection->rollback();
throw($oError);
}
}
@@ -214,6 +228,7 @@ class Event extends BaseEvent {
try {
$oEvent = EventPeer::retrieveByPK($aData['EVN_UID']);
if (!is_null($oEvent)) {
//$oEvent->setProUid( $aData['PRO_UID'] );
if(isset($aData['EVN_RELATED_TO']))
{
@@ -238,8 +253,16 @@ class Event extends BaseEvent {
if(isset($aData['EVN_POSY']))
$oEvent->setEvnPosy($aData['EVN_POSY']);
if(isset($aData['EVN_TIME_UNIT'])) {
$oEvent->setEvnTimeUnit( $aData['EVN_TIME_UNIT']);
if ($aData['EVN_TIME_UNIT'] == 'HOURS') {
$aData['EVN_TAS_ESTIMATED_DURATION'] = $aData['EVN_TAS_ESTIMATED_DURATION'] / 24;
}
}
if(isset($aData['EVN_TAS_ESTIMATED_DURATION']))
$oEvent->setEvnTasEstimatedDuration( $aData['EVN_TAS_ESTIMATED_DURATION'] );
if(isset($aData['EVN_WHEN_OCCURS']))
$oEvent->setEvnWhenOccurs( $aData['EVN_WHEN_OCCURS'] );