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

PM-00000 "Improvements for BPMN-DESIGNER (back-end)" SOLVED

Browse Source 
Issue:
    Improvements for BPMN-DESIGNER: Events, Gateways (back-end)
Description:
    - Se han realizado varias mejoras al back-end del BPMN-DESIGNER:
          > Se a agregado soporte para los events de otros tipos
            que no sean message-event (solo se permitio que se acepte
            el dibujado, aun no tienen funcionalidad). Tambien se a
            logrado que el diseñel flujo sea funcional no importando
            que estos events pertenezcan al flujo.
          > Se a mejorado el gateway-to-gateway (ya no es necesario
            crear siempre su task-dummy)
          > Se hicieron mejoras al default-flow
          > Se implementaron metodos necesarios para que cuando un
            event de tipo start es eliminado, este cambio sea reflejado
            en su activity
    - Los projects/processes creados antes de la fecha de creacion de
      este commit no funcionaran. Se sugiere crear nuevos projects/processePM-00000 "Improvements for BPMN-DESIGNER (back-end)" SOLVED

Issue:
    Improvements for BPMN-DESIGNER: Events, Gateways (back-end)
Description:
    - Se han realizado varias mejoras al back-end del BPMN-DESIGNER:
          > Se a agregado soporte para los events de otros tipos
            que no sean message-event (solo se permitio que se acepte
            el dibujado, aun no tienen funcionalidad). Tambien se a
            logrado que el diseñel flujo sea funcional no importando
            que estos events pertenezcan al flujo.
          > Se a mejorado el gateway-to-gateway (ya no es necesario
            crear siempre su task-dummy)
          > Se hicieron mejoras al default-flow
          > Se implementaron metodos necesarios para que cuando un
            event de tipo start es eliminado, este cambio sea reflejado
            en su activity
    - Los projects/processes creados antes de la fecha de creacion de
      este commit no funcionaran. Se sugiere crear nuevos projects/processess
This commit is contained in:
Victor Saisa Lopez
2015-03-20 17:13:44 -04:00
parent 9c7b459e74
commit 8f30cc7cec
17 changed files with 638 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/ElementTaskRelation.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
class ElementTaskRelation extends BaseElementTaskRelation
{
}

5
workflow/engine/classes/model/ElementTaskRelationPeer.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
class ElementTaskRelationPeer extends BaseElementTaskRelationPeer
{
}

5
workflow/engine/classes/model/MessageEventTaskRelation.php
View File

@@ -1,5 +0,0 @@
<?php
class MessageEventTaskRelation extends BaseMessageEventTaskRelation
{
}

5
workflow/engine/classes/model/MessageEventTaskRelationPeer.php
View File

@@ -1,5 +0,0 @@
<?php
class MessageEventTaskRelationPeer extends BaseMessageEventTaskRelationPeer
{
}

18
workflow/engine/classes/model/map/MessageEventTaskRelationMapBuilder.php → workflow/engine/classes/model/map/ElementTaskRelationMapBuilder.php
View File

