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

HOR-1319 "Registros corruptos: Crea 2 registros de un Elemento..." SOLVED

Browse Source 
Issue:
    Registros corruptos: Crea 2 registros de un Elemento con 2 Tareas, se debe borrar los q no se usan
Cause:
    - El problema se presenta cuando se tiene la combinacion gateway-to-gateway y al hacer (por ejemplo) un movimiento
      de algun elemento del proceso y posteriormente guardarlo. Esto ocasiona que se creen registros corruptos en las tablas
      TASK, ROUTE y ELEMENT_TASK_RELATION
    - Este problema fue ocasionado por:
          > Commit: 137a4ea2237573a54964414f477e13a4f5c76a5d, Card: PMLOCAL-3840
      El commit 137a4ea2237573a54964414f477e13a4f5c76a5d tambien origino los siguientes issues:
          > Commit: 6bb8ad6cc05a3d8e671baa5d358b409c1f2710f6, Card: HOR-421
          > Commit: 9e8030904a4c0f4f670fc159c9220fead10a5859, Card: PMLOCAL-4270
          > Commit: d3296132bf13f81aee12c0f7696d5952d79ee323, Card: HOR-1383
          > Commit: b58dc888c1f54d981fc329c3a35cb4294785e0f7, Card: HOR-1358
Solution:
    Se revirtieron los cambios de los commits involucrados, con el siguiente detalle:
        - Commit 137a4ea2237573a54964414f477e13a4f5c76a5d: Se revirtio el cambio; se soluciono el problema problema planteado en el card
        - Commit 6bb8ad6cc05a3d8e671baa5d358b409c1f2710f6: Se revirtio el cambio; se soluciono el problema problema planteado en el card
        - Commit 9e8030904a4c0f4f670fc159c9220fead10a5859: Se revirtio el cambio
        - Commit d3296132bf13f81aee12c0f7696d5952d79ee323: Se revirtio el cambio
        - Commit b58dc888c1f54d981fc329c3a35cb4294785e0f7: Se revirtio el cambio; se soluciono el problema planteado segun el analisis del commit
This commit is contained in:
Victor Saisa Lopez
2016-07-26 15:34:52 -04:00
parent d58967138c
commit bf115b86ca
16 changed files with 249 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/class.derivation.php
View File

@@ -199,25 +199,22 @@ class Derivation
$flagAddDelegation = $pmScript->evaluate(); $flagAddDelegation = $pmScript->evaluate();
} }
//In the 3.0.1.7 version we have a condition for join and the rouCondition maybe is true, 1, etc if (trim($arrayRouteData['ROU_CONDITION']) == '' && $arrayRouteData['ROU_NEXT_TASK'] != '-1') {
$rouCondition = trim($arrayRouteData["ROU_CONDITION"]); $arrayTaskData = $task->load($arrayRouteData['ROU_NEXT_TASK']);
if($rouCondition !== '' && $arrayRouteData["ROU_TYPE"] === 'SEC-JOIN'){
error_log(G::LoadTranslation( 'ID_WARNING_GATEWAY_CONVERGENT_WITH_CONDITION' ).' '.$flagAddDelegation);
}
if ($arrayRouteData["ROU_NEXT_TASK"] != "-1" && $rouCondition === '') { if ($arrayRouteData['ROU_TYPE'] != 'SEC-JOIN' && $arrayTaskData['TAS_TYPE'] == 'GATEWAYTOGATEWAY') {
$arrayTaskData = $task->load($arrayRouteData["ROU_NEXT_TASK"]);
if ($arrayRouteData["ROU_TYPE"] != "SEC-JOIN" && $arrayTaskData["TAS_TYPE"] == "GATEWAYTOGATEWAY") {
$flagAddDelegation = true; $flagAddDelegation = true;
} }
if($arrayRouteData['ROU_TYPE'] == 'SEC-JOIN'){
$aSecJoin[$count]['ROU_PREVIOUS_TASK'] = $arrayRouteData['ROU_NEXT_TASK'];
$aSecJoin[$count]['ROU_PREVIOUS_TYPE'] = 'SEC-JOIN';
$count++;
}
} }
//In the 3.0.1.8 version the Secjoin does not have a rouCondition if ($arrayRouteData['ROU_TYPE'] == 'EVALUATE' && !empty($arrayNextTask)) {
if($arrayRouteData["ROU_NEXT_TASK"] !== '-1' && $arrayRouteData["ROU_TYPE"] === 'SEC-JOIN'){ $flagAddDelegation = false;
$arrayTaskData = $task->load($arrayRouteData["ROU_NEXT_TASK"]);
$aSecJoin[$count]["ROU_PREVIOUS_TASK"] = $arrayRouteData["ROU_NEXT_TASK"];
$aSecJoin[$count]["ROU_PREVIOUS_TYPE"] = 'SEC-JOIN';
$count++;
} }
if ($flagAddDelegation && if ($flagAddDelegation &&
@@ -1393,7 +1390,7 @@ class Derivation
} //end switch } //end switch
if($iNewDelIndex !== 0 && !$sendNotificationsMobile){ if($iNewDelIndex !== 0 && !$sendNotificationsMobile){
$sendNotificationsMobile = $this->sendNotificationsMobile($appFields, $nextDel, $iNewDelIndex); $sendNotificationsMobile = $this->sendNotificationsMobile($appFields, $nextDel, $iNewDelIndex);
} }
return $iNewDelIndex; return $iNewDelIndex;
} }
@@ -1667,4 +1664,3 @@ class Derivation
} }
} }
} }

2
workflow/engine/classes/model/map/ElementTaskRelationMapBuilder.php
View File

@@ -75,8 +75,6 @@ class ElementTaskRelationMapBuilder
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ELEMENT_UID_DEST', 'ElementUidDest', 'string', CreoleTypes::VARCHAR, false, 32);
} // doBuild() } // doBuild()
} // ElementTaskRelationMapBuilder } // ElementTaskRelationMapBuilder

2
workflow/engine/classes/model/map/ProcessMapBuilder.php
View File