@@ -5,7 +5,7 @@ include_once 'creole/CreoleTypes.php';
/**
* This class adds structure of 'MESSAGE_EVENT_TASK_RELATION' table to 'workflow' DatabaseMap object.
* This class adds structure of 'ELEMENT_TASK_RELATION' table to 'workflow' DatabaseMap object.
*
*
*
@@ -16,13 +16,13 @@ include_once 'creole/CreoleTypes.php';
*
* @package workflow.classes.model.map
*/
class MessageEventTaskRelationMapBuilder
class ElementTaskRelationMapBuilder
{
/**
* The (dot-path) name of this class
*/
const CLASS_NAME = 'classes.model.map.MessageEventTaskRelationMapBuilder';
const CLASS_NAME = 'classes.model.map.ElementTaskRelationMapBuilder';
/**
* The database map.
@@ -60,19 +60,21 @@ class MessageEventTaskRelationMapBuilder
{
$this->dbMap = Propel::getDatabaseMap('workflow');
$tMap = $this->dbMap->addTable('MESSAGE_EVENT_TASK_RELATION');
$tMap->setPhpName('MessageEventTaskRelation');
$tMap = $this->dbMap->addTable('ELEMENT_TASK_RELATION');
$tMap->setPhpName('ElementTaskRelation');
$tMap->setUseIdGenerator(false);
$tMap->addPrimaryKey('MSGETR_UID', 'MsgetrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addPrimaryKey('ETR_UID', 'EtrUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('EVN_UID', 'EvnUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ELEMENT_UID', 'ElementUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('ELEMENT_TYPE', 'ElementType', 'string', CreoleTypes::VARCHAR, true, 50);
$tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32);
} // doBuild()
} // MessageEventTaskRelationMapBuilder
} // ElementTaskRelationMapBuilder

204
workflow/engine/classes/model/om/BaseMessageEventTaskRelation.php → workflow/engine/classes/model/om/BaseElementTaskRelation.php
View File

@@ -7,31 +7,31 @@ require_once 'propel/om/Persistent.php';
include_once 'propel/util/Criteria.php';
include_once 'classes/model/MessageEventTaskRelationPeer.php';
include_once 'classes/model/ElementTaskRelationPeer.php';
/**
* Base class that represents a row from the 'MESSAGE_EVENT_TASK_RELATION' table.
* Base class that represents a row from the 'ELEMENT_TASK_RELATION' table.
*
*
*
* @package workflow.classes.model.om
*/
abstract class BaseMessageEventTaskRelation extends BaseObject implements Persistent
abstract class BaseElementTaskRelation extends BaseObject implements Persistent
{
/**
* The Peer class.
* Instance provides a convenient way of calling static methods on a class
* that calling code may not be able to identify.
* @var MessageEventTaskRelationPeer
* @var ElementTaskRelationPeer
*/
protected static $peer;
/**
* The value for the msgetr_uid field.
* The value for the etr_uid field.
* @var string
*/
protected $msgetr_uid;
protected $etr_uid;
/**
* The value for the prj_uid field.
@@ -40,10 +40,16 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
protected $prj_uid;
/**
* The value for the evn_uid field.
* The value for the element_uid field.
* @var string
*/
protected $evn_uid;
protected $element_uid;
/**
* The value for the element_type field.
* @var string
*/
protected $element_type = '';
/**
* The value for the tas_uid field.
@@ -66,14 +72,14 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
protected $alreadyInValidation = false;
/**
* Get the [msgetr_uid] column value.
* Get the [etr_uid] column value.
*
* @return string
*/
public function getMsgetrUid()
public function getEtrUid()
{
return $this->msgetr_uid;
return $this->etr_uid;
}
/**
@@ -88,14 +94,25 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
}
/**
* Get the [evn_uid] column value.
* Get the [element_uid] column value.
*
* @return string
*/
public function getEvnUid()
public function getElementUid()
{
return $this->evn_uid;
return $this->element_uid;
}
/**
* Get the [element_type] column value.
*
* @return string
*/
public function getElementType()
{
return $this->element_type;
}
/**
@@ -110,12 +127,12 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
}
/**
* Set the value of [msgetr_uid] column.
* Set the value of [etr_uid] column.
*
* @param string $v new value
* @return void
*/
public function setMsgetrUid($v)
public function setEtrUid($v)
{
// Since the native PHP type for this column is string,
@@ -124,12 +141,12 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
$v = (string) $v;
}
if ($this->msgetr_uid !== $v) {
$this->msgetr_uid = $v;
$this->modifiedColumns[] = MessageEventTaskRelationPeer::MSGETR_UID;
if ($this->etr_uid !== $v) {
$this->etr_uid = $v;
$this->modifiedColumns[] = ElementTaskRelationPeer::ETR_UID;
}
} // setMsgetrUid()
} // setEtrUid()
/**
* Set the value of [prj_uid] column.
@@ -148,18 +165,18 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
if ($this->prj_uid !== $v) {
$this->prj_uid = $v;
$this->modifiedColumns[] = MessageEventTaskRelationPeer::PRJ_UID;
$this->modifiedColumns[] = ElementTaskRelationPeer::PRJ_UID;
}
} // setPrjUid()
/**
* Set the value of [evn_uid] column.
* Set the value of [element_uid] column.
*
* @param string $v new value
* @return void
*/
public function setEvnUid($v)
public function setElementUid($v)
{
// Since the native PHP type for this column is string,
@@ -168,12 +185,34 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
$v = (string) $v;
}
if ($this->evn_uid !== $v) {
$this->evn_uid = $v;
$this->modifiedColumns[] = MessageEventTaskRelationPeer::EVN_UID;
if ($this->element_uid !== $v) {
$this->element_uid = $v;
$this->modifiedColumns[] = ElementTaskRelationPeer::ELEMENT_UID;
}
} // setEvnUid()
} // setElementUid()
/**
* Set the value of [element_type] column.
*
* @param string $v new value
* @return void
*/
public function setElementType($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_type !== $v || $v === '') {
$this->element_type = $v;
$this->modifiedColumns[] = ElementTaskRelationPeer::ELEMENT_TYPE;
}
} // setElementType()
/**
* Set the value of [tas_uid] column.
@@ -192,7 +231,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
if ($this->tas_uid !== $v) {
$this->tas_uid = $v;
$this->modifiedColumns[] = MessageEventTaskRelationPeer::TAS_UID;
$this->modifiedColumns[] = ElementTaskRelationPeer::TAS_UID;
}
} // setTasUid()
@@ -214,23 +253,25 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
{
try {
$this->msgetr_uid = $rs->getString($startcol + 0);
$this->etr_uid = $rs->getString($startcol + 0);
$this->prj_uid = $rs->getString($startcol + 1);
$this->evn_uid = $rs->getString($startcol + 2);
$this->element_uid = $rs->getString($startcol + 2);
$this->tas_uid = $rs->getString($startcol + 3);
$this->element_type = $rs->getString($startcol + 3);
$this->tas_uid = $rs->getString($startcol + 4);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 4; // 4 = MessageEventTaskRelationPeer::NUM_COLUMNS - MessageEventTaskRelationPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 5; // 5 = ElementTaskRelationPeer::NUM_COLUMNS - ElementTaskRelationPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating MessageEventTaskRelation object", $e);
throw new PropelException("Error populating ElementTaskRelation object", $e);
}
}
@@ -250,12 +291,12 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
}
if ($con === null) {
$con = Propel::getConnection(MessageEventTaskRelationPeer::DATABASE_NAME);
$con = Propel::getConnection(ElementTaskRelationPeer::DATABASE_NAME);
}
try {
$con->begin();
MessageEventTaskRelationPeer::doDelete($this, $con);
ElementTaskRelationPeer::doDelete($this, $con);
$this->setDeleted(true);
$con->commit();
} catch (PropelException $e) {
@@ -281,7 +322,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
}
if ($con === null) {
$con = Propel::getConnection(MessageEventTaskRelationPeer::DATABASE_NAME);
$con = Propel::getConnection(ElementTaskRelationPeer::DATABASE_NAME);
}
try {
@@ -316,14 +357,14 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
// If this object has been modified, then save it to the database.
if ($this->isModified()) {
if ($this->isNew()) {
$pk = MessageEventTaskRelationPeer::doInsert($this, $con);
$pk = ElementTaskRelationPeer::doInsert($this, $con);
$affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
// should always be true here (even though technically
// BasePeer::doInsert() can insert multiple rows).
$this->setNew(false);
} else {
$affectedRows += MessageEventTaskRelationPeer::doUpdate($this, $con);
$affectedRows += ElementTaskRelationPeer::doUpdate($this, $con);
}
$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
}
@@ -394,7 +435,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
$failureMap = array();
if (($retval = MessageEventTaskRelationPeer::doValidate($this, $columns)) !== true) {
if (($retval = ElementTaskRelationPeer::doValidate($this, $columns)) !== true) {
$failureMap = array_merge($failureMap, $retval);
}
@@ -417,7 +458,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
{
$pos = MessageEventTaskRelationPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
$pos = ElementTaskRelationPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
return $this->getByPosition($pos);
}
@@ -432,15 +473,18 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
{
switch($pos) {
case 0:
return $this->getMsgetrUid();
return $this->getEtrUid();
break;
case 1:
return $this->getPrjUid();
break;
case 2:
return $this->getEvnUid();
return $this->getElementUid();
break;
case 3:
return $this->getElementType();
break;
case 4:
return $this->getTasUid();
break;
default:
@@ -461,12 +505,13 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function toArray($keyType = BasePeer::TYPE_PHPNAME)
{
$keys = MessageEventTaskRelationPeer::getFieldNames($keyType);
$keys = ElementTaskRelationPeer::getFieldNames($keyType);
$result = array(
$keys[0] => $this->getMsgetrUid(),
$keys[0] => $this->getEtrUid(),
$keys[1] => $this->getPrjUid(),
$keys[2] => $this->getEvnUid(),
$keys[3] => $this->getTasUid(),
$keys[2] => $this->getElementUid(),
$keys[3] => $this->getElementType(),
$keys[4] => $this->getTasUid(),
);
return $result;
}
@@ -483,7 +528,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
{
$pos = MessageEventTaskRelationPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
$pos = ElementTaskRelationPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
return $this->setByPosition($pos, $value);
}
@@ -499,15 +544,18 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
{
switch($pos) {
case 0:
$this->setMsgetrUid($value);
$this->setEtrUid($value);
break;
case 1:
$this->setPrjUid($value);
break;
case 2:
$this->setEvnUid($value);
$this->setElementUid($value);
break;
case 3:
$this->setElementType($value);
break;
case 4:
$this->setTasUid($value);
break;
} // switch()
@@ -531,10 +579,10 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME)
{
$keys = MessageEventTaskRelationPeer::getFieldNames($keyType);
$keys = ElementTaskRelationPeer::getFieldNames($keyType);
if (array_key_exists($keys[0], $arr)) {
$this->setMsgetrUid($arr[$keys[0]]);
$this->setEtrUid($arr[$keys[0]]);
}
if (array_key_exists($keys[1], $arr)) {
@@ -542,11 +590,15 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
}
if (array_key_exists($keys[2], $arr)) {
$this->setEvnUid($arr[$keys[2]]);
$this->setElementUid($arr[$keys[2]]);
}
if (array_key_exists($keys[3], $arr)) {
$this->setTasUid($arr[$keys[3]]);
$this->setElementType($arr[$keys[3]]);
}
if (array_key_exists($keys[4], $arr)) {
$this->setTasUid($arr[$keys[4]]);
}
}
@@ -558,22 +610,26 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function buildCriteria()
{
$criteria = new Criteria(MessageEventTaskRelationPeer::DATABASE_NAME);
$criteria = new Criteria(ElementTaskRelationPeer::DATABASE_NAME);
if ($this->isColumnModified(MessageEventTaskRelationPeer::MSGETR_UID)) {
$criteria->add(MessageEventTaskRelationPeer::MSGETR_UID, $this->msgetr_uid);
if ($this->isColumnModified(ElementTaskRelationPeer::ETR_UID)) {
$criteria->add(ElementTaskRelationPeer::ETR_UID, $this->etr_uid);
}
if ($this->isColumnModified(MessageEventTaskRelationPeer::PRJ_UID)) {
$criteria->add(MessageEventTaskRelationPeer::PRJ_UID, $this->prj_uid);
if ($this->isColumnModified(ElementTaskRelationPeer::PRJ_UID)) {
$criteria->add(ElementTaskRelationPeer::PRJ_UID, $this->prj_uid);
}
if ($this->isColumnModified(MessageEventTaskRelationPeer::EVN_UID)) {
$criteria->add(MessageEventTaskRelationPeer::EVN_UID, $this->evn_uid);
if ($this->isColumnModified(ElementTaskRelationPeer::ELEMENT_UID)) {
$criteria->add(ElementTaskRelationPeer::ELEMENT_UID, $this->element_uid);
}
if ($this->isColumnModified(MessageEventTaskRelationPeer::TAS_UID)) {
$criteria->add(MessageEventTaskRelationPeer::TAS_UID, $this->tas_uid);
if ($this->isColumnModified(ElementTaskRelationPeer::ELEMENT_TYPE)) {
$criteria->add(ElementTaskRelationPeer::ELEMENT_TYPE, $this->element_type);
}
if ($this->isColumnModified(ElementTaskRelationPeer::TAS_UID)) {
$criteria->add(ElementTaskRelationPeer::TAS_UID, $this->tas_uid);
}
@@ -590,9 +646,9 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function buildPkeyCriteria()
{
$criteria = new Criteria(MessageEventTaskRelationPeer::DATABASE_NAME);
$criteria = new Criteria(ElementTaskRelationPeer::DATABASE_NAME);
$criteria->add(MessageEventTaskRelationPeer::MSGETR_UID, $this->msgetr_uid);
$criteria->add(ElementTaskRelationPeer::ETR_UID, $this->etr_uid);
return $criteria;
}
@@ -603,18 +659,18 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
*/
public function getPrimaryKey()
{
return $this->getMsgetrUid();
return $this->getEtrUid();
}
/**
* Generic method to set the primary key (msgetr_uid column).
* Generic method to set the primary key (etr_uid column).
*
* @param string $key Primary key.
* @return void
*/
public function setPrimaryKey($key)
{
$this->setMsgetrUid($key);
$this->setEtrUid($key);
}
/**
@@ -623,7 +679,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
* If desired, this method can also make copies of all associated (fkey referrers)
* objects.
*
* @param object $copyObj An object of MessageEventTaskRelation (or compatible) type.
* @param object $copyObj An object of ElementTaskRelation (or compatible) type.
* @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
* @throws PropelException
*/
@@ -632,14 +688,16 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
$copyObj->setPrjUid($this->prj_uid);
$copyObj->setEvnUid($this->evn_uid);
$copyObj->setElementUid($this->element_uid);
$copyObj->setElementType($this->element_type);
$copyObj->setTasUid($this->tas_uid);
$copyObj->setNew(true);
$copyObj->setMsgetrUid(NULL); // this is a pkey column, so set to default value
$copyObj->setEtrUid(NULL); // this is a pkey column, so set to default value
}
@@ -652,7 +710,7 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
* objects.
*
* @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
* @return MessageEventTaskRelation Clone of current object.
* @return ElementTaskRelation Clone of current object.
* @throws PropelException
*/
public function copy($deepCopy = false)
@@ -671,12 +729,12 @@ abstract class BaseMessageEventTaskRelation extends BaseObject implements Persis
* same instance for all member of this class. The method could therefore
* be static, but this would prevent one from overriding the behavior.
*
* @return MessageEventTaskRelationPeer
* @return ElementTaskRelationPeer
*/
public function getPeer()
{
if (self::$peer === null) {
self::$peer = new MessageEventTaskRelationPeer();
self::$peer = new ElementTaskRelationPeer();
}
return self::$peer;
}

145
workflow/engine/classes/model/om/BaseMessageEventTaskRelationPeer.php → workflow/engine/classes/model/om/BaseElementTaskRelationPeer.php
View File

@@ -2,46 +2,49 @@
require_once 'propel/util/BasePeer.php';
// The object class -- needed for instanceof checks in this class.
// actual class may be a subclass -- as returned by MessageEventTaskRelationPeer::getOMClass()
include_once 'classes/model/MessageEventTaskRelation.php';
// actual class may be a subclass -- as returned by ElementTaskRelationPeer::getOMClass()
include_once 'classes/model/ElementTaskRelation.php';
/**
* Base static class for performing query and update operations on the 'MESSAGE_EVENT_TASK_RELATION' table.
* Base static class for performing query and update operations on the 'ELEMENT_TASK_RELATION' table.
*
*
*
* @package workflow.classes.model.om
*/
abstract class BaseMessageEventTaskRelationPeer
abstract class BaseElementTaskRelationPeer
{
/** the default database name for this class */
const DATABASE_NAME = 'workflow';
/** the table name for this class */
const TABLE_NAME = 'MESSAGE_EVENT_TASK_RELATION';
const TABLE_NAME = 'ELEMENT_TASK_RELATION';
/** A class that can be returned by this peer. */
const CLASS_DEFAULT = 'classes.model.MessageEventTaskRelation';
const CLASS_DEFAULT = 'classes.model.ElementTaskRelation';
/** The total number of columns. */
const NUM_COLUMNS = 4;
const NUM_COLUMNS = 5;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
/** the column name for the MSGETR_UID field */
const MSGETR_UID = 'MESSAGE_EVENT_TASK_RELATION.MSGETR_UID';
/** the column name for the ETR_UID field */
const ETR_UID = 'ELEMENT_TASK_RELATION.ETR_UID';
/** the column name for the PRJ_UID field */
const PRJ_UID = 'MESSAGE_EVENT_TASK_RELATION.PRJ_UID';
const PRJ_UID = 'ELEMENT_TASK_RELATION.PRJ_UID';
/** the column name for the EVN_UID field */
const EVN_UID = 'MESSAGE_EVENT_TASK_RELATION.EVN_UID';
/** the column name for the ELEMENT_UID field */
const ELEMENT_UID = 'ELEMENT_TASK_RELATION.ELEMENT_UID';
/** the column name for the ELEMENT_TYPE field */
const ELEMENT_TYPE = 'ELEMENT_TASK_RELATION.ELEMENT_TYPE';
/** the column name for the TAS_UID field */
const TAS_UID = 'MESSAGE_EVENT_TASK_RELATION.TAS_UID';
const TAS_UID = 'ELEMENT_TASK_RELATION.TAS_UID';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -54,10 +57,10 @@ abstract class BaseMessageEventTaskRelationPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('MsgetrUid', 'PrjUid', 'EvnUid', 'TasUid', ),
BasePeer::TYPE_COLNAME => array (MessageEventTaskRelationPeer::MSGETR_UID, MessageEventTaskRelationPeer::PRJ_UID, MessageEventTaskRelationPeer::EVN_UID, MessageEventTaskRelationPeer::TAS_UID, ),
BasePeer::TYPE_FIELDNAME => array ('MSGETR_UID', 'PRJ_UID', 'EVN_UID', 'TAS_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
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, ),
BasePeer::TYPE_FIELDNAME => array ('ETR_UID', 'PRJ_UID', 'ELEMENT_UID', 'ELEMENT_TYPE', 'TAS_UID', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, )
);
/**
@@ -67,10 +70,10 @@ abstract class BaseMessageEventTaskRelationPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('MsgetrUid' => 0, 'PrjUid' => 1, 'EvnUid' => 2, 'TasUid' => 3, ),
BasePeer::TYPE_COLNAME => array (MessageEventTaskRelationPeer::MSGETR_UID => 0, MessageEventTaskRelationPeer::PRJ_UID => 1, MessageEventTaskRelationPeer::EVN_UID => 2, MessageEventTaskRelationPeer::TAS_UID => 3, ),
BasePeer::TYPE_FIELDNAME => array ('MSGETR_UID' => 0, 'PRJ_UID' => 1, 'EVN_UID' => 2, 'TAS_UID' => 3, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
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, ),
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, )
);
/**
@@ -80,8 +83,8 @@ abstract class BaseMessageEventTaskRelationPeer
*/
public static function getMapBuilder()
{
include_once 'classes/model/map/MessageEventTaskRelationMapBuilder.php';
return BasePeer::getMapBuilder('classes.model.map.MessageEventTaskRelationMapBuilder');
include_once 'classes/model/map/ElementTaskRelationMapBuilder.php';
return BasePeer::getMapBuilder('classes.model.map.ElementTaskRelationMapBuilder');
}
/**
* Gets a map (hash) of PHP names to DB column names.
@@ -94,7 +97,7 @@ abstract class BaseMessageEventTaskRelationPeer
public static function getPhpNameMap()
{
if (self::$phpNameMap === null) {
$map = MessageEventTaskRelationPeer::getTableMap();
$map = ElementTaskRelationPeer::getTableMap();
$columns = $map->getColumns();
$nameMap = array();
foreach ($columns as $column) {
@@ -149,12 +152,12 @@ abstract class BaseMessageEventTaskRelationPeer
* $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
* </code>
* @param string $alias The alias for the current table.
* @param string $column The column name for current table. (i.e. MessageEventTaskRelationPeer::COLUMN_NAME).
* @param string $column The column name for current table. (i.e. ElementTaskRelationPeer::COLUMN_NAME).
* @return string
*/
public static function alias($alias, $column)
{
return str_replace(MessageEventTaskRelationPeer::TABLE_NAME.'.', $alias.'.', $column);
return str_replace(ElementTaskRelationPeer::TABLE_NAME.'.', $alias.'.', $column);
}
/**
@@ -171,18 +174,20 @@ abstract class BaseMessageEventTaskRelationPeer
public static function addSelectColumns(Criteria $criteria)
{
$criteria->addSelectColumn(MessageEventTaskRelationPeer::MSGETR_UID);
$criteria->addSelectColumn(ElementTaskRelationPeer::ETR_UID);
$criteria->addSelectColumn(MessageEventTaskRelationPeer::PRJ_UID);
$criteria->addSelectColumn(ElementTaskRelationPeer::PRJ_UID);
$criteria->addSelectColumn(MessageEventTaskRelationPeer::EVN_UID);
$criteria->addSelectColumn(ElementTaskRelationPeer::ELEMENT_UID);
$criteria->addSelectColumn(MessageEventTaskRelationPeer::TAS_UID);
$criteria->addSelectColumn(ElementTaskRelationPeer::ELEMENT_TYPE);
$criteria->addSelectColumn(ElementTaskRelationPeer::TAS_UID);
}
const COUNT = 'COUNT(MESSAGE_EVENT_TASK_RELATION.MSGETR_UID)';
const COUNT_DISTINCT = 'COUNT(DISTINCT MESSAGE_EVENT_TASK_RELATION.MSGETR_UID)';
const COUNT = 'COUNT(ELEMENT_TASK_RELATION.ETR_UID)';
const COUNT_DISTINCT = 'COUNT(DISTINCT ELEMENT_TASK_RELATION.ETR_UID)';
/**
* Returns the number of rows matching criteria.
@@ -200,9 +205,9 @@ abstract class BaseMessageEventTaskRelationPeer
// clear out anything that might confuse the ORDER BY clause
$criteria->clearSelectColumns()->clearOrderByColumns();
if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
$criteria->addSelectColumn(MessageEventTaskRelationPeer::COUNT_DISTINCT);
$criteria->addSelectColumn(ElementTaskRelationPeer::COUNT_DISTINCT);
} else {
$criteria->addSelectColumn(MessageEventTaskRelationPeer::COUNT);
$criteria->addSelectColumn(ElementTaskRelationPeer::COUNT);
}
// just in case we're grouping: add those columns to the select statement
@@ -210,7 +215,7 @@ abstract class BaseMessageEventTaskRelationPeer
$criteria->addSelectColumn($column);
}
$rs = MessageEventTaskRelationPeer::doSelectRS($criteria, $con);
$rs = ElementTaskRelationPeer::doSelectRS($criteria, $con);
if ($rs->next()) {
return $rs->getInt(1);
} else {
@@ -223,7 +228,7 @@ abstract class BaseMessageEventTaskRelationPeer
*
* @param Criteria $criteria object used to create the SELECT statement.
* @param Connection $con
* @return MessageEventTaskRelation
* @return ElementTaskRelation
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
@@ -231,7 +236,7 @@ abstract class BaseMessageEventTaskRelationPeer
{
$critcopy = clone $criteria;
$critcopy->setLimit(1);
$objects = MessageEventTaskRelationPeer::doSelect($critcopy, $con);
$objects = ElementTaskRelationPeer::doSelect($critcopy, $con);
if ($objects) {
return $objects[0];
}
@@ -248,7 +253,7 @@ abstract class BaseMessageEventTaskRelationPeer
*/
public static function doSelect(Criteria $criteria, $con = null)
{
return MessageEventTaskRelationPeer::populateObjects(MessageEventTaskRelationPeer::doSelectRS($criteria, $con));
return ElementTaskRelationPeer::populateObjects(ElementTaskRelationPeer::doSelectRS($criteria, $con));
}
/**
* Prepares the Criteria object and uses the parent doSelect()
@@ -272,7 +277,7 @@ abstract class BaseMessageEventTaskRelationPeer
if (!$criteria->getSelectColumns()) {
$criteria = clone $criteria;
MessageEventTaskRelationPeer::addSelectColumns($criteria);
ElementTaskRelationPeer::addSelectColumns($criteria);
}
// Set the correct dbName
@@ -294,7 +299,7 @@ abstract class BaseMessageEventTaskRelationPeer
$results = array();
// set the class once to avoid overhead in the loop
$cls = MessageEventTaskRelationPeer::getOMClass();
$cls = ElementTaskRelationPeer::getOMClass();
$cls = Propel::import($cls);
// populate the object(s)
while ($rs->next()) {
@@ -329,13 +334,13 @@ abstract class BaseMessageEventTaskRelationPeer
*/
public static function getOMClass()
{
return MessageEventTaskRelationPeer::CLASS_DEFAULT;
return ElementTaskRelationPeer::CLASS_DEFAULT;
}
/**
* Method perform an INSERT on the database, given a MessageEventTaskRelation or Criteria object.
* Method perform an INSERT on the database, given a ElementTaskRelation or Criteria object.
*
* @param mixed $values Criteria or MessageEventTaskRelation object containing data that is used to create the INSERT statement.
* @param mixed $values Criteria or ElementTaskRelation object containing data that is used to create the INSERT statement.
* @param Connection $con the connection to use
* @return mixed The new primary key.
* @throws PropelException Any exceptions caught during processing will be
@@ -350,7 +355,7 @@ abstract class BaseMessageEventTaskRelationPeer
if ($values instanceof Criteria) {
$criteria = clone $values; // rename for clarity
} else {
$criteria = $values->buildCriteria(); // build Criteria from MessageEventTaskRelation object
$criteria = $values->buildCriteria(); // build Criteria from ElementTaskRelation object
}
@@ -372,9 +377,9 @@ abstract class BaseMessageEventTaskRelationPeer
}
/**
* Method perform an UPDATE on the database, given a MessageEventTaskRelation or Criteria object.
* Method perform an UPDATE on the database, given a ElementTaskRelation or Criteria object.
*
* @param mixed $values Criteria or MessageEventTaskRelation object containing data create the UPDATE statement.
* @param mixed $values Criteria or ElementTaskRelation object containing data create the UPDATE statement.
* @param Connection $con The connection to use (specify Connection exert more control over transactions).
* @return int The number of affected rows (if supported by underlying database driver).
* @throws PropelException Any exceptions caught during processing will be
@@ -391,8 +396,8 @@ abstract class BaseMessageEventTaskRelationPeer
if ($values instanceof Criteria) {
$criteria = clone $values; // rename for clarity
$comparison = $criteria->getComparison(MessageEventTaskRelationPeer::MSGETR_UID);
$selectCriteria->add(MessageEventTaskRelationPeer::MSGETR_UID, $criteria->remove(MessageEventTaskRelationPeer::MSGETR_UID), $comparison);
$comparison = $criteria->getComparison(ElementTaskRelationPeer::ETR_UID);
$selectCriteria->add(ElementTaskRelationPeer::ETR_UID, $criteria->remove(ElementTaskRelationPeer::ETR_UID), $comparison);
} else {
$criteria = $values->buildCriteria(); // gets full criteria
@@ -406,7 +411,7 @@ abstract class BaseMessageEventTaskRelationPeer
}
/**
* Method to DELETE all rows from the MESSAGE_EVENT_TASK_RELATION table.
* Method to DELETE all rows from the ELEMENT_TASK_RELATION table.
*
* @return int The number of affected rows (if supported by underlying database driver).
*/
@@ -420,7 +425,7 @@ abstract class BaseMessageEventTaskRelationPeer
// use transaction because $criteria could contain info
// for more than one table or we could emulating ON DELETE CASCADE, etc.
$con->begin();
$affectedRows += BasePeer::doDeleteAll(MessageEventTaskRelationPeer::TABLE_NAME, $con);
$affectedRows += BasePeer::doDeleteAll(ElementTaskRelationPeer::TABLE_NAME, $con);
$con->commit();
return $affectedRows;
} catch (PropelException $e) {
@@ -430,9 +435,9 @@ abstract class BaseMessageEventTaskRelationPeer
}
/**
* Method perform a DELETE on the database, given a MessageEventTaskRelation or Criteria object OR a primary key value.
* Method perform a DELETE on the database, given a ElementTaskRelation or Criteria object OR a primary key value.
*
* @param mixed $values Criteria or MessageEventTaskRelation object or primary key or array of primary keys
* @param mixed $values Criteria or ElementTaskRelation object or primary key or array of primary keys
* which is used to create the DELETE statement
* @param Connection $con the connection to use
* @return int The number of affected rows (if supported by underlying database driver).
@@ -444,18 +449,18 @@ abstract class BaseMessageEventTaskRelationPeer
public static function doDelete($values, $con = null)
{
if ($con === null) {
$con = Propel::getConnection(MessageEventTaskRelationPeer::DATABASE_NAME);
$con = Propel::getConnection(ElementTaskRelationPeer::DATABASE_NAME);
}
if ($values instanceof Criteria) {
$criteria = clone $values; // rename for clarity
} elseif ($values instanceof MessageEventTaskRelation) {
} elseif ($values instanceof ElementTaskRelation) {
$criteria = $values->buildPkeyCriteria();
} else {
// it must be the primary key
$criteria = new Criteria(self::DATABASE_NAME);
$criteria->add(MessageEventTaskRelationPeer::MSGETR_UID, (array) $values, Criteria::IN);
$criteria->add(ElementTaskRelationPeer::ETR_UID, (array) $values, Criteria::IN);
}
// Set the correct dbName
@@ -478,24 +483,24 @@ abstract class BaseMessageEventTaskRelationPeer
}
/**
* Validates all modified columns of given MessageEventTaskRelation object.
* Validates all modified columns of given ElementTaskRelation object.
* If parameter $columns is either a single column name or an array of column names
* than only those columns are validated.
*
* NOTICE: This does not apply to primary or foreign keys for now.
*
* @param MessageEventTaskRelation $obj The object to validate.
* @param ElementTaskRelation $obj The object to validate.
* @param mixed $cols Column name or array of column names.
*
* @return mixed TRUE if all columns are valid or the error message of the first invalid column.
*/
public static function doValidate(MessageEventTaskRelation $obj, $cols = null)
public static function doValidate(ElementTaskRelation $obj, $cols = null)
{
$columns = array();
if ($cols) {
$dbMap = Propel::getDatabaseMap(MessageEventTaskRelationPeer::DATABASE_NAME);
$tableMap = $dbMap->getTable(MessageEventTaskRelationPeer::TABLE_NAME);
$dbMap = Propel::getDatabaseMap(ElementTaskRelationPeer::DATABASE_NAME);
$tableMap = $dbMap->getTable(ElementTaskRelationPeer::TABLE_NAME);
if (! is_array($cols)) {
$cols = array($cols);
@@ -511,7 +516,7 @@ abstract class BaseMessageEventTaskRelationPeer
}
return BasePeer::doValidate(MessageEventTaskRelationPeer::DATABASE_NAME, MessageEventTaskRelationPeer::TABLE_NAME, $columns);
return BasePeer::doValidate(ElementTaskRelationPeer::DATABASE_NAME, ElementTaskRelationPeer::TABLE_NAME, $columns);
}
/**
@@ -519,7 +524,7 @@ abstract class BaseMessageEventTaskRelationPeer
*
* @param mixed $pk the primary key.
* @param Connection $con the connection to use
* @return MessageEventTaskRelation
* @return ElementTaskRelation
*/
public static function retrieveByPK($pk, $con = null)
{
@@ -527,12 +532,12 @@ abstract class BaseMessageEventTaskRelationPeer
$con = Propel::getConnection(self::DATABASE_NAME);
}
$criteria = new Criteria(MessageEventTaskRelationPeer::DATABASE_NAME);
$criteria = new Criteria(ElementTaskRelationPeer::DATABASE_NAME);
$criteria->add(MessageEventTaskRelationPeer::MSGETR_UID, $pk);
$criteria->add(ElementTaskRelationPeer::ETR_UID, $pk);
$v = MessageEventTaskRelationPeer::doSelect($criteria, $con);
$v = ElementTaskRelationPeer::doSelect($criteria, $con);
return !empty($v) > 0 ? $v[0] : null;
}
@@ -556,8 +561,8 @@ abstract class BaseMessageEventTaskRelationPeer
$objs = array();
} else {
$criteria = new Criteria();
$criteria->add(MessageEventTaskRelationPeer::MSGETR_UID, $pks, Criteria::IN);
$objs = MessageEventTaskRelationPeer::doSelect($criteria, $con);
$criteria->add(ElementTaskRelationPeer::ETR_UID, $pks, Criteria::IN);
$objs = ElementTaskRelationPeer::doSelect($criteria, $con);
}
return $objs;
}
@@ -569,14 +574,14 @@ if (Propel::isInit()) {
// the MapBuilder classes register themselves with Propel during initialization
// so we need to load them here.
try {
BaseMessageEventTaskRelationPeer::getMapBuilder();
BaseElementTaskRelationPeer::getMapBuilder();
} catch (Exception $e) {
Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR);
}
} else {
// even if Propel is not yet initialized, the map builder class can be registered
// now and then it will be loaded when Propel initializes.
require_once 'classes/model/map/MessageEventTaskRelationMapBuilder.php';
Propel::registerMapBuilder('classes.model.map.MessageEventTaskRelationMapBuilder');
require_once 'classes/model/map/ElementTaskRelationMapBuilder.php';
Propel::registerMapBuilder('classes.model.map.ElementTaskRelationMapBuilder');
}