@@ -141,6 +141,8 @@ class ProcessMapBuilder
$tMap->addColumn('PRO_ITEE', 'ProItee', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('PRO_ITEE', 'ProItee', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('PRO_ACTION_DONE', 'ProActionDone', 'string', CreoleTypes::LONGVARCHAR, false, null);
$tMap->addValidator('PRO_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'WEEKS|MONTHS|DAYS|HOURS|MINUTES', 'Please select a valid Time Unit.'); $tMap->addValidator('PRO_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'WEEKS|MONTHS|DAYS|HOURS|MINUTES', 'Please select a valid Time Unit.');
$tMap->addValidator('PRO_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|DISABLED', 'Please select a valid Process Status.'); $tMap->addValidator('PRO_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|DISABLED', 'Please select a valid Process Status.');

2
workflow/engine/classes/model/map/RouteMapBuilder.php
View File

@@ -101,8 +101,6 @@ class RouteMapBuilder
$tMap->addColumn('GAT_UID', 'GatUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('GAT_UID', 'GatUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ROU_ELEMENT_ORIGIN', 'RouElementOrigin', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addValidator('ROU_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Route UID can be no larger than 32 in size'); $tMap->addValidator('ROU_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Route UID can be no larger than 32 in size');
$tMap->addValidator('ROU_UID', 'required', 'propel.validator.RequiredValidator', '', 'Route UID is required.'); $tMap->addValidator('ROU_UID', 'required', 'propel.validator.RequiredValidator', '', 'Route UID is required.');

60
workflow/engine/classes/model/om/BaseElementTaskRelation.php
View File

@@ -57,12 +57,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
*/ */
protected $tas_uid; protected $tas_uid;
/**
* The value for the element_uid_dest field.
* @var string
*/
protected $element_uid_dest = '';
/** /**
* Flag to prevent endless save loop, if this object is referenced * Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction. * by another object which falls in this transaction.
@@ -132,17 +126,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
return $this->tas_uid; return $this->tas_uid;
} }
/**
* Get the [element_uid_dest] column value.
*
* @return string
*/
public function getElementUidDest()
{
return $this->element_uid_dest;
}
/** /**
* Set the value of [etr_uid] column. * Set the value of [etr_uid] column.
* *
@@ -253,28 +236,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
} // setTasUid() } // setTasUid()
/**
* Set the value of [element_uid_dest] column.
*
* @param string $v new value
* @return void
*/
public function setElementUidDest($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->element_uid_dest !== $v || $v === '') {
$this->element_uid_dest = $v;
$this->modifiedColumns[] = ElementTaskRelationPeer::ELEMENT_UID_DEST;
}
} // setElementUidDest()
/** /**
* Hydrates (populates) the object variables with values from the database resultset. * Hydrates (populates) the object variables with values from the database resultset.
* *
@@ -302,14 +263,12 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
$this->tas_uid = $rs->getString($startcol + 4); $this->tas_uid = $rs->getString($startcol + 4);
$this->element_uid_dest = $rs->getString($startcol + 5);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 6; // 6 = ElementTaskRelationPeer::NUM_COLUMNS - ElementTaskRelationPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 5; // 5 = ElementTaskRelationPeer::NUM_COLUMNS - ElementTaskRelationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating ElementTaskRelation object", $e); throw new PropelException("Error populating ElementTaskRelation object", $e);
@@ -528,9 +487,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
case 4: case 4:
return $this->getTasUid(); return $this->getTasUid();
break; break;
case 5:
return $this->getElementUidDest();
break;
default: default:
return null; return null;
break; break;
@@ -556,7 +512,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
$keys[2] => $this->getElementUid(), $keys[2] => $this->getElementUid(),
$keys[3] => $this->getElementType(), $keys[3] => $this->getElementType(),
$keys[4] => $this->getTasUid(), $keys[4] => $this->getTasUid(),
$keys[5] => $this->getElementUidDest(),
); );
return $result; return $result;
} }
@@ -603,9 +558,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
case 4: case 4:
$this->setTasUid($value); $this->setTasUid($value);
break; break;
case 5:
$this->setElementUidDest($value);
break;
} // switch() } // switch()
} }
@@ -649,10 +601,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
$this->setTasUid($arr[$keys[4]]); $this->setTasUid($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) {
$this->setElementUidDest($arr[$keys[5]]);
}
} }
/** /**
@@ -684,10 +632,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
$criteria->add(ElementTaskRelationPeer::TAS_UID, $this->tas_uid); $criteria->add(ElementTaskRelationPeer::TAS_UID, $this->tas_uid);
} }
if ($this->isColumnModified(ElementTaskRelationPeer::ELEMENT_UID_DEST)) {
$criteria->add(ElementTaskRelationPeer::ELEMENT_UID_DEST, $this->element_uid_dest);
}
return $criteria; return $criteria;
} }
@@ -750,8 +694,6 @@ abstract class BaseElementTaskRelation extends BaseObject implements Persistent
$copyObj->setTasUid($this->tas_uid); $copyObj->setTasUid($this->tas_uid);
$copyObj->setElementUidDest($this->element_uid_dest);
$copyObj->setNew(true); $copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseElementTaskRelationPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseElementTaskRelationPeer
const CLASS_DEFAULT = 'classes.model.ElementTaskRelation'; const CLASS_DEFAULT = 'classes.model.ElementTaskRelation';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 6; const NUM_COLUMNS = 5;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -46,9 +46,6 @@ abstract class BaseElementTaskRelationPeer
/** the column name for the TAS_UID field */ /** the column name for the TAS_UID field */
const TAS_UID = 'ELEMENT_TASK_RELATION.TAS_UID'; const TAS_UID = 'ELEMENT_TASK_RELATION.TAS_UID';
/** the column name for the ELEMENT_UID_DEST field */
const ELEMENT_UID_DEST = 'ELEMENT_TASK_RELATION.ELEMENT_UID_DEST';
/** The PHP to DB Name Mapping */ /** The PHP to DB Name Mapping */
private static $phpNameMap = null; private static $phpNameMap = null;
@@ -60,10 +57,10 @@ abstract class BaseElementTaskRelationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('EtrUid', 'PrjUid', 'ElementUid', 'ElementType', 'TasUid', 'ElementUidDest', ), BasePeer::TYPE_PHPNAME => array ('EtrUid', 'PrjUid', 'ElementUid', 'ElementType', 'TasUid', ),
BasePeer::TYPE_COLNAME => array (ElementTaskRelationPeer::ETR_UID, ElementTaskRelationPeer::PRJ_UID, ElementTaskRelationPeer::ELEMENT_UID, ElementTaskRelationPeer::ELEMENT_TYPE, ElementTaskRelationPeer::TAS_UID, ElementTaskRelationPeer::ELEMENT_UID_DEST, ), BasePeer::TYPE_COLNAME => array (ElementTaskRelationPeer::ETR_UID, ElementTaskRelationPeer::PRJ_UID, ElementTaskRelationPeer::ELEMENT_UID, ElementTaskRelationPeer::ELEMENT_TYPE, ElementTaskRelationPeer::TAS_UID, ),
BasePeer::TYPE_FIELDNAME => array ('ETR_UID', 'PRJ_UID', 'ELEMENT_UID', 'ELEMENT_TYPE', 'TAS_UID', 'ELEMENT_UID_DEST', ), BasePeer::TYPE_FIELDNAME => array ('ETR_UID', 'PRJ_UID', 'ELEMENT_UID', 'ELEMENT_TYPE', 'TAS_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
); );
/** /**
@@ -73,10 +70,10 @@ abstract class BaseElementTaskRelationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('EtrUid' => 0, 'PrjUid' => 1, 'ElementUid' => 2, 'ElementType' => 3, 'TasUid' => 4, 'ElementUidDest' => 5, ), BasePeer::TYPE_PHPNAME => array ('EtrUid' => 0, 'PrjUid' => 1, 'ElementUid' => 2, 'ElementType' => 3, 'TasUid' => 4, ),
BasePeer::TYPE_COLNAME => array (ElementTaskRelationPeer::ETR_UID => 0, ElementTaskRelationPeer::PRJ_UID => 1, ElementTaskRelationPeer::ELEMENT_UID => 2, ElementTaskRelationPeer::ELEMENT_TYPE => 3, ElementTaskRelationPeer::TAS_UID => 4, ElementTaskRelationPeer::ELEMENT_UID_DEST => 5, ), BasePeer::TYPE_COLNAME => array (ElementTaskRelationPeer::ETR_UID => 0, ElementTaskRelationPeer::PRJ_UID => 1, ElementTaskRelationPeer::ELEMENT_UID => 2, ElementTaskRelationPeer::ELEMENT_TYPE => 3, ElementTaskRelationPeer::TAS_UID => 4, ),
BasePeer::TYPE_FIELDNAME => array ('ETR_UID' => 0, 'PRJ_UID' => 1, 'ELEMENT_UID' => 2, 'ELEMENT_TYPE' => 3, 'TAS_UID' => 4, 'ELEMENT_UID_DEST' => 5, ), BasePeer::TYPE_FIELDNAME => array ('ETR_UID' => 0, 'PRJ_UID' => 1, 'ELEMENT_UID' => 2, 'ELEMENT_TYPE' => 3, 'TAS_UID' => 4, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
); );
/** /**
@@ -187,8 +184,6 @@ abstract class BaseElementTaskRelationPeer
$criteria->addSelectColumn(ElementTaskRelationPeer::TAS_UID); $criteria->addSelectColumn(ElementTaskRelationPeer::TAS_UID);
$criteria->addSelectColumn(ElementTaskRelationPeer::ELEMENT_UID_DEST);
} }
const COUNT = 'COUNT(ELEMENT_TASK_RELATION.ETR_UID)'; const COUNT = 'COUNT(ELEMENT_TASK_RELATION.ETR_UID)';

60
workflow/engine/classes/model/om/BaseProcess.php
View File

@@ -255,6 +255,12 @@ abstract class BaseProcess extends BaseObject implements Persistent
*/ */
protected $pro_itee = 1; protected $pro_itee = 1;
/**
* The value for the pro_action_done field.
* @var string
*/
protected $pro_action_done = '';
/** /**
* Flag to prevent endless save loop, if this object is referenced * Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction. * by another object which falls in this transaction.
@@ -729,6 +735,17 @@ abstract class BaseProcess extends BaseObject implements Persistent
return $this->pro_itee; return $this->pro_itee;
} }
/**
* Get the [pro_action_done] column value.
*
* @return string
*/
public function getProActionDone()
{
return $this->pro_action_done;
}
/** /**
* Set the value of [pro_uid] column. * Set the value of [pro_uid] column.
* *
@@ -1567,6 +1584,28 @@ abstract class BaseProcess extends BaseObject implements Persistent
} // setProItee() } // setProItee()
/**
* Set the value of [pro_action_done] column.
*
* @param string $v new value
* @return void
*/
public function setProActionDone($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->pro_action_done !== $v || $v === '') {
$this->pro_action_done = $v;
$this->modifiedColumns[] = ProcessPeer::PRO_ACTION_DONE;
}
} // setProActionDone()
/** /**
* Hydrates (populates) the object variables with values from the database resultset. * Hydrates (populates) the object variables with values from the database resultset.
* *
@@ -1660,12 +1699,14 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->pro_itee = $rs->getString($startcol + 37); $this->pro_itee = $rs->getString($startcol + 37);
$this->pro_action_done = $rs->getString($startcol + 38);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 37; // 37 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 39; // 39 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Process object", $e); throw new PropelException("Error populating Process object", $e);
@@ -1983,6 +2024,9 @@ abstract class BaseProcess extends BaseObject implements Persistent
case 37: case 37:
return $this->getProItee(); return $this->getProItee();
break; break;
case 38:
return $this->getProActionDone();
break;
default: default:
return null; return null;
break; break;
@@ -2041,6 +2085,7 @@ abstract class BaseProcess extends BaseObject implements Persistent
$keys[35] => $this->getProCost(), $keys[35] => $this->getProCost(),
$keys[36] => $this->getProUnitCost(), $keys[36] => $this->getProUnitCost(),
$keys[37] => $this->getProItee(), $keys[37] => $this->getProItee(),
$keys[38] => $this->getProActionDone(),
); );
return $result; return $result;
} }
@@ -2186,6 +2231,9 @@ abstract class BaseProcess extends BaseObject implements Persistent
case 37: case 37:
$this->setProItee($value); $this->setProItee($value);
break; break;
case 38:
$this->setProActionDone($value);
break;
} // switch() } // switch()
} }
@@ -2361,6 +2409,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
$this->setProItee($arr[$keys[37]]); $this->setProItee($arr[$keys[37]]);
} }
if (array_key_exists($keys[38], $arr)) {
$this->setProActionDone($arr[$keys[38]]);
}
} }
/** /**
@@ -2524,6 +2576,10 @@ abstract class BaseProcess extends BaseObject implements Persistent
$criteria->add(ProcessPeer::PRO_ITEE, $this->pro_itee); $criteria->add(ProcessPeer::PRO_ITEE, $this->pro_itee);
} }
if ($this->isColumnModified(ProcessPeer::PRO_ACTION_DONE)) {
$criteria->add(ProcessPeer::PRO_ACTION_DONE, $this->pro_action_done);
}
return $criteria; return $criteria;
} }
@@ -2652,6 +2708,8 @@ abstract class BaseProcess extends BaseObject implements Persistent
$copyObj->setProItee($this->pro_itee); $copyObj->setProItee($this->pro_itee);
$copyObj->setProActionDone($this->pro_action_done);
$copyObj->setNew(true); $copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseProcessPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseProcessPeer
const CLASS_DEFAULT = 'classes.model.Process'; const CLASS_DEFAULT = 'classes.model.Process';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 37; const NUM_COLUMNS = 39;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -145,6 +145,9 @@ abstract class BaseProcessPeer
/** the column name for the PRO_ITEE field */ /** the column name for the PRO_ITEE field */
const PRO_ITEE = 'PROCESS.PRO_ITEE'; const PRO_ITEE = 'PROCESS.PRO_ITEE';
/** the column name for the PRO_ACTION_DONE field */
const PRO_ACTION_DONE = 'PROCESS.PRO_ACTION_DONE';
/** The PHP to DB Name Mapping */ /** The PHP to DB Name Mapping */
private static $phpNameMap = null; private static $phpNameMap = null;
@@ -156,10 +159,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', ), BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriOpen', 'ProTriDeleted', 'ProTriCanceled', 'ProTriPaused', 'ProTriReassigned', 'ProTriUnpaused', 'ProTypeProcess', 'ProShowDelegate', 'ProShowDynaform', 'ProCategory', 'ProSubCategory', 'ProIndustry', 'ProUpdateDate', 'ProCreateDate', 'ProCreateUser', 'ProHeight', 'ProWidth', 'ProTitleX', 'ProTitleY', 'ProDebug', 'ProDynaforms', 'ProDerivationScreenTpl', 'ProCost', 'ProUnitCost', 'ProItee', 'ProActionDone', ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ), BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_OPEN, ProcessPeer::PRO_TRI_DELETED, ProcessPeer::PRO_TRI_CANCELED, ProcessPeer::PRO_TRI_PAUSED, ProcessPeer::PRO_TRI_REASSIGNED, ProcessPeer::PRO_TRI_UNPAUSED, ProcessPeer::PRO_TYPE_PROCESS, ProcessPeer::PRO_SHOW_DELEGATE, ProcessPeer::PRO_SHOW_DYNAFORM, ProcessPeer::PRO_CATEGORY, ProcessPeer::PRO_SUB_CATEGORY, ProcessPeer::PRO_INDUSTRY, ProcessPeer::PRO_UPDATE_DATE, ProcessPeer::PRO_CREATE_DATE, ProcessPeer::PRO_CREATE_USER, ProcessPeer::PRO_HEIGHT, ProcessPeer::PRO_WIDTH, ProcessPeer::PRO_TITLE_X, ProcessPeer::PRO_TITLE_Y, ProcessPeer::PRO_DEBUG, ProcessPeer::PRO_DYNAFORMS, ProcessPeer::PRO_DERIVATION_SCREEN_TPL, ProcessPeer::PRO_COST, ProcessPeer::PRO_UNIT_COST, ProcessPeer::PRO_ITEE, ProcessPeer::PRO_ACTION_DONE, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_OPEN', 'PRO_TRI_DELETED', 'PRO_TRI_CANCELED', 'PRO_TRI_PAUSED', 'PRO_TRI_REASSIGNED', 'PRO_TRI_UNPAUSED', 'PRO_TYPE_PROCESS', 'PRO_SHOW_DELEGATE', 'PRO_SHOW_DYNAFORM', 'PRO_CATEGORY', 'PRO_SUB_CATEGORY', 'PRO_INDUSTRY', 'PRO_UPDATE_DATE', 'PRO_CREATE_DATE', 'PRO_CREATE_USER', 'PRO_HEIGHT', 'PRO_WIDTH', 'PRO_TITLE_X', 'PRO_TITLE_Y', 'PRO_DEBUG', 'PRO_DYNAFORMS', 'PRO_DERIVATION_SCREEN_TPL', 'PRO_COST', 'PRO_UNIT_COST', 'PRO_ITEE', 'PRO_ACTION_DONE', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, )
); );
/** /**
@@ -169,10 +172,10 @@ abstract class BaseProcessPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriOpen' => 13, 'ProTriDeleted' => 14, 'ProTriCanceled' => 15, 'ProTriPaused' => 16, 'ProTriReassigned' => 17, 'ProTriUnpaused' => 18, 'ProTypeProcess' => 19, 'ProShowDelegate' => 20, 'ProShowDynaform' => 21, 'ProCategory' => 22, 'ProSubCategory' => 23, 'ProIndustry' => 24, 'ProUpdateDate' => 25, 'ProCreateDate' => 26, 'ProCreateUser' => 27, 'ProHeight' => 28, 'ProWidth' => 29, 'ProTitleX' => 30, 'ProTitleY' => 31, 'ProDebug' => 32, 'ProDynaforms' => 33, 'ProDerivationScreenTpl' => 34, 'ProCost' => 35, 'ProUnitCost' => 36, 'ProItee' => 37, ), BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProTitle' => 1, 'ProDescription' => 2, 'ProParent' => 3, 'ProTime' => 4, 'ProTimeunit' => 5, 'ProStatus' => 6, 'ProTypeDay' => 7, 'ProType' => 8, 'ProAssignment' => 9, 'ProShowMap' => 10, 'ProShowMessage' => 11, 'ProSubprocess' => 12, 'ProTriOpen' => 13, 'ProTriDeleted' => 14, 'ProTriCanceled' => 15, 'ProTriPaused' => 16, 'ProTriReassigned' => 17, 'ProTriUnpaused' => 18, 'ProTypeProcess' => 19, 'ProShowDelegate' => 20, 'ProShowDynaform' => 21, 'ProCategory' => 22, 'ProSubCategory' => 23, 'ProIndustry' => 24, 'ProUpdateDate' => 25, 'ProCreateDate' => 26, 'ProCreateUser' => 27, 'ProHeight' => 28, 'ProWidth' => 29, 'ProTitleX' => 30, 'ProTitleY' => 31, 'ProDebug' => 32, 'ProDynaforms' => 33, 'ProDerivationScreenTpl' => 34, 'ProCost' => 35, 'ProUnitCost' => 36, 'ProItee' => 37, 'ProActionDone' => 38, ),
BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_OPEN => 13, ProcessPeer::PRO_TRI_DELETED => 14, ProcessPeer::PRO_TRI_CANCELED => 15, ProcessPeer::PRO_TRI_PAUSED => 16, ProcessPeer::PRO_TRI_REASSIGNED => 17, ProcessPeer::PRO_TRI_UNPAUSED => 18, ProcessPeer::PRO_TYPE_PROCESS => 19, ProcessPeer::PRO_SHOW_DELEGATE => 20, ProcessPeer::PRO_SHOW_DYNAFORM => 21, ProcessPeer::PRO_CATEGORY => 22, ProcessPeer::PRO_SUB_CATEGORY => 23, ProcessPeer::PRO_INDUSTRY => 24, ProcessPeer::PRO_UPDATE_DATE => 25, ProcessPeer::PRO_CREATE_DATE => 26, ProcessPeer::PRO_CREATE_USER => 27, ProcessPeer::PRO_HEIGHT => 28, ProcessPeer::PRO_WIDTH => 29, ProcessPeer::PRO_TITLE_X => 30, ProcessPeer::PRO_TITLE_Y => 31, ProcessPeer::PRO_DEBUG => 32, ProcessPeer::PRO_DYNAFORMS => 33, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 34, ProcessPeer::PRO_COST => 35, ProcessPeer::PRO_UNIT_COST => 36, ProcessPeer::PRO_ITEE => 37, ), BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_TITLE => 1, ProcessPeer::PRO_DESCRIPTION => 2, ProcessPeer::PRO_PARENT => 3, ProcessPeer::PRO_TIME => 4, ProcessPeer::PRO_TIMEUNIT => 5, ProcessPeer::PRO_STATUS => 6, ProcessPeer::PRO_TYPE_DAY => 7, ProcessPeer::PRO_TYPE => 8, ProcessPeer::PRO_ASSIGNMENT => 9, ProcessPeer::PRO_SHOW_MAP => 10, ProcessPeer::PRO_SHOW_MESSAGE => 11, ProcessPeer::PRO_SUBPROCESS => 12, ProcessPeer::PRO_TRI_OPEN => 13, ProcessPeer::PRO_TRI_DELETED => 14, ProcessPeer::PRO_TRI_CANCELED => 15, ProcessPeer::PRO_TRI_PAUSED => 16, ProcessPeer::PRO_TRI_REASSIGNED => 17, ProcessPeer::PRO_TRI_UNPAUSED => 18, ProcessPeer::PRO_TYPE_PROCESS => 19, ProcessPeer::PRO_SHOW_DELEGATE => 20, ProcessPeer::PRO_SHOW_DYNAFORM => 21, ProcessPeer::PRO_CATEGORY => 22, ProcessPeer::PRO_SUB_CATEGORY => 23, ProcessPeer::PRO_INDUSTRY => 24, ProcessPeer::PRO_UPDATE_DATE => 25, ProcessPeer::PRO_CREATE_DATE => 26, ProcessPeer::PRO_CREATE_USER => 27, ProcessPeer::PRO_HEIGHT => 28, ProcessPeer::PRO_WIDTH => 29, ProcessPeer::PRO_TITLE_X => 30, ProcessPeer::PRO_TITLE_Y => 31, ProcessPeer::PRO_DEBUG => 32, ProcessPeer::PRO_DYNAFORMS => 33, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 34, ProcessPeer::PRO_COST => 35, ProcessPeer::PRO_UNIT_COST => 36, ProcessPeer::PRO_ITEE => 37, ProcessPeer::PRO_ACTION_DONE => 38, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_OPEN' => 13, 'PRO_TRI_DELETED' => 14, 'PRO_TRI_CANCELED' => 15, 'PRO_TRI_PAUSED' => 16, 'PRO_TRI_REASSIGNED' => 17, 'PRO_TRI_UNPAUSED' => 18, 'PRO_TYPE_PROCESS' => 19, 'PRO_SHOW_DELEGATE' => 20, 'PRO_SHOW_DYNAFORM' => 21, 'PRO_CATEGORY' => 22, 'PRO_SUB_CATEGORY' => 23, 'PRO_INDUSTRY' => 24, 'PRO_UPDATE_DATE' => 25, 'PRO_CREATE_DATE' => 26, 'PRO_CREATE_USER' => 27, 'PRO_HEIGHT' => 28, 'PRO_WIDTH' => 29, 'PRO_TITLE_X' => 30, 'PRO_TITLE_Y' => 31, 'PRO_DEBUG' => 32, 'PRO_DYNAFORMS' => 33, 'PRO_DERIVATION_SCREEN_TPL' => 34, 'PRO_COST' => 35, 'PRO_UNIT_COST' => 36, 'PRO_ITEE' => 37, ), BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_TITLE' => 1, 'PRO_DESCRIPTION' => 2, 'PRO_PARENT' => 3, 'PRO_TIME' => 4, 'PRO_TIMEUNIT' => 5, 'PRO_STATUS' => 6, 'PRO_TYPE_DAY' => 7, 'PRO_TYPE' => 8, 'PRO_ASSIGNMENT' => 9, 'PRO_SHOW_MAP' => 10, 'PRO_SHOW_MESSAGE' => 11, 'PRO_SUBPROCESS' => 12, 'PRO_TRI_OPEN' => 13, 'PRO_TRI_DELETED' => 14, 'PRO_TRI_CANCELED' => 15, 'PRO_TRI_PAUSED' => 16, 'PRO_TRI_REASSIGNED' => 17, 'PRO_TRI_UNPAUSED' => 18, 'PRO_TYPE_PROCESS' => 19, 'PRO_SHOW_DELEGATE' => 20, 'PRO_SHOW_DYNAFORM' => 21, 'PRO_CATEGORY' => 22, 'PRO_SUB_CATEGORY' => 23, 'PRO_INDUSTRY' => 24, 'PRO_UPDATE_DATE' => 25, 'PRO_CREATE_DATE' => 26, 'PRO_CREATE_USER' => 27, 'PRO_HEIGHT' => 28, 'PRO_WIDTH' => 29, 'PRO_TITLE_X' => 30, 'PRO_TITLE_Y' => 31, 'PRO_DEBUG' => 32, 'PRO_DYNAFORMS' => 33, 'PRO_DERIVATION_SCREEN_TPL' => 34, 'PRO_COST' => 35, 'PRO_UNIT_COST' => 36, 'PRO_ITEE' => 37, 'PRO_ACTION_DONE' => 38, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, )
); );
/** /**
@@ -349,6 +352,8 @@ abstract class BaseProcessPeer
$criteria->addSelectColumn(ProcessPeer::PRO_ITEE); $criteria->addSelectColumn(ProcessPeer::PRO_ITEE);
$criteria->addSelectColumn(ProcessPeer::PRO_ACTION_DONE);
} }
const COUNT = 'COUNT(PROCESS.PRO_UID)'; const COUNT = 'COUNT(PROCESS.PRO_UID)';

60
workflow/engine/classes/model/om/BaseRoute.php
View File

@@ -135,12 +135,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
*/ */
protected $gat_uid = ''; protected $gat_uid = '';
/**
* The value for the rou_element_origin field.
* @var string
*/
protected $rou_element_origin = '';
/** /**
* Flag to prevent endless save loop, if this object is referenced * Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction. * by another object which falls in this transaction.
@@ -353,17 +347,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
return $this->gat_uid; return $this->gat_uid;
} }
/**
* Get the [rou_element_origin] column value.
*
* @return string
*/
public function getRouElementOrigin()
{
return $this->rou_element_origin;
}
/** /**
* Set the value of [rou_uid] column. * Set the value of [rou_uid] column.
* *
@@ -760,28 +743,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
} // setGatUid() } // setGatUid()
/**
* Set the value of [rou_element_origin] column.
*
* @param string $v new value
* @return void
*/
public function setRouElementOrigin($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->rou_element_origin !== $v || $v === '') {
$this->rou_element_origin = $v;
$this->modifiedColumns[] = RoutePeer::ROU_ELEMENT_ORIGIN;
}
} // setRouElementOrigin()
/** /**
* Hydrates (populates) the object variables with values from the database resultset. * Hydrates (populates) the object variables with values from the database resultset.
* *
@@ -835,14 +796,12 @@ abstract class BaseRoute extends BaseObject implements Persistent
$this->gat_uid = $rs->getString($startcol + 17); $this->gat_uid = $rs->getString($startcol + 17);
$this->rou_element_origin = $rs->getString($startcol + 18);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 19; // 19 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 18; // 18 = RoutePeer::NUM_COLUMNS - RoutePeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Route object", $e); throw new PropelException("Error populating Route object", $e);
@@ -1100,9 +1059,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
case 17: case 17:
return $this->getGatUid(); return $this->getGatUid();
break; break;
case 18:
return $this->getRouElementOrigin();
break;
default: default:
return null; return null;
break; break;
@@ -1141,7 +1097,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
$keys[15] => $this->getRouFromPort(), $keys[15] => $this->getRouFromPort(),
$keys[16] => $this->getRouEvnUid(), $keys[16] => $this->getRouEvnUid(),
$keys[17] => $this->getGatUid(), $keys[17] => $this->getGatUid(),
$keys[18] => $this->getRouElementOrigin(),
); );
return $result; return $result;
} }
@@ -1227,9 +1182,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
case 17: case 17:
$this->setGatUid($value); $this->setGatUid($value);
break; break;
case 18:
$this->setRouElementOrigin($value);
break;
} // switch() } // switch()
} }
@@ -1325,10 +1277,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
$this->setGatUid($arr[$keys[17]]); $this->setGatUid($arr[$keys[17]]);
} }
if (array_key_exists($keys[18], $arr)) {
$this->setRouElementOrigin($arr[$keys[18]]);
}
} }
/** /**
@@ -1412,10 +1360,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
$criteria->add(RoutePeer::GAT_UID, $this->gat_uid); $criteria->add(RoutePeer::GAT_UID, $this->gat_uid);
} }
if ($this->isColumnModified(RoutePeer::ROU_ELEMENT_ORIGIN)) {
$criteria->add(RoutePeer::ROU_ELEMENT_ORIGIN, $this->rou_element_origin);
}
return $criteria; return $criteria;
} }
@@ -1504,8 +1448,6 @@ abstract class BaseRoute extends BaseObject implements Persistent
$copyObj->setGatUid($this->gat_uid); $copyObj->setGatUid($this->gat_uid);
$copyObj->setRouElementOrigin($this->rou_element_origin);
$copyObj->setNew(true); $copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseRoutePeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseRoutePeer
const CLASS_DEFAULT = 'classes.model.Route'; const CLASS_DEFAULT = 'classes.model.Route';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 19; const NUM_COLUMNS = 18;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -85,9 +85,6 @@ abstract class BaseRoutePeer
/** the column name for the GAT_UID field */ /** the column name for the GAT_UID field */
const GAT_UID = 'ROUTE.GAT_UID'; const GAT_UID = 'ROUTE.GAT_UID';
/** the column name for the ROU_ELEMENT_ORIGIN field */
const ROU_ELEMENT_ORIGIN = 'ROUTE.ROU_ELEMENT_ORIGIN';
/** The PHP to DB Name Mapping */ /** The PHP to DB Name Mapping */
private static $phpNameMap = null; private static $phpNameMap = null;
@@ -99,10 +96,10 @@ abstract class BaseRoutePeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouDefault', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', 'RouToPort', 'RouFromPort', 'RouEvnUid', 'GatUid', 'RouElementOrigin', ), BasePeer::TYPE_PHPNAME => array ('RouUid', 'RouParent', 'ProUid', 'TasUid', 'RouNextTask', 'RouCase', 'RouType', 'RouDefault', 'RouCondition', 'RouToLastUser', 'RouOptional', 'RouSendEmail', 'RouSourceanchor', 'RouTargetanchor', 'RouToPort', 'RouFromPort', 'RouEvnUid', 'GatUid', ),
BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_DEFAULT, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, RoutePeer::ROU_TO_PORT, RoutePeer::ROU_FROM_PORT, RoutePeer::ROU_EVN_UID, RoutePeer::GAT_UID, RoutePeer::ROU_ELEMENT_ORIGIN, ), BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID, RoutePeer::ROU_PARENT, RoutePeer::PRO_UID, RoutePeer::TAS_UID, RoutePeer::ROU_NEXT_TASK, RoutePeer::ROU_CASE, RoutePeer::ROU_TYPE, RoutePeer::ROU_DEFAULT, RoutePeer::ROU_CONDITION, RoutePeer::ROU_TO_LAST_USER, RoutePeer::ROU_OPTIONAL, RoutePeer::ROU_SEND_EMAIL, RoutePeer::ROU_SOURCEANCHOR, RoutePeer::ROU_TARGETANCHOR, RoutePeer::ROU_TO_PORT, RoutePeer::ROU_FROM_PORT, RoutePeer::ROU_EVN_UID, RoutePeer::GAT_UID, ),
BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_DEFAULT', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', 'ROU_TO_PORT', 'ROU_FROM_PORT', 'ROU_EVN_UID', 'GAT_UID', 'ROU_ELEMENT_ORIGIN', ), BasePeer::TYPE_FIELDNAME => array ('ROU_UID', 'ROU_PARENT', 'PRO_UID', 'TAS_UID', 'ROU_NEXT_TASK', 'ROU_CASE', 'ROU_TYPE', 'ROU_DEFAULT', 'ROU_CONDITION', 'ROU_TO_LAST_USER', 'ROU_OPTIONAL', 'ROU_SEND_EMAIL', 'ROU_SOURCEANCHOR', 'ROU_TARGETANCHOR', 'ROU_TO_PORT', 'ROU_FROM_PORT', 'ROU_EVN_UID', 'GAT_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
); );
/** /**
@@ -112,10 +109,10 @@ abstract class BaseRoutePeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouDefault' => 7, 'RouCondition' => 8, 'RouToLastUser' => 9, 'RouOptional' => 10, 'RouSendEmail' => 11, 'RouSourceanchor' => 12, 'RouTargetanchor' => 13, 'RouToPort' => 14, 'RouFromPort' => 15, 'RouEvnUid' => 16, 'GatUid' => 17, 'RouElementOrigin' => 18, ), BasePeer::TYPE_PHPNAME => array ('RouUid' => 0, 'RouParent' => 1, 'ProUid' => 2, 'TasUid' => 3, 'RouNextTask' => 4, 'RouCase' => 5, 'RouType' => 6, 'RouDefault' => 7, 'RouCondition' => 8, 'RouToLastUser' => 9, 'RouOptional' => 10, 'RouSendEmail' => 11, 'RouSourceanchor' => 12, 'RouTargetanchor' => 13, 'RouToPort' => 14, 'RouFromPort' => 15, 'RouEvnUid' => 16, 'GatUid' => 17, ),
BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_DEFAULT => 7, RoutePeer::ROU_CONDITION => 8, RoutePeer::ROU_TO_LAST_USER => 9, RoutePeer::ROU_OPTIONAL => 10, RoutePeer::ROU_SEND_EMAIL => 11, RoutePeer::ROU_SOURCEANCHOR => 12, RoutePeer::ROU_TARGETANCHOR => 13, RoutePeer::ROU_TO_PORT => 14, RoutePeer::ROU_FROM_PORT => 15, RoutePeer::ROU_EVN_UID => 16, RoutePeer::GAT_UID => 17, RoutePeer::ROU_ELEMENT_ORIGIN => 18, ), BasePeer::TYPE_COLNAME => array (RoutePeer::ROU_UID => 0, RoutePeer::ROU_PARENT => 1, RoutePeer::PRO_UID => 2, RoutePeer::TAS_UID => 3, RoutePeer::ROU_NEXT_TASK => 4, RoutePeer::ROU_CASE => 5, RoutePeer::ROU_TYPE => 6, RoutePeer::ROU_DEFAULT => 7, RoutePeer::ROU_CONDITION => 8, RoutePeer::ROU_TO_LAST_USER => 9, RoutePeer::ROU_OPTIONAL => 10, RoutePeer::ROU_SEND_EMAIL => 11, RoutePeer::ROU_SOURCEANCHOR => 12, RoutePeer::ROU_TARGETANCHOR => 13, RoutePeer::ROU_TO_PORT => 14, RoutePeer::ROU_FROM_PORT => 15, RoutePeer::ROU_EVN_UID => 16, RoutePeer::GAT_UID => 17, ),
BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_DEFAULT' => 7, 'ROU_CONDITION' => 8, 'ROU_TO_LAST_USER' => 9, 'ROU_OPTIONAL' => 10, 'ROU_SEND_EMAIL' => 11, 'ROU_SOURCEANCHOR' => 12, 'ROU_TARGETANCHOR' => 13, 'ROU_TO_PORT' => 14, 'ROU_FROM_PORT' => 15, 'ROU_EVN_UID' => 16, 'GAT_UID' => 17, 'ROU_ELEMENT_ORIGIN' => 18, ), BasePeer::TYPE_FIELDNAME => array ('ROU_UID' => 0, 'ROU_PARENT' => 1, 'PRO_UID' => 2, 'TAS_UID' => 3, 'ROU_NEXT_TASK' => 4, 'ROU_CASE' => 5, 'ROU_TYPE' => 6, 'ROU_DEFAULT' => 7, 'ROU_CONDITION' => 8, 'ROU_TO_LAST_USER' => 9, 'ROU_OPTIONAL' => 10, 'ROU_SEND_EMAIL' => 11, 'ROU_SOURCEANCHOR' => 12, 'ROU_TARGETANCHOR' => 13, 'ROU_TO_PORT' => 14, 'ROU_FROM_PORT' => 15, 'ROU_EVN_UID' => 16, 'GAT_UID' => 17, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
); );
/** /**
@@ -252,8 +249,6 @@ abstract class BaseRoutePeer
$criteria->addSelectColumn(RoutePeer::GAT_UID); $criteria->addSelectColumn(RoutePeer::GAT_UID);
$criteria->addSelectColumn(RoutePeer::ROU_ELEMENT_ORIGIN);
} }
const COUNT = 'COUNT(ROUTE.ROU_UID)'; const COUNT = 'COUNT(ROUTE.ROU_UID)';

3
workflow/engine/config/schema.xml
View File

@@ -913,6 +913,7 @@
<column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/> <column name="PRO_COST" type="DECIMAL" size="7,2" required="false" default="0"/>
<column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/> <column name="PRO_UNIT_COST" type="VARCHAR" size="50" required="false" default=""/>
<column name="PRO_ITEE" type="INTEGER" required="true" default="0"/> <column name="PRO_ITEE" type="INTEGER" required="true" default="0"/>
<column name="PRO_ACTION_DONE" type="LONGVARCHAR" default="" />
<validator column="PRO_TIMEUNIT"> <validator column="PRO_TIMEUNIT">
<rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/> <rule name="validValues" value="WEEKS|MONTHS|DAYS|HOURS|MINUTES" message="Please select a valid Time Unit."/>
</validator> </validator>
@@ -1086,7 +1087,6 @@
<column name="ROU_FROM_PORT" type="INTEGER" required="true" default="2"/> <column name="ROU_FROM_PORT" type="INTEGER" required="true" default="2"/>
<column name="ROU_EVN_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="ROU_EVN_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="GAT_UID" type="VARCHAR" size="32" required="true" default=""/> <column name="GAT_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="ROU_ELEMENT_ORIGIN" type="VARCHAR" size="32" required="false" default=""/>
<validator column="ROU_UID"> <validator column="ROU_UID">
<rule name="maxLength" value="32" message="Route UID can be no larger than ${value} in size"/> <rule name="maxLength" value="32" message="Route UID can be no larger than ${value} in size"/>
<rule name="required" message="Route UID is required."/> <rule name="required" message="Route UID is required."/>
@@ -4641,7 +4641,6 @@
<column name="ELEMENT_UID" type="VARCHAR" size="32" required="true" /> <column name="ELEMENT_UID" type="VARCHAR" size="32" required="true" />
<column name="ELEMENT_TYPE" type="VARCHAR" size="50" required="true" default=""/> <column name="ELEMENT_TYPE" type="VARCHAR" size="50" required="true" default=""/>
<column name="TAS_UID" type="VARCHAR" size="32" required="true" /> <column name="TAS_UID" type="VARCHAR" size="32" required="true" />
<column name="ELEMENT_UID_DEST" type="VARCHAR" size="32" required="false" default=""/>
</table> </table>
<table name="ABE_CONFIGURATION"> <table name="ABE_CONFIGURATION">
<vendor type="mysql"> <vendor type="mysql">

3
workflow/engine/data/mysql/schema.sql
View File

@@ -460,6 +460,7 @@ CREATE TABLE `PROCESS`
`PRO_COST` DECIMAL(7,2) default 0, `PRO_COST` DECIMAL(7,2) default 0,
`PRO_UNIT_COST` VARCHAR(50) default '', `PRO_UNIT_COST` VARCHAR(50) default '',
`PRO_ITEE` INTEGER default 0 NOT NULL, `PRO_ITEE` INTEGER default 0 NOT NULL,
`PRO_ACTION_DONE` MEDIUMTEXT default '',
PRIMARY KEY (`PRO_UID`) PRIMARY KEY (`PRO_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -537,7 +538,6 @@ CREATE TABLE `ROUTE`
`ROU_FROM_PORT` INTEGER default 2 NOT NULL, `ROU_FROM_PORT` INTEGER default 2 NOT NULL,
`ROU_EVN_UID` VARCHAR(32) default '' NOT NULL, `ROU_EVN_UID` VARCHAR(32) default '' NOT NULL,
`GAT_UID` VARCHAR(32) default '' NOT NULL, `GAT_UID` VARCHAR(32) default '' NOT NULL,
`ROU_ELEMENT_ORIGIN` VARCHAR(32) default '',
PRIMARY KEY (`ROU_UID`) PRIMARY KEY (`ROU_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Differents flows for a flow in business process'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Differents flows for a flow in business process';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -2678,7 +2678,6 @@ CREATE TABLE `ELEMENT_TASK_RELATION`
`ELEMENT_UID` VARCHAR(32) NOT NULL, `ELEMENT_UID` VARCHAR(32) NOT NULL,
`ELEMENT_TYPE` VARCHAR(50) default '' NOT NULL, `ELEMENT_TYPE` VARCHAR(50) default '' NOT NULL,
`TAS_UID` VARCHAR(32) NOT NULL, `TAS_UID` VARCHAR(32) NOT NULL,
`ELEMENT_UID_DEST` VARCHAR(32) default '',
PRIMARY KEY (`ETR_UID`) PRIMARY KEY (`ETR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8'; )ENGINE=InnoDB DEFAULT CHARSET='utf8';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

7
workflow/engine/methods/processes/processes_Delete.php
View File

@@ -42,9 +42,9 @@ if ($access != 1) {
//$oProcessMap = new ProcessMap(); //$oProcessMap = new ProcessMap();
$uids = explode(',', $_POST['PRO_UIDS']); $uids = explode(',', $_POST['PRO_UIDS']);
try { try {
foreach ($uids as $uid) { foreach ($uids as $uid) {
//Add Audit Log //Add Audit Log
$oProcess = new Process(); $oProcess = new Process();
$process=$oProcess->load($uid); $process=$oProcess->load($uid);
@@ -59,10 +59,11 @@ try {
$resp = new StdClass(); $resp = new StdClass();
$resp->status = 0; $resp->status = 0;
$resp->msg = 'All process was deleted successfully'; $resp->msg = 'All process was deleted successfully';
echo G::json_encode($resp); echo G::json_encode($resp);
} catch (Exception $e) { } catch (Exception $e) {
$resp = new stdClass();
$resp->status = 1; $resp->status = 1;
$resp->msg = $e->getMessage(); $resp->msg = $e->getMessage();
echo G::json_encode($resp); echo G::json_encode($resp);

28
workflow/engine/src/ProcessMaker/BusinessModel/ElementTaskRelation.php
View File

@@ -9,8 +9,7 @@ class ElementTaskRelation
"PRJ_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectUid"), "PRJ_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectUid"),
"ELEMENT_UID" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "elementUid"), "ELEMENT_UID" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "elementUid"),
"ELEMENT_TYPE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "elementType"), "ELEMENT_TYPE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "elementType"),
"TAS_UID" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "taskUid"), "TAS_UID" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "taskUid")
"ELEMENT_UID_DEST" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "elementUidDest")
); );
private $formatFieldNameInUppercase = true; private $formatFieldNameInUppercase = true;
@@ -360,30 +359,5 @@ class ElementTaskRelation
throw $e; throw $e;
} }
} }
/**
* Verify if exists the Element-Task-Relation Gateway to Gateway
*
* @param string $elementUid uid of Element-Task-Relation
* @param string $elementUidDest uid of Element-Task-Relation Destiny
*
* return bool Return true if exists the Element-Task-Relation Gateway to Gateway, false otherwise
*/
public function existsGatewayToGateway($elementUid,$elementUidDest)
{
try {
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\ElementTaskRelationPeer::ETR_UID);
$criteria->add(\ElementTaskRelationPeer::ELEMENT_UID, $elementUid, \Criteria::EQUAL);
$criteria->add(\ElementTaskRelationPeer::ELEMENT_UID_DEST, $elementUidDest, \Criteria::EQUAL);
$rsCriteria = \UsersPeer::doSelectRS( $criteria );
$rsCriteria->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$rsCriteria->next();
return ( $rsCriteria->getRow() )? true : false;
} catch (\Exception $e) {
throw $e;
}
}
} }