4
workflow/engine/classes/model/om/BaseMessageApplication.php
View File

@@ -61,7 +61,7 @@ abstract class BaseMessageApplication extends BaseObject implements Persistent
* The value for the msgapp_variables field.
* @var string
*/
protected $msgapp_variables = '';
protected $msgapp_variables;
/**
* The value for the msgapp_correlation field.
@@ -378,7 +378,7 @@ abstract class BaseMessageApplication extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->msgapp_variables !== $v || $v === '') {
if ($this->msgapp_variables !== $v) {
$this->msgapp_variables = $v;
$this->modifiedColumns[] = MessageApplicationPeer::MSGAPP_VARIABLES;
}

4
workflow/engine/classes/model/om/BaseMessageEventDefinition.php
View File

@@ -61,7 +61,7 @@ abstract class BaseMessageEventDefinition extends BaseObject implements Persiste
* The value for the msged_variables field.
* @var string
*/
protected $msged_variables = '';
protected $msged_variables;
/**
* The value for the msged_correlation field.
@@ -285,7 +285,7 @@ abstract class BaseMessageEventDefinition extends BaseObject implements Persiste
$v = (string) $v;
}
if ($this->msged_variables !== $v || $v === '') {
if ($this->msged_variables !== $v) {
$this->msged_variables = $v;
$this->modifiedColumns[] = MessageEventDefinitionPeer::MSGED_VARIABLES;
}