195
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -718,26 +718,10 @@ class BpmnWorkflow extends Project\Bpmn
} }
*/ */
public function createTaskByElement($elementUid, $elementType, $key, $elementUidDest="", $routeType = '') private function __createTaskByElement($elementUid, $elementType, $key)
{ {
try { try {
$flagElementTaskRelation = false; if (isset($this->arrayElementTaskRelation[$elementUid])) {
if($elementUidDest != ""){
if( isset($this->arrayElementTaskRelation[$elementUid][$elementUidDest]) ){
$flagElementTaskRelation = true;
}else{
$flagElementTaskRelation = false;
}
}else{
if (isset($this->arrayElementTaskRelation[$elementUid])) {
$taskUid = $this->arrayElementTaskRelation[$elementUid];
$flagElementTaskRelation = true;
}else{
$flagElementTaskRelation = false;
}
}
if ($flagElementTaskRelation || (isset($this->arrayElementTaskRelation[$elementUid]) && $routeType ===
'SEC-JOIN')) {
$taskUid = $this->arrayElementTaskRelation[$elementUid]; $taskUid = $this->arrayElementTaskRelation[$elementUid];
} else { } else {
$taskPosX = 0; $taskPosX = 0;
@@ -793,30 +777,16 @@ class BpmnWorkflow extends Project\Bpmn
//Element-Task-Relation - Create //Element-Task-Relation - Create
$elementTaskRelation = new \ProcessMaker\BusinessModel\ElementTaskRelation(); $elementTaskRelation = new \ProcessMaker\BusinessModel\ElementTaskRelation();
if($elementUidDest == ""){ $arrayResult = $elementTaskRelation->create(
$arrayResult = $elementTaskRelation->create( $this->wp->getUid(),
$this->wp->getUid(), [
array( 'ELEMENT_UID' => $elementUid,
"ELEMENT_UID" => $elementUid, 'ELEMENT_TYPE' => $elementType,
"ELEMENT_TYPE" => $elementType, 'TAS_UID' => $taskUid
"TAS_UID" => $taskUid ]
) );
);
}else{
$createGaToGa = $elementTaskRelation->existsGatewayToGateway($elementUid, $elementUidDest);
if(!$createGaToGa){
$arrayResult = $elementTaskRelation->create(
$this->wp->getUid(),
array(
"ELEMENT_UID" => $elementUid,
"ELEMENT_TYPE" => $elementType,
"TAS_UID" => $taskUid,
"ELEMENT_UID_DEST" => $elementUidDest
)
);
}
}
//Array - Add element
$this->arrayElementTaskRelation[$elementUid] = $taskUid; $this->arrayElementTaskRelation[$elementUid] = $taskUid;
} }
@@ -899,12 +869,10 @@ class BpmnWorkflow extends Project\Bpmn
break; break;
case "bpmnGateway": case "bpmnGateway":
//Gateway ----> Gateway //Gateway ----> Gateway
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$gatewayUid, $arrayFlowData['FLO_ELEMENT_DEST'],
"bpmnGateway", 'bpmnGateway',
"gateway-to-gateway", 'gateway-to-gateway'
$arrayFlowData["FLO_ELEMENT_DEST"],
$routeType
); );
$result = $this->wp->addRoute($activityUid, $taskUid, $routeType, $routeCondition, $routeDefault); $result = $this->wp->addRoute($activityUid, $taskUid, $routeType, $routeCondition, $routeDefault);
@@ -924,7 +892,7 @@ class BpmnWorkflow extends Project\Bpmn
//$event->getEvnMarker(): EMPTY or MESSAGETHROW //$event->getEvnMarker(): EMPTY or MESSAGETHROW
switch ($event->getEvnMarker()) { switch ($event->getEvnMarker()) {
case "MESSAGETHROW": case "MESSAGETHROW":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-message-event" "end-message-event"
@@ -934,7 +902,7 @@ class BpmnWorkflow extends Project\Bpmn
$result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL"); $result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL");
break; break;
case "EMAIL": case "EMAIL":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-email-event" "end-email-event"
@@ -986,7 +954,7 @@ class BpmnWorkflow extends Project\Bpmn
"EMAIL" => "intermediate-throw-email-event" "EMAIL" => "intermediate-throw-email-event"
); );
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$eventUid, $eventUid,
"bpmnEvent", "bpmnEvent",
$arrayKey[$arrayEventData["EVN_MARKER"]] $arrayKey[$arrayEventData["EVN_MARKER"]]
@@ -1039,7 +1007,7 @@ class BpmnWorkflow extends Project\Bpmn
//$event->getEvnMarker(): EMPTY or MESSAGETHROW //$event->getEvnMarker(): EMPTY or MESSAGETHROW
switch ($event->getEvnMarker()) { switch ($event->getEvnMarker()) {
case "MESSAGETHROW": case "MESSAGETHROW":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-message-event" "end-message-event"
@@ -1049,7 +1017,7 @@ class BpmnWorkflow extends Project\Bpmn
$result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL"); $result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL");
break; break;
case "EMAIL": case "EMAIL":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-email-event" "end-email-event"
@@ -1060,7 +1028,7 @@ class BpmnWorkflow extends Project\Bpmn
break; break;
default: default:
//EMPTY //and others types //EMPTY //and others types
$result = $this->wp->addRoute($activityUid, -1, $routeType, $routeCondition, $routeDefault, $eventUid); $result = $this->wp->addRoute($activityUid, -1, $routeType, $routeCondition, $routeDefault);
break; break;
} }
break; break;
@@ -1088,18 +1056,17 @@ class BpmnWorkflow extends Project\Bpmn
public function mapBpmnFlowsToWorkflowRoutes() public function mapBpmnFlowsToWorkflowRoutes()
{ {
//Task dummies //Delete Task Routes //Delete Routes
foreach ($this->arrayElementTaskRelation as $value) { $criteria = new \Criteria('workflow');
$this->wp->resetTaskRoutes($value);
} $criteria->add(\RoutePeer::PRO_UID, $this->wp->getUid(), \Criteria::EQUAL);
\RoutePeer::doDelete($criteria);
//Activities //Activities
foreach ($this->getActivities() as $value) { foreach ($this->getActivities() as $value) {
$activity = $value; $activity = $value;
//Delete Task Routes
$this->wp->resetTaskRoutes($activity["ACT_UID"]);
//Flows //Flows
$arrayFlow = \BpmnFlow::findAllBy(array( $arrayFlow = \BpmnFlow::findAllBy(array(
\BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL), \BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL),
@@ -1133,7 +1100,7 @@ class BpmnWorkflow extends Project\Bpmn
//$event->getEvnMarker(): EMPTY or MESSAGETHROW //$event->getEvnMarker(): EMPTY or MESSAGETHROW
switch ($event->getEvnMarker()) { switch ($event->getEvnMarker()) {
case "MESSAGETHROW": case "MESSAGETHROW":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-message-event" "end-message-event"
@@ -1143,7 +1110,7 @@ class BpmnWorkflow extends Project\Bpmn
$result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL"); $result = $this->wp->addRoute($taskUid, -1, "SEQUENTIAL");
break; break;
case "EMAIL": case "EMAIL":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event->getEvnUid(), $event->getEvnUid(),
"bpmnEvent", "bpmnEvent",
"end-email-event" "end-email-event"
@@ -1178,7 +1145,7 @@ class BpmnWorkflow extends Project\Bpmn
case "START": case "START":
switch ($event["EVN_MARKER"]) { switch ($event["EVN_MARKER"]) {
case "MESSAGECATCH": case "MESSAGECATCH":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event["EVN_UID"], $event["EVN_UID"],
"bpmnEvent", "bpmnEvent",
"start-message-event" "start-message-event"
@@ -1189,7 +1156,7 @@ class BpmnWorkflow extends Project\Bpmn
$this->mapBpmnEventToWorkflowRoutes($taskUid, $event["EVN_UID"]); $this->mapBpmnEventToWorkflowRoutes($taskUid, $event["EVN_UID"]);
break; break;
case "TIMER": case "TIMER":
$taskUid = $this->createTaskByElement( $taskUid = $this->__createTaskByElement(
$event["EVN_UID"], $event["EVN_UID"],
"bpmnEvent", "bpmnEvent",
"start-timer-event" "start-timer-event"
@@ -1481,6 +1448,7 @@ class BpmnWorkflow extends Project\Bpmn
$uidOld = $lanesetData["LNS_UID"]; $uidOld = $lanesetData["LNS_UID"];
$lanesetData["LNS_UID"] = Util\Common::generateUID(); $lanesetData["LNS_UID"] = Util\Common::generateUID();
$diagram = self::refreshElementUid($diagram, $uidOld, $lanesetData["LNS_UID"]); $diagram = self::refreshElementUid($diagram, $uidOld, $lanesetData["LNS_UID"]);
$result[] = array( $result[] = array(
"object" => "laneset", "object" => "laneset",
"old_uid" => $uidOld, "old_uid" => $uidOld,
@@ -1525,6 +1493,7 @@ class BpmnWorkflow extends Project\Bpmn
$uidOld = $laneData["LAN_UID"]; $uidOld = $laneData["LAN_UID"];
$laneData["LAN_UID"] = Util\Common::generateUID(); $laneData["LAN_UID"] = Util\Common::generateUID();
$diagram = self::refreshElementUid($diagram, $uidOld, $laneData["LAN_UID"]); $diagram = self::refreshElementUid($diagram, $uidOld, $laneData["LAN_UID"]);
$result[] = array( $result[] = array(
"object" => "lane", "object" => "lane",
"old_uid" => $uidOld, "old_uid" => $uidOld,
@@ -1948,14 +1917,27 @@ class BpmnWorkflow extends Project\Bpmn
$arrayGatewayData = $bwp->getGateway($value); $arrayGatewayData = $bwp->getGateway($value);
if (!is_null($arrayGatewayData)) { if (!is_null($arrayGatewayData)) {
$arrayFlow = \BpmnFlow::findAllBy(array( $arrayFlow = \BpmnFlow::findAllBy([
\BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL), \BpmnFlowPeer::FLO_TYPE => ['MESSAGE', \Criteria::NOT_EQUAL],
\BpmnFlowPeer::FLO_ELEMENT_DEST => $arrayGatewayData["GAT_UID"], \BpmnFlowPeer::FLO_ELEMENT_DEST => $arrayGatewayData['GAT_UID'],
\BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE => "bpmnGateway" \BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE => 'bpmnGateway'
)); ]);
if (count($arrayFlow) > 1) { if (count($arrayFlow) > 1) {
$bwp->updateGateway($arrayGatewayData["GAT_UID"], array("GAT_DIRECTION" => "CONVERGING")); $arrayFlow = \BpmnFlow::findAllBy([
\BpmnFlowPeer::FLO_TYPE => ['MESSAGE', \Criteria::NOT_EQUAL],
\BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $arrayGatewayData['GAT_UID'],
\BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => 'bpmnGateway'
]);
if (count($arrayFlow) == 1) {
$bwp->updateGateway($arrayGatewayData['GAT_UID'], ['GAT_DIRECTION' => 'CONVERGING']);
$arrayFlowData = $arrayFlow[0]->toArray();
$bpmn = new Project\Bpmn();
$bpmn->updateFlow($arrayFlowData['FLO_UID'], array_merge($arrayFlowData, ['FLO_CONDITION' => '']));
}
} }
} }
} }
@@ -1968,6 +1950,8 @@ class BpmnWorkflow extends Project\Bpmn
//Map Bpmn-Flows to Workflow-Routes //Map Bpmn-Flows to Workflow-Routes
$bwp->mapBpmnFlowsToWorkflowRoutes(); $bwp->mapBpmnFlowsToWorkflowRoutes();
$bwp->__gatewayToGatewayDeleteCorruptedRecords(); //Delete corrupted records in task and element_task_relation tables
//Return //Return
return $result; return $result;
} }
@@ -2058,5 +2042,74 @@ class BpmnWorkflow extends Project\Bpmn
); );
return $diagram; return $diagram;
} }
}
private function __gatewayToGatewayDeleteCorruptedRecords()
{
//Delete corrupted records in task and element_task_relation tables
$actionDone = 'GATEWAYTOGATEWAY_DELETE_CORRUPTED_RECORDS';
$criteria = new \Criteria('workflow');
$criteria->addSelectColumn(\ProcessPeer::PRO_UID);
$criteria->add(\ProcessPeer::PRO_UID, $this->wp->getUid(), \Criteria::EQUAL);
$criteria->add(\ProcessPeer::PRO_ACTION_DONE, '%' . $actionDone . '%', \Criteria::LIKE);
$rsCriteria = \ProcessPeer::doSelectRS($criteria);
if (!$rsCriteria->next()) {
$arrayTaskUid = [];
$criteria = new \Criteria('workflow');
$criteria->addSelectColumn(\TaskPeer::TAS_UID);
$criteria->addAlias('RT', \RoutePeer::TABLE_NAME);
$criteria->addAlias('RNT', \RoutePeer::TABLE_NAME);
$arrayCondition = [];
$arrayCondition[] = [\TaskPeer::TAS_UID, 'RT.TAS_UID', \Criteria::EQUAL];
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$arrayCondition = [];
$arrayCondition[] = [\TaskPeer::TAS_UID, 'RNT.ROU_NEXT_TASK', \Criteria::EQUAL];
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\TaskPeer::PRO_UID, $this->wp->getUid(), \Criteria::EQUAL);
$criteria->add(\TaskPeer::TAS_TYPE, 'GATEWAYTOGATEWAY', \Criteria::EQUAL);
$criteria->add(
$criteria->getNewCriterion('RT.ROU_UID', null, \Criteria::ISNULL)->addAnd(
$criteria->getNewCriterion('RNT.ROU_UID', null, \Criteria::ISNULL))
);
$rsCriteria = \TaskPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$record = $rsCriteria->getRow();
$arrayTaskUid[] = $record['TAS_UID'];
}
//Delete Task corrupted
$criteria = new \Criteria('workflow');
$criteria->add(\TaskPeer::TAS_UID, $arrayTaskUid, \Criteria::IN);
$result = \TaskPeer::doDelete($criteria);
//Delete ElementTaskRelation corrupted
$criteria = new \Criteria('workflow');
$criteria->add(\ElementTaskRelationPeer::TAS_UID, $arrayTaskUid, \Criteria::IN);
$result = \ElementTaskRelationPeer::doDelete($criteria);
//Update Process
$process = \ProcessPeer::retrieveByPk($this->wp->getUid());
$arrayActionDone = ($process->getProActionDone() != '')? unserialize($process->getProActionDone()) : [];
$arrayActionDone[] = $actionDone;
$this->wp->update(['PRO_ACTION_DONE' => serialize($arrayActionDone)]);
}
}
}

35
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -25,10 +25,6 @@ class Workflow extends Handler
protected $process; protected $process;
protected $proUid; protected $proUid;
protected $tasks = array();
protected $routes = array();
public function __construct($data = null) public function __construct($data = null)
{ {
if (! is_null($data)) { if (! is_null($data)) {
@@ -66,13 +62,13 @@ class Workflow extends Handler
$data['PRO_CATEGORY'] = array_key_exists('PRO_CATEGORY', $data) ? $data['PRO_CATEGORY'] : ""; $data['PRO_CATEGORY'] = array_key_exists('PRO_CATEGORY', $data) ? $data['PRO_CATEGORY'] : "";
try { try {
// Check to make sure that there aren't any html sneaking into process titles. // Check to make sure that there aren't any html sneaking into process titles.
$testTitle = htmlspecialchars($data['PRO_TITLE']); $testTitle = htmlspecialchars($data['PRO_TITLE']);
if($testTitle != $data['PRO_TITLE']) { if($testTitle != $data['PRO_TITLE']) {
$data['PRO_TITLE'] = $testTitle; $data['PRO_TITLE'] = $testTitle;
} }
self::log("Create Process with data:", $data); self::log("Create Process with data:", $data);
@@ -373,7 +369,7 @@ class Workflow extends Handler
* @return string * @return string
* @throws \Exception * @throws \Exception
*/ */
public function addRoute($fromTasUid, $toTasUid, $type, $condition = "", $default = 0, $eventUidOrigin = "") public function addRoute($fromTasUid, $toTasUid, $type, $condition = '', $default = 0)
{ {
try { try {
$validTypes = array("SEQUENTIAL", "SELECT", "EVALUATE", "PARALLEL", "PARALLEL-BY-EVALUATION", "SEC-JOIN", "DISCRIMINATOR"); $validTypes = array("SEQUENTIAL", "SELECT", "EVALUATE", "PARALLEL", "PARALLEL-BY-EVALUATION", "SEC-JOIN", "DISCRIMINATOR");
@@ -393,21 +389,13 @@ class Workflow extends Handler
//$oTasks->deleteAllRoutesOfTask($this->proUid, $fromTasUid); //$oTasks->deleteAllRoutesOfTask($this->proUid, $fromTasUid);
//} //}
if($toTasUid == "-1"){ $route = \Route::findOneBy([
$route = \Route::findOneBy(array( \RoutePeer::TAS_UID => $fromTasUid,
\RoutePeer::TAS_UID => $fromTasUid, \RoutePeer::ROU_NEXT_TASK => $toTasUid
\RoutePeer::ROU_NEXT_TASK => $toTasUid, ]);
\RoutePeer::ROU_ELEMENT_ORIGIN => $eventUidOrigin
));
} else {
$route = \Route::findOneBy(array(
\RoutePeer::TAS_UID => $fromTasUid,
\RoutePeer::ROU_NEXT_TASK => $toTasUid
));
}
if (is_null($route)) { if (is_null($route)) {
$result = $this->saveNewPattern($this->proUid, $fromTasUid, $toTasUid, $type, $condition, $default, $eventUidOrigin); $result = $this->saveNewPattern($this->proUid, $fromTasUid, $toTasUid, $type, $condition, $default);
} else { } else {
$result = $this->updateRoute($route->getRouUid(), array( $result = $this->updateRoute($route->getRouUid(), array(
"TAS_UID" => $fromTasUid, "TAS_UID" => $fromTasUid,
@@ -521,7 +509,7 @@ class Workflow extends Handler
} }
} }
private function saveNewPattern($sProcessUID = "", $sTaskUID = "", $sNextTask = "", $sType = "", $condition = "", $default = 0, $elementUidOrigin = "") private function saveNewPattern($sProcessUID = '', $sTaskUID = '', $sNextTask = '', $sType = '', $condition = '', $default = 0)
{ {
try { try {
self::log("Add Route from task: $sTaskUID -> to task: $sNextTask ($sType)"); self::log("Add Route from task: $sTaskUID -> to task: $sNextTask ($sType)");
@@ -544,7 +532,6 @@ class Workflow extends Handler
$aFields["ROU_CASE"] = (int)($aRow["ROUTE_NUMBER"]) + 1; $aFields["ROU_CASE"] = (int)($aRow["ROUTE_NUMBER"]) + 1;
$aFields["ROU_TYPE"] = $sType; $aFields["ROU_TYPE"] = $sType;
$aFields["ROU_DEFAULT"] = $default; $aFields["ROU_DEFAULT"] = $default;
$aFields["ROU_ELEMENT_ORIGIN"] = $elementUidOrigin;
if(! empty($condition)) { if(! empty($condition)) {
$aFields['ROU_CONDITION'] = $condition; $aFields['ROU_CONDITION'] = $condition;