diff --git a/workflow/engine/classes/model/map/GroupUserMapBuilder.php b/workflow/engine/classes/model/map/GroupUserMapBuilder.php index 6242842fa..1c2469631 100644 --- a/workflow/engine/classes/model/map/GroupUserMapBuilder.php +++ b/workflow/engine/classes/model/map/GroupUserMapBuilder.php @@ -71,6 +71,8 @@ class GroupUserMapBuilder $tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addValidator('GRP_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Group UID can be no larger than 32 in size'); $tMap->addValidator('GRP_UID', 'required', 'propel.validator.RequiredValidator', '', 'Group UID is required.'); diff --git a/workflow/engine/classes/model/map/GroupwfMapBuilder.php b/workflow/engine/classes/model/map/GroupwfMapBuilder.php index 152cb8ae9..1b9105c0d 100644 --- a/workflow/engine/classes/model/map/GroupwfMapBuilder.php +++ b/workflow/engine/classes/model/map/GroupwfMapBuilder.php @@ -73,6 +73,8 @@ class GroupwfMapBuilder $tMap->addColumn('GRP_STATUS', 'GrpStatus', 'string', CreoleTypes::CHAR, true, 8); + $tMap->addColumn('GRP_STATUS_ID', 'GrpStatusId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255); $tMap->addColumn('GRP_UX', 'GrpUx', 'string', CreoleTypes::VARCHAR, false, 128); diff --git a/workflow/engine/classes/model/map/ProcessCategoryMapBuilder.php b/workflow/engine/classes/model/map/ProcessCategoryMapBuilder.php index 9ca16507a..4227324cc 100644 --- a/workflow/engine/classes/model/map/ProcessCategoryMapBuilder.php +++ b/workflow/engine/classes/model/map/ProcessCategoryMapBuilder.php @@ -63,10 +63,12 @@ class ProcessCategoryMapBuilder $tMap = $this->dbMap->addTable('PROCESS_CATEGORY'); $tMap->setPhpName('ProcessCategory'); - $tMap->setUseIdGenerator(false); + $tMap->setUseIdGenerator(true); $tMap->addPrimaryKey('CATEGORY_UID', 'CategoryUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('CATEGORY_ID', 'CategoryId', 'int', CreoleTypes::INTEGER, true, null); + $tMap->addColumn('CATEGORY_PARENT', 'CategoryParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('CATEGORY_NAME', 'CategoryName', 'string', CreoleTypes::VARCHAR, true, 100); diff --git a/workflow/engine/classes/model/map/ProcessMapBuilder.php b/workflow/engine/classes/model/map/ProcessMapBuilder.php index 7983c8a6c..020ca72a9 100644 --- a/workflow/engine/classes/model/map/ProcessMapBuilder.php +++ b/workflow/engine/classes/model/map/ProcessMapBuilder.php @@ -81,6 +81,8 @@ class ProcessMapBuilder $tMap->addColumn('PRO_STATUS', 'ProStatus', 'string', CreoleTypes::VARCHAR, true, 20); + $tMap->addColumn('PRO_STATUS_ID', 'ProStatusId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('PRO_TYPE_DAY', 'ProTypeDay', 'string', CreoleTypes::CHAR, true, 1); $tMap->addColumn('PRO_TYPE', 'ProType', 'string', CreoleTypes::VARCHAR, true, 256); @@ -147,6 +149,8 @@ class ProcessMapBuilder $tMap->addColumn('PRO_ACTION_DONE', 'ProActionDone', 'string', CreoleTypes::LONGVARCHAR, false, null); + $tMap->addColumn('CATEGORY_ID', 'CategoryId', 'int', CreoleTypes::INTEGER, false, null); + $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.'); diff --git a/workflow/engine/classes/model/map/TaskMapBuilder.php b/workflow/engine/classes/model/map/TaskMapBuilder.php index 9b636c2bf..f08ddef98 100644 --- a/workflow/engine/classes/model/map/TaskMapBuilder.php +++ b/workflow/engine/classes/model/map/TaskMapBuilder.php @@ -67,6 +67,8 @@ class TaskMapBuilder $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, true, null); diff --git a/workflow/engine/classes/model/map/TaskUserMapBuilder.php b/workflow/engine/classes/model/map/TaskUserMapBuilder.php index fdca38ebd..b65ad6548 100644 --- a/workflow/engine/classes/model/map/TaskUserMapBuilder.php +++ b/workflow/engine/classes/model/map/TaskUserMapBuilder.php @@ -67,12 +67,16 @@ class TaskUserMapBuilder $tMap->addPrimaryKey('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('TU_TYPE', 'TuType', 'int', CreoleTypes::INTEGER, true, null); $tMap->addPrimaryKey('TU_RELATION', 'TuRelation', 'int', CreoleTypes::INTEGER, true, null); + $tMap->addColumn('ASSIGNED_ID', 'AssignedId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addValidator('TAS_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Task UID can be no larger than 32 in size'); $tMap->addValidator('TAS_UID', 'required', 'propel.validator.RequiredValidator', '', 'Task UID is required.'); diff --git a/workflow/engine/classes/model/om/BaseGroupUser.php b/workflow/engine/classes/model/om/BaseGroupUser.php index 0fe6f2789..30b09b7f0 100644 --- a/workflow/engine/classes/model/om/BaseGroupUser.php +++ b/workflow/engine/classes/model/om/BaseGroupUser.php @@ -45,6 +45,12 @@ abstract class BaseGroupUser extends BaseObject implements Persistent */ protected $usr_uid = '0'; + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -92,6 +98,17 @@ abstract class BaseGroupUser extends BaseObject implements Persistent return $this->usr_uid; } + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [grp_uid] column. * @@ -158,6 +175,28 @@ abstract class BaseGroupUser extends BaseObject implements Persistent } // setUsrUid() + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = GroupUserPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -181,12 +220,14 @@ abstract class BaseGroupUser extends BaseObject implements Persistent $this->usr_uid = $rs->getString($startcol + 2); + $this->usr_id = $rs->getInt($startcol + 3); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 3; // 3 = GroupUserPeer::NUM_COLUMNS - GroupUserPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 4; // 4 = GroupUserPeer::NUM_COLUMNS - GroupUserPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating GroupUser object", $e); @@ -399,6 +440,9 @@ abstract class BaseGroupUser extends BaseObject implements Persistent case 2: return $this->getUsrUid(); break; + case 3: + return $this->getUsrId(); + break; default: return null; break; @@ -422,6 +466,7 @@ abstract class BaseGroupUser extends BaseObject implements Persistent $keys[0] => $this->getGrpUid(), $keys[1] => $this->getGrpId(), $keys[2] => $this->getUsrUid(), + $keys[3] => $this->getUsrId(), ); return $result; } @@ -462,6 +507,9 @@ abstract class BaseGroupUser extends BaseObject implements Persistent case 2: $this->setUsrUid($value); break; + case 3: + $this->setUsrId($value); + break; } // switch() } @@ -497,6 +545,10 @@ abstract class BaseGroupUser extends BaseObject implements Persistent $this->setUsrUid($arr[$keys[2]]); } + if (array_key_exists($keys[3], $arr)) { + $this->setUsrId($arr[$keys[3]]); + } + } /** @@ -520,6 +572,10 @@ abstract class BaseGroupUser extends BaseObject implements Persistent $criteria->add(GroupUserPeer::USR_UID, $this->usr_uid); } + if ($this->isColumnModified(GroupUserPeer::USR_ID)) { + $criteria->add(GroupUserPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -588,6 +644,8 @@ abstract class BaseGroupUser extends BaseObject implements Persistent $copyObj->setGrpId($this->grp_id); + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseGroupUserPeer.php b/workflow/engine/classes/model/om/BaseGroupUserPeer.php index 08a5731d9..fe7efc0b4 100644 --- a/workflow/engine/classes/model/om/BaseGroupUserPeer.php +++ b/workflow/engine/classes/model/om/BaseGroupUserPeer.php @@ -25,7 +25,7 @@ abstract class BaseGroupUserPeer const CLASS_DEFAULT = 'classes.model.GroupUser'; /** The total number of columns. */ - const NUM_COLUMNS = 3; + const NUM_COLUMNS = 4; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -40,6 +40,9 @@ abstract class BaseGroupUserPeer /** the column name for the USR_UID field */ const USR_UID = 'GROUP_USER.USR_UID'; + /** the column name for the USR_ID field */ + const USR_ID = 'GROUP_USER.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -51,10 +54,10 @@ abstract class BaseGroupUserPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpId', 'UsrUid', ), - BasePeer::TYPE_COLNAME => array (GroupUserPeer::GRP_UID, GroupUserPeer::GRP_ID, GroupUserPeer::USR_UID, ), - BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_ID', 'USR_UID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpId', 'UsrUid', 'UsrId', ), + BasePeer::TYPE_COLNAME => array (GroupUserPeer::GRP_UID, GroupUserPeer::GRP_ID, GroupUserPeer::USR_UID, GroupUserPeer::USR_ID, ), + BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_ID', 'USR_UID', 'USR_ID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); /** @@ -64,10 +67,10 @@ abstract class BaseGroupUserPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpId' => 1, 'UsrUid' => 2, ), - BasePeer::TYPE_COLNAME => array (GroupUserPeer::GRP_UID => 0, GroupUserPeer::GRP_ID => 1, GroupUserPeer::USR_UID => 2, ), - BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_ID' => 1, 'USR_UID' => 2, ), - BasePeer::TYPE_NUM => array (0, 1, 2, ) + BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpId' => 1, 'UsrUid' => 2, 'UsrId' => 3, ), + BasePeer::TYPE_COLNAME => array (GroupUserPeer::GRP_UID => 0, GroupUserPeer::GRP_ID => 1, GroupUserPeer::USR_UID => 2, GroupUserPeer::USR_ID => 3, ), + BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_ID' => 1, 'USR_UID' => 2, 'USR_ID' => 3, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) ); /** @@ -174,6 +177,8 @@ abstract class BaseGroupUserPeer $criteria->addSelectColumn(GroupUserPeer::USR_UID); + $criteria->addSelectColumn(GroupUserPeer::USR_ID); + } const COUNT = 'COUNT(GROUP_USER.GRP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseGroupwf.php b/workflow/engine/classes/model/om/BaseGroupwf.php index 11623f323..1930d4e1e 100644 --- a/workflow/engine/classes/model/om/BaseGroupwf.php +++ b/workflow/engine/classes/model/om/BaseGroupwf.php @@ -51,6 +51,12 @@ abstract class BaseGroupwf extends BaseObject implements Persistent */ protected $grp_status = 'ACTIVE'; + /** + * The value for the grp_status_id field. + * @var int + */ + protected $grp_status_id = 0; + /** * The value for the grp_ldap_dn field. * @var string @@ -121,6 +127,17 @@ abstract class BaseGroupwf extends BaseObject implements Persistent return $this->grp_status; } + /** + * Get the [grp_status_id] column value. + * + * @return int + */ + public function getGrpStatusId() + { + + return $this->grp_status_id; + } + /** * Get the [grp_ldap_dn] column value. * @@ -231,6 +248,28 @@ abstract class BaseGroupwf extends BaseObject implements Persistent } // setGrpStatus() + /** + * Set the value of [grp_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setGrpStatusId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->grp_status_id !== $v || $v === 0) { + $this->grp_status_id = $v; + $this->modifiedColumns[] = GroupwfPeer::GRP_STATUS_ID; + } + + } // setGrpStatusId() + /** * Set the value of [grp_ldap_dn] column. * @@ -300,16 +339,18 @@ abstract class BaseGroupwf extends BaseObject implements Persistent $this->grp_status = $rs->getString($startcol + 3); - $this->grp_ldap_dn = $rs->getString($startcol + 4); + $this->grp_status_id = $rs->getInt($startcol + 4); - $this->grp_ux = $rs->getString($startcol + 5); + $this->grp_ldap_dn = $rs->getString($startcol + 5); + + $this->grp_ux = $rs->getString($startcol + 6); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 6; // 6 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 7; // 7 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Groupwf object", $e); @@ -526,9 +567,12 @@ abstract class BaseGroupwf extends BaseObject implements Persistent return $this->getGrpStatus(); break; case 4: - return $this->getGrpLdapDn(); + return $this->getGrpStatusId(); break; case 5: + return $this->getGrpLdapDn(); + break; + case 6: return $this->getGrpUx(); break; default: @@ -555,8 +599,9 @@ abstract class BaseGroupwf extends BaseObject implements Persistent $keys[1] => $this->getGrpId(), $keys[2] => $this->getGrpTitle(), $keys[3] => $this->getGrpStatus(), - $keys[4] => $this->getGrpLdapDn(), - $keys[5] => $this->getGrpUx(), + $keys[4] => $this->getGrpStatusId(), + $keys[5] => $this->getGrpLdapDn(), + $keys[6] => $this->getGrpUx(), ); return $result; } @@ -601,9 +646,12 @@ abstract class BaseGroupwf extends BaseObject implements Persistent $this->setGrpStatus($value); break; case 4: - $this->setGrpLdapDn($value); + $this->setGrpStatusId($value); break; case 5: + $this->setGrpLdapDn($value); + break; + case 6: $this->setGrpUx($value); break; } // switch() @@ -646,11 +694,15 @@ abstract class BaseGroupwf extends BaseObject implements Persistent } if (array_key_exists($keys[4], $arr)) { - $this->setGrpLdapDn($arr[$keys[4]]); + $this->setGrpStatusId($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setGrpUx($arr[$keys[5]]); + $this->setGrpLdapDn($arr[$keys[5]]); + } + + if (array_key_exists($keys[6], $arr)) { + $this->setGrpUx($arr[$keys[6]]); } } @@ -680,6 +732,10 @@ abstract class BaseGroupwf extends BaseObject implements Persistent $criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status); } + if ($this->isColumnModified(GroupwfPeer::GRP_STATUS_ID)) { + $criteria->add(GroupwfPeer::GRP_STATUS_ID, $this->grp_status_id); + } + if ($this->isColumnModified(GroupwfPeer::GRP_LDAP_DN)) { $criteria->add(GroupwfPeer::GRP_LDAP_DN, $this->grp_ldap_dn); } @@ -748,6 +804,8 @@ abstract class BaseGroupwf extends BaseObject implements Persistent $copyObj->setGrpStatus($this->grp_status); + $copyObj->setGrpStatusId($this->grp_status_id); + $copyObj->setGrpLdapDn($this->grp_ldap_dn); $copyObj->setGrpUx($this->grp_ux); diff --git a/workflow/engine/classes/model/om/BaseGroupwfPeer.php b/workflow/engine/classes/model/om/BaseGroupwfPeer.php index 257d528b9..6edb2d329 100644 --- a/workflow/engine/classes/model/om/BaseGroupwfPeer.php +++ b/workflow/engine/classes/model/om/BaseGroupwfPeer.php @@ -25,7 +25,7 @@ abstract class BaseGroupwfPeer const CLASS_DEFAULT = 'classes.model.Groupwf'; /** The total number of columns. */ - const NUM_COLUMNS = 6; + const NUM_COLUMNS = 7; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -43,6 +43,9 @@ abstract class BaseGroupwfPeer /** the column name for the GRP_STATUS field */ const GRP_STATUS = 'GROUPWF.GRP_STATUS'; + /** the column name for the GRP_STATUS_ID field */ + const GRP_STATUS_ID = 'GROUPWF.GRP_STATUS_ID'; + /** the column name for the GRP_LDAP_DN field */ const GRP_LDAP_DN = 'GROUPWF.GRP_LDAP_DN'; @@ -60,10 +63,10 @@ abstract class BaseGroupwfPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpId', 'GrpTitle', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ), - BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_ID, GroupwfPeer::GRP_TITLE, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ), - BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_ID', 'GRP_TITLE', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpId', 'GrpTitle', 'GrpStatus', 'GrpStatusId', 'GrpLdapDn', 'GrpUx', ), + BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_ID, GroupwfPeer::GRP_TITLE, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_STATUS_ID, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ), + BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_ID', 'GRP_TITLE', 'GRP_STATUS', 'GRP_STATUS_ID', 'GRP_LDAP_DN', 'GRP_UX', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -73,10 +76,10 @@ abstract class BaseGroupwfPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpId' => 1, 'GrpTitle' => 2, 'GrpStatus' => 3, 'GrpLdapDn' => 4, 'GrpUx' => 5, ), - BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_ID => 1, GroupwfPeer::GRP_TITLE => 2, GroupwfPeer::GRP_STATUS => 3, GroupwfPeer::GRP_LDAP_DN => 4, GroupwfPeer::GRP_UX => 5, ), - BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_ID' => 1, 'GRP_TITLE' => 2, 'GRP_STATUS' => 3, 'GRP_LDAP_DN' => 4, 'GRP_UX' => 5, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpId' => 1, 'GrpTitle' => 2, 'GrpStatus' => 3, 'GrpStatusId' => 4, 'GrpLdapDn' => 5, 'GrpUx' => 6, ), + BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_ID => 1, GroupwfPeer::GRP_TITLE => 2, GroupwfPeer::GRP_STATUS => 3, GroupwfPeer::GRP_STATUS_ID => 4, GroupwfPeer::GRP_LDAP_DN => 5, GroupwfPeer::GRP_UX => 6, ), + BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_ID' => 1, 'GRP_TITLE' => 2, 'GRP_STATUS' => 3, 'GRP_STATUS_ID' => 4, 'GRP_LDAP_DN' => 5, 'GRP_UX' => 6, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) ); /** @@ -185,6 +188,8 @@ abstract class BaseGroupwfPeer $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); + $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS_ID); + $criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN); $criteria->addSelectColumn(GroupwfPeer::GRP_UX); diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php index c792a3e90..3a7a38c6c 100644 --- a/workflow/engine/classes/model/om/BaseProcess.php +++ b/workflow/engine/classes/model/om/BaseProcess.php @@ -61,7 +61,7 @@ abstract class BaseProcess extends BaseObject implements Persistent * The value for the pro_time field. * @var double */ - protected $pro_time = 1; + protected $pro_time = 1.0; /** * The value for the pro_timeunit field. @@ -75,6 +75,12 @@ abstract class BaseProcess extends BaseObject implements Persistent */ protected $pro_status = 'ACTIVE'; + /** + * The value for the pro_status_id field. + * @var int + */ + protected $pro_status_id = 0; + /** * The value for the pro_type_day field. * @var string @@ -253,7 +259,7 @@ abstract class BaseProcess extends BaseObject implements Persistent * The value for the pro_cost field. * @var double */ - protected $pro_cost = 0; + protected $pro_cost = 0.0; /** * The value for the pro_unit_cost field. @@ -273,6 +279,12 @@ abstract class BaseProcess extends BaseObject implements Persistent */ protected $pro_action_done; + /** + * The value for the category_id field. + * @var int + */ + protected $category_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -375,6 +387,17 @@ abstract class BaseProcess extends BaseObject implements Persistent return $this->pro_status; } + /** + * Get the [pro_status_id] column value. + * + * @return int + */ + public function getProStatusId() + { + + return $this->pro_status_id; + } + /** * Get the [pro_type_day] column value. * @@ -780,6 +803,17 @@ abstract class BaseProcess extends BaseObject implements Persistent return $this->pro_action_done; } + /** + * Get the [category_id] column value. + * + * @return int + */ + public function getCategoryId() + { + + return $this->category_id; + } + /** * Set the value of [pro_uid] column. * @@ -899,7 +933,7 @@ abstract class BaseProcess extends BaseObject implements Persistent public function setProTime($v) { - if ($this->pro_time !== $v || $v === 1) { + if ($this->pro_time !== $v || $v === 1.0) { $this->pro_time = $v; $this->modifiedColumns[] = ProcessPeer::PRO_TIME; } @@ -950,6 +984,28 @@ abstract class BaseProcess extends BaseObject implements Persistent } // setProStatus() + /** + * Set the value of [pro_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setProStatusId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_status_id !== $v || $v === 0) { + $this->pro_status_id = $v; + $this->modifiedColumns[] = ProcessPeer::PRO_STATUS_ID; + } + + } // setProStatusId() + /** * Set the value of [pro_type_day] column. * @@ -1611,7 +1667,7 @@ abstract class BaseProcess extends BaseObject implements Persistent public function setProCost($v) { - if ($this->pro_cost !== $v || $v === 0) { + if ($this->pro_cost !== $v || $v === 0.0) { $this->pro_cost = $v; $this->modifiedColumns[] = ProcessPeer::PRO_COST; } @@ -1684,6 +1740,28 @@ abstract class BaseProcess extends BaseObject implements Persistent } // setProActionDone() + /** + * Set the value of [category_id] column. + * + * @param int $v new value + * @return void + */ + public function setCategoryId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->category_id !== $v || $v === 0) { + $this->category_id = $v; + $this->modifiedColumns[] = ProcessPeer::CATEGORY_ID; + } + + } // setCategoryId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1717,78 +1795,82 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->pro_status = $rs->getString($startcol + 7); - $this->pro_type_day = $rs->getString($startcol + 8); + $this->pro_status_id = $rs->getInt($startcol + 8); - $this->pro_type = $rs->getString($startcol + 9); + $this->pro_type_day = $rs->getString($startcol + 9); - $this->pro_assignment = $rs->getString($startcol + 10); + $this->pro_type = $rs->getString($startcol + 10); - $this->pro_show_map = $rs->getInt($startcol + 11); + $this->pro_assignment = $rs->getString($startcol + 11); - $this->pro_show_message = $rs->getInt($startcol + 12); + $this->pro_show_map = $rs->getInt($startcol + 12); - $this->pro_subprocess = $rs->getInt($startcol + 13); + $this->pro_show_message = $rs->getInt($startcol + 13); - $this->pro_tri_create = $rs->getString($startcol + 14); + $this->pro_subprocess = $rs->getInt($startcol + 14); - $this->pro_tri_open = $rs->getString($startcol + 15); + $this->pro_tri_create = $rs->getString($startcol + 15); - $this->pro_tri_deleted = $rs->getString($startcol + 16); + $this->pro_tri_open = $rs->getString($startcol + 16); - $this->pro_tri_canceled = $rs->getString($startcol + 17); + $this->pro_tri_deleted = $rs->getString($startcol + 17); - $this->pro_tri_paused = $rs->getString($startcol + 18); + $this->pro_tri_canceled = $rs->getString($startcol + 18); - $this->pro_tri_reassigned = $rs->getString($startcol + 19); + $this->pro_tri_paused = $rs->getString($startcol + 19); - $this->pro_tri_unpaused = $rs->getString($startcol + 20); + $this->pro_tri_reassigned = $rs->getString($startcol + 20); - $this->pro_type_process = $rs->getString($startcol + 21); + $this->pro_tri_unpaused = $rs->getString($startcol + 21); - $this->pro_show_delegate = $rs->getInt($startcol + 22); + $this->pro_type_process = $rs->getString($startcol + 22); - $this->pro_show_dynaform = $rs->getInt($startcol + 23); + $this->pro_show_delegate = $rs->getInt($startcol + 23); - $this->pro_category = $rs->getString($startcol + 24); + $this->pro_show_dynaform = $rs->getInt($startcol + 24); - $this->pro_sub_category = $rs->getString($startcol + 25); + $this->pro_category = $rs->getString($startcol + 25); - $this->pro_industry = $rs->getInt($startcol + 26); + $this->pro_sub_category = $rs->getString($startcol + 26); - $this->pro_update_date = $rs->getTimestamp($startcol + 27, null); + $this->pro_industry = $rs->getInt($startcol + 27); - $this->pro_create_date = $rs->getTimestamp($startcol + 28, null); + $this->pro_update_date = $rs->getTimestamp($startcol + 28, null); - $this->pro_create_user = $rs->getString($startcol + 29); + $this->pro_create_date = $rs->getTimestamp($startcol + 29, null); - $this->pro_height = $rs->getInt($startcol + 30); + $this->pro_create_user = $rs->getString($startcol + 30); - $this->pro_width = $rs->getInt($startcol + 31); + $this->pro_height = $rs->getInt($startcol + 31); - $this->pro_title_x = $rs->getInt($startcol + 32); + $this->pro_width = $rs->getInt($startcol + 32); - $this->pro_title_y = $rs->getInt($startcol + 33); + $this->pro_title_x = $rs->getInt($startcol + 33); - $this->pro_debug = $rs->getInt($startcol + 34); + $this->pro_title_y = $rs->getInt($startcol + 34); - $this->pro_dynaforms = $rs->getString($startcol + 35); + $this->pro_debug = $rs->getInt($startcol + 35); - $this->pro_derivation_screen_tpl = $rs->getString($startcol + 36); + $this->pro_dynaforms = $rs->getString($startcol + 36); - $this->pro_cost = $rs->getFloat($startcol + 37); + $this->pro_derivation_screen_tpl = $rs->getString($startcol + 37); - $this->pro_unit_cost = $rs->getString($startcol + 38); + $this->pro_cost = $rs->getFloat($startcol + 38); - $this->pro_itee = $rs->getInt($startcol + 39); + $this->pro_unit_cost = $rs->getString($startcol + 39); - $this->pro_action_done = $rs->getString($startcol + 40); + $this->pro_itee = $rs->getInt($startcol + 40); + + $this->pro_action_done = $rs->getString($startcol + 41); + + $this->category_id = $rs->getInt($startcol + 42); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 41; // 41 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 43; // 43 = ProcessPeer::NUM_COLUMNS - ProcessPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Process object", $e); @@ -2017,104 +2099,110 @@ abstract class BaseProcess extends BaseObject implements Persistent return $this->getProStatus(); break; case 8: - return $this->getProTypeDay(); + return $this->getProStatusId(); break; case 9: - return $this->getProType(); + return $this->getProTypeDay(); break; case 10: - return $this->getProAssignment(); + return $this->getProType(); break; case 11: - return $this->getProShowMap(); + return $this->getProAssignment(); break; case 12: - return $this->getProShowMessage(); + return $this->getProShowMap(); break; case 13: - return $this->getProSubprocess(); + return $this->getProShowMessage(); break; case 14: - return $this->getProTriCreate(); + return $this->getProSubprocess(); break; case 15: - return $this->getProTriOpen(); + return $this->getProTriCreate(); break; case 16: - return $this->getProTriDeleted(); + return $this->getProTriOpen(); break; case 17: - return $this->getProTriCanceled(); + return $this->getProTriDeleted(); break; case 18: - return $this->getProTriPaused(); + return $this->getProTriCanceled(); break; case 19: - return $this->getProTriReassigned(); + return $this->getProTriPaused(); break; case 20: - return $this->getProTriUnpaused(); + return $this->getProTriReassigned(); break; case 21: - return $this->getProTypeProcess(); + return $this->getProTriUnpaused(); break; case 22: - return $this->getProShowDelegate(); + return $this->getProTypeProcess(); break; case 23: - return $this->getProShowDynaform(); + return $this->getProShowDelegate(); break; case 24: - return $this->getProCategory(); + return $this->getProShowDynaform(); break; case 25: - return $this->getProSubCategory(); + return $this->getProCategory(); break; case 26: - return $this->getProIndustry(); + return $this->getProSubCategory(); break; case 27: - return $this->getProUpdateDate(); + return $this->getProIndustry(); break; case 28: - return $this->getProCreateDate(); + return $this->getProUpdateDate(); break; case 29: - return $this->getProCreateUser(); + return $this->getProCreateDate(); break; case 30: - return $this->getProHeight(); + return $this->getProCreateUser(); break; case 31: - return $this->getProWidth(); + return $this->getProHeight(); break; case 32: - return $this->getProTitleX(); + return $this->getProWidth(); break; case 33: - return $this->getProTitleY(); + return $this->getProTitleX(); break; case 34: - return $this->getProDebug(); + return $this->getProTitleY(); break; case 35: - return $this->getProDynaforms(); + return $this->getProDebug(); break; case 36: - return $this->getProDerivationScreenTpl(); + return $this->getProDynaforms(); break; case 37: - return $this->getProCost(); + return $this->getProDerivationScreenTpl(); break; case 38: - return $this->getProUnitCost(); + return $this->getProCost(); break; case 39: - return $this->getProItee(); + return $this->getProUnitCost(); break; case 40: + return $this->getProItee(); + break; + case 41: return $this->getProActionDone(); break; + case 42: + return $this->getCategoryId(); + break; default: return null; break; @@ -2143,39 +2231,41 @@ abstract class BaseProcess extends BaseObject implements Persistent $keys[5] => $this->getProTime(), $keys[6] => $this->getProTimeunit(), $keys[7] => $this->getProStatus(), - $keys[8] => $this->getProTypeDay(), - $keys[9] => $this->getProType(), - $keys[10] => $this->getProAssignment(), - $keys[11] => $this->getProShowMap(), - $keys[12] => $this->getProShowMessage(), - $keys[13] => $this->getProSubprocess(), - $keys[14] => $this->getProTriCreate(), - $keys[15] => $this->getProTriOpen(), - $keys[16] => $this->getProTriDeleted(), - $keys[17] => $this->getProTriCanceled(), - $keys[18] => $this->getProTriPaused(), - $keys[19] => $this->getProTriReassigned(), - $keys[20] => $this->getProTriUnpaused(), - $keys[21] => $this->getProTypeProcess(), - $keys[22] => $this->getProShowDelegate(), - $keys[23] => $this->getProShowDynaform(), - $keys[24] => $this->getProCategory(), - $keys[25] => $this->getProSubCategory(), - $keys[26] => $this->getProIndustry(), - $keys[27] => $this->getProUpdateDate(), - $keys[28] => $this->getProCreateDate(), - $keys[29] => $this->getProCreateUser(), - $keys[30] => $this->getProHeight(), - $keys[31] => $this->getProWidth(), - $keys[32] => $this->getProTitleX(), - $keys[33] => $this->getProTitleY(), - $keys[34] => $this->getProDebug(), - $keys[35] => $this->getProDynaforms(), - $keys[36] => $this->getProDerivationScreenTpl(), - $keys[37] => $this->getProCost(), - $keys[38] => $this->getProUnitCost(), - $keys[39] => $this->getProItee(), - $keys[40] => $this->getProActionDone(), + $keys[8] => $this->getProStatusId(), + $keys[9] => $this->getProTypeDay(), + $keys[10] => $this->getProType(), + $keys[11] => $this->getProAssignment(), + $keys[12] => $this->getProShowMap(), + $keys[13] => $this->getProShowMessage(), + $keys[14] => $this->getProSubprocess(), + $keys[15] => $this->getProTriCreate(), + $keys[16] => $this->getProTriOpen(), + $keys[17] => $this->getProTriDeleted(), + $keys[18] => $this->getProTriCanceled(), + $keys[19] => $this->getProTriPaused(), + $keys[20] => $this->getProTriReassigned(), + $keys[21] => $this->getProTriUnpaused(), + $keys[22] => $this->getProTypeProcess(), + $keys[23] => $this->getProShowDelegate(), + $keys[24] => $this->getProShowDynaform(), + $keys[25] => $this->getProCategory(), + $keys[26] => $this->getProSubCategory(), + $keys[27] => $this->getProIndustry(), + $keys[28] => $this->getProUpdateDate(), + $keys[29] => $this->getProCreateDate(), + $keys[30] => $this->getProCreateUser(), + $keys[31] => $this->getProHeight(), + $keys[32] => $this->getProWidth(), + $keys[33] => $this->getProTitleX(), + $keys[34] => $this->getProTitleY(), + $keys[35] => $this->getProDebug(), + $keys[36] => $this->getProDynaforms(), + $keys[37] => $this->getProDerivationScreenTpl(), + $keys[38] => $this->getProCost(), + $keys[39] => $this->getProUnitCost(), + $keys[40] => $this->getProItee(), + $keys[41] => $this->getProActionDone(), + $keys[42] => $this->getCategoryId(), ); return $result; } @@ -2232,104 +2322,110 @@ abstract class BaseProcess extends BaseObject implements Persistent $this->setProStatus($value); break; case 8: - $this->setProTypeDay($value); + $this->setProStatusId($value); break; case 9: - $this->setProType($value); + $this->setProTypeDay($value); break; case 10: - $this->setProAssignment($value); + $this->setProType($value); break; case 11: - $this->setProShowMap($value); + $this->setProAssignment($value); break; case 12: - $this->setProShowMessage($value); + $this->setProShowMap($value); break; case 13: - $this->setProSubprocess($value); + $this->setProShowMessage($value); break; case 14: - $this->setProTriCreate($value); + $this->setProSubprocess($value); break; case 15: - $this->setProTriOpen($value); + $this->setProTriCreate($value); break; case 16: - $this->setProTriDeleted($value); + $this->setProTriOpen($value); break; case 17: - $this->setProTriCanceled($value); + $this->setProTriDeleted($value); break; case 18: - $this->setProTriPaused($value); + $this->setProTriCanceled($value); break; case 19: - $this->setProTriReassigned($value); + $this->setProTriPaused($value); break; case 20: - $this->setProTriUnpaused($value); + $this->setProTriReassigned($value); break; case 21: - $this->setProTypeProcess($value); + $this->setProTriUnpaused($value); break; case 22: - $this->setProShowDelegate($value); + $this->setProTypeProcess($value); break; case 23: - $this->setProShowDynaform($value); + $this->setProShowDelegate($value); break; case 24: - $this->setProCategory($value); + $this->setProShowDynaform($value); break; case 25: - $this->setProSubCategory($value); + $this->setProCategory($value); break; case 26: - $this->setProIndustry($value); + $this->setProSubCategory($value); break; case 27: - $this->setProUpdateDate($value); + $this->setProIndustry($value); break; case 28: - $this->setProCreateDate($value); + $this->setProUpdateDate($value); break; case 29: - $this->setProCreateUser($value); + $this->setProCreateDate($value); break; case 30: - $this->setProHeight($value); + $this->setProCreateUser($value); break; case 31: - $this->setProWidth($value); + $this->setProHeight($value); break; case 32: - $this->setProTitleX($value); + $this->setProWidth($value); break; case 33: - $this->setProTitleY($value); + $this->setProTitleX($value); break; case 34: - $this->setProDebug($value); + $this->setProTitleY($value); break; case 35: - $this->setProDynaforms($value); + $this->setProDebug($value); break; case 36: - $this->setProDerivationScreenTpl($value); + $this->setProDynaforms($value); break; case 37: - $this->setProCost($value); + $this->setProDerivationScreenTpl($value); break; case 38: - $this->setProUnitCost($value); + $this->setProCost($value); break; case 39: - $this->setProItee($value); + $this->setProUnitCost($value); break; case 40: + $this->setProItee($value); + break; + case 41: $this->setProActionDone($value); break; + case 42: + $this->setCategoryId($value); + break; } // switch() } @@ -2386,135 +2482,143 @@ abstract class BaseProcess extends BaseObject implements Persistent } if (array_key_exists($keys[8], $arr)) { - $this->setProTypeDay($arr[$keys[8]]); + $this->setProStatusId($arr[$keys[8]]); } if (array_key_exists($keys[9], $arr)) { - $this->setProType($arr[$keys[9]]); + $this->setProTypeDay($arr[$keys[9]]); } if (array_key_exists($keys[10], $arr)) { - $this->setProAssignment($arr[$keys[10]]); + $this->setProType($arr[$keys[10]]); } if (array_key_exists($keys[11], $arr)) { - $this->setProShowMap($arr[$keys[11]]); + $this->setProAssignment($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setProShowMessage($arr[$keys[12]]); + $this->setProShowMap($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setProSubprocess($arr[$keys[13]]); + $this->setProShowMessage($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setProTriCreate($arr[$keys[14]]); + $this->setProSubprocess($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setProTriOpen($arr[$keys[15]]); + $this->setProTriCreate($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setProTriDeleted($arr[$keys[16]]); + $this->setProTriOpen($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setProTriCanceled($arr[$keys[17]]); + $this->setProTriDeleted($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setProTriPaused($arr[$keys[18]]); + $this->setProTriCanceled($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setProTriReassigned($arr[$keys[19]]); + $this->setProTriPaused($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setProTriUnpaused($arr[$keys[20]]); + $this->setProTriReassigned($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setProTypeProcess($arr[$keys[21]]); + $this->setProTriUnpaused($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setProShowDelegate($arr[$keys[22]]); + $this->setProTypeProcess($arr[$keys[22]]); } if (array_key_exists($keys[23], $arr)) { - $this->setProShowDynaform($arr[$keys[23]]); + $this->setProShowDelegate($arr[$keys[23]]); } if (array_key_exists($keys[24], $arr)) { - $this->setProCategory($arr[$keys[24]]); + $this->setProShowDynaform($arr[$keys[24]]); } if (array_key_exists($keys[25], $arr)) { - $this->setProSubCategory($arr[$keys[25]]); + $this->setProCategory($arr[$keys[25]]); } if (array_key_exists($keys[26], $arr)) { - $this->setProIndustry($arr[$keys[26]]); + $this->setProSubCategory($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setProUpdateDate($arr[$keys[27]]); + $this->setProIndustry($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setProCreateDate($arr[$keys[28]]); + $this->setProUpdateDate($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setProCreateUser($arr[$keys[29]]); + $this->setProCreateDate($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setProHeight($arr[$keys[30]]); + $this->setProCreateUser($arr[$keys[30]]); } if (array_key_exists($keys[31], $arr)) { - $this->setProWidth($arr[$keys[31]]); + $this->setProHeight($arr[$keys[31]]); } if (array_key_exists($keys[32], $arr)) { - $this->setProTitleX($arr[$keys[32]]); + $this->setProWidth($arr[$keys[32]]); } if (array_key_exists($keys[33], $arr)) { - $this->setProTitleY($arr[$keys[33]]); + $this->setProTitleX($arr[$keys[33]]); } if (array_key_exists($keys[34], $arr)) { - $this->setProDebug($arr[$keys[34]]); + $this->setProTitleY($arr[$keys[34]]); } if (array_key_exists($keys[35], $arr)) { - $this->setProDynaforms($arr[$keys[35]]); + $this->setProDebug($arr[$keys[35]]); } if (array_key_exists($keys[36], $arr)) { - $this->setProDerivationScreenTpl($arr[$keys[36]]); + $this->setProDynaforms($arr[$keys[36]]); } if (array_key_exists($keys[37], $arr)) { - $this->setProCost($arr[$keys[37]]); + $this->setProDerivationScreenTpl($arr[$keys[37]]); } if (array_key_exists($keys[38], $arr)) { - $this->setProUnitCost($arr[$keys[38]]); + $this->setProCost($arr[$keys[38]]); } if (array_key_exists($keys[39], $arr)) { - $this->setProItee($arr[$keys[39]]); + $this->setProUnitCost($arr[$keys[39]]); } if (array_key_exists($keys[40], $arr)) { - $this->setProActionDone($arr[$keys[40]]); + $this->setProItee($arr[$keys[40]]); + } + + if (array_key_exists($keys[41], $arr)) { + $this->setProActionDone($arr[$keys[41]]); + } + + if (array_key_exists($keys[42], $arr)) { + $this->setCategoryId($arr[$keys[42]]); } } @@ -2560,6 +2664,10 @@ abstract class BaseProcess extends BaseObject implements Persistent $criteria->add(ProcessPeer::PRO_STATUS, $this->pro_status); } + if ($this->isColumnModified(ProcessPeer::PRO_STATUS_ID)) { + $criteria->add(ProcessPeer::PRO_STATUS_ID, $this->pro_status_id); + } + if ($this->isColumnModified(ProcessPeer::PRO_TYPE_DAY)) { $criteria->add(ProcessPeer::PRO_TYPE_DAY, $this->pro_type_day); } @@ -2692,6 +2800,10 @@ abstract class BaseProcess extends BaseObject implements Persistent $criteria->add(ProcessPeer::PRO_ACTION_DONE, $this->pro_action_done); } + if ($this->isColumnModified(ProcessPeer::CATEGORY_ID)) { + $criteria->add(ProcessPeer::CATEGORY_ID, $this->category_id); + } + return $criteria; } @@ -2760,6 +2872,8 @@ abstract class BaseProcess extends BaseObject implements Persistent $copyObj->setProStatus($this->pro_status); + $copyObj->setProStatusId($this->pro_status_id); + $copyObj->setProTypeDay($this->pro_type_day); $copyObj->setProType($this->pro_type); @@ -2826,6 +2940,8 @@ abstract class BaseProcess extends BaseObject implements Persistent $copyObj->setProActionDone($this->pro_action_done); + $copyObj->setCategoryId($this->category_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseProcessCategory.php b/workflow/engine/classes/model/om/BaseProcessCategory.php index e5e9291f4..2fb50335a 100644 --- a/workflow/engine/classes/model/om/BaseProcessCategory.php +++ b/workflow/engine/classes/model/om/BaseProcessCategory.php @@ -33,6 +33,12 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent */ protected $category_uid = ''; + /** + * The value for the category_id field. + * @var int + */ + protected $category_id; + /** * The value for the category_parent field. * @var string @@ -76,6 +82,17 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent return $this->category_uid; } + /** + * Get the [category_id] column value. + * + * @return int + */ + public function getCategoryId() + { + + return $this->category_id; + } + /** * Get the [category_parent] column value. * @@ -131,6 +148,28 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent } // setCategoryUid() + /** + * Set the value of [category_id] column. + * + * @param int $v new value + * @return void + */ + public function setCategoryId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->category_id !== $v) { + $this->category_id = $v; + $this->modifiedColumns[] = ProcessCategoryPeer::CATEGORY_ID; + } + + } // setCategoryId() + /** * Set the value of [category_parent] column. * @@ -216,18 +255,20 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent $this->category_uid = $rs->getString($startcol + 0); - $this->category_parent = $rs->getString($startcol + 1); + $this->category_id = $rs->getInt($startcol + 1); - $this->category_name = $rs->getString($startcol + 2); + $this->category_parent = $rs->getString($startcol + 2); - $this->category_icon = $rs->getString($startcol + 3); + $this->category_name = $rs->getString($startcol + 3); + + $this->category_icon = $rs->getString($startcol + 4); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 4; // 4 = ProcessCategoryPeer::NUM_COLUMNS - ProcessCategoryPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 5; // 5 = ProcessCategoryPeer::NUM_COLUMNS - ProcessCategoryPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ProcessCategory object", $e); @@ -435,12 +476,15 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent return $this->getCategoryUid(); break; case 1: - return $this->getCategoryParent(); + return $this->getCategoryId(); break; case 2: - return $this->getCategoryName(); + return $this->getCategoryParent(); break; case 3: + return $this->getCategoryName(); + break; + case 4: return $this->getCategoryIcon(); break; default: @@ -464,9 +508,10 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent $keys = ProcessCategoryPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getCategoryUid(), - $keys[1] => $this->getCategoryParent(), - $keys[2] => $this->getCategoryName(), - $keys[3] => $this->getCategoryIcon(), + $keys[1] => $this->getCategoryId(), + $keys[2] => $this->getCategoryParent(), + $keys[3] => $this->getCategoryName(), + $keys[4] => $this->getCategoryIcon(), ); return $result; } @@ -502,12 +547,15 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent $this->setCategoryUid($value); break; case 1: - $this->setCategoryParent($value); + $this->setCategoryId($value); break; case 2: - $this->setCategoryName($value); + $this->setCategoryParent($value); break; case 3: + $this->setCategoryName($value); + break; + case 4: $this->setCategoryIcon($value); break; } // switch() @@ -538,15 +586,19 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setCategoryParent($arr[$keys[1]]); + $this->setCategoryId($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setCategoryName($arr[$keys[2]]); + $this->setCategoryParent($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setCategoryIcon($arr[$keys[3]]); + $this->setCategoryName($arr[$keys[3]]); + } + + if (array_key_exists($keys[4], $arr)) { + $this->setCategoryIcon($arr[$keys[4]]); } } @@ -564,6 +616,10 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent $criteria->add(ProcessCategoryPeer::CATEGORY_UID, $this->category_uid); } + if ($this->isColumnModified(ProcessCategoryPeer::CATEGORY_ID)) { + $criteria->add(ProcessCategoryPeer::CATEGORY_ID, $this->category_id); + } + if ($this->isColumnModified(ProcessCategoryPeer::CATEGORY_PARENT)) { $criteria->add(ProcessCategoryPeer::CATEGORY_PARENT, $this->category_parent); } @@ -630,6 +686,8 @@ abstract class BaseProcessCategory extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setCategoryId($this->category_id); + $copyObj->setCategoryParent($this->category_parent); $copyObj->setCategoryName($this->category_name); diff --git a/workflow/engine/classes/model/om/BaseProcessCategoryPeer.php b/workflow/engine/classes/model/om/BaseProcessCategoryPeer.php index bca9cae20..83cc232b2 100644 --- a/workflow/engine/classes/model/om/BaseProcessCategoryPeer.php +++ b/workflow/engine/classes/model/om/BaseProcessCategoryPeer.php @@ -25,7 +25,7 @@ abstract class BaseProcessCategoryPeer const CLASS_DEFAULT = 'classes.model.ProcessCategory'; /** 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; @@ -34,6 +34,9 @@ abstract class BaseProcessCategoryPeer /** the column name for the CATEGORY_UID field */ const CATEGORY_UID = 'PROCESS_CATEGORY.CATEGORY_UID'; + /** the column name for the CATEGORY_ID field */ + const CATEGORY_ID = 'PROCESS_CATEGORY.CATEGORY_ID'; + /** the column name for the CATEGORY_PARENT field */ const CATEGORY_PARENT = 'PROCESS_CATEGORY.CATEGORY_PARENT'; @@ -54,10 +57,10 @@ abstract class BaseProcessCategoryPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('CategoryUid', 'CategoryParent', 'CategoryName', 'CategoryIcon', ), - BasePeer::TYPE_COLNAME => array (ProcessCategoryPeer::CATEGORY_UID, ProcessCategoryPeer::CATEGORY_PARENT, ProcessCategoryPeer::CATEGORY_NAME, ProcessCategoryPeer::CATEGORY_ICON, ), - BasePeer::TYPE_FIELDNAME => array ('CATEGORY_UID', 'CATEGORY_PARENT', 'CATEGORY_NAME', 'CATEGORY_ICON', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('CategoryUid', 'CategoryId', 'CategoryParent', 'CategoryName', 'CategoryIcon', ), + BasePeer::TYPE_COLNAME => array (ProcessCategoryPeer::CATEGORY_UID, ProcessCategoryPeer::CATEGORY_ID, ProcessCategoryPeer::CATEGORY_PARENT, ProcessCategoryPeer::CATEGORY_NAME, ProcessCategoryPeer::CATEGORY_ICON, ), + BasePeer::TYPE_FIELDNAME => array ('CATEGORY_UID', 'CATEGORY_ID', 'CATEGORY_PARENT', 'CATEGORY_NAME', 'CATEGORY_ICON', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); /** @@ -67,10 +70,10 @@ abstract class BaseProcessCategoryPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('CategoryUid' => 0, 'CategoryParent' => 1, 'CategoryName' => 2, 'CategoryIcon' => 3, ), - BasePeer::TYPE_COLNAME => array (ProcessCategoryPeer::CATEGORY_UID => 0, ProcessCategoryPeer::CATEGORY_PARENT => 1, ProcessCategoryPeer::CATEGORY_NAME => 2, ProcessCategoryPeer::CATEGORY_ICON => 3, ), - BasePeer::TYPE_FIELDNAME => array ('CATEGORY_UID' => 0, 'CATEGORY_PARENT' => 1, 'CATEGORY_NAME' => 2, 'CATEGORY_ICON' => 3, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('CategoryUid' => 0, 'CategoryId' => 1, 'CategoryParent' => 2, 'CategoryName' => 3, 'CategoryIcon' => 4, ), + BasePeer::TYPE_COLNAME => array (ProcessCategoryPeer::CATEGORY_UID => 0, ProcessCategoryPeer::CATEGORY_ID => 1, ProcessCategoryPeer::CATEGORY_PARENT => 2, ProcessCategoryPeer::CATEGORY_NAME => 3, ProcessCategoryPeer::CATEGORY_ICON => 4, ), + BasePeer::TYPE_FIELDNAME => array ('CATEGORY_UID' => 0, 'CATEGORY_ID' => 1, 'CATEGORY_PARENT' => 2, 'CATEGORY_NAME' => 3, 'CATEGORY_ICON' => 4, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); /** @@ -173,6 +176,8 @@ abstract class BaseProcessCategoryPeer $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID); + $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_ID); + $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_PARENT); $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME); diff --git a/workflow/engine/classes/model/om/BaseProcessPeer.php b/workflow/engine/classes/model/om/BaseProcessPeer.php index 638d5799e..bc128c502 100644 --- a/workflow/engine/classes/model/om/BaseProcessPeer.php +++ b/workflow/engine/classes/model/om/BaseProcessPeer.php @@ -25,7 +25,7 @@ abstract class BaseProcessPeer const CLASS_DEFAULT = 'classes.model.Process'; /** The total number of columns. */ - const NUM_COLUMNS = 41; + const NUM_COLUMNS = 43; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -55,6 +55,9 @@ abstract class BaseProcessPeer /** the column name for the PRO_STATUS field */ const PRO_STATUS = 'PROCESS.PRO_STATUS'; + /** the column name for the PRO_STATUS_ID field */ + const PRO_STATUS_ID = 'PROCESS.PRO_STATUS_ID'; + /** the column name for the PRO_TYPE_DAY field */ const PRO_TYPE_DAY = 'PROCESS.PRO_TYPE_DAY'; @@ -154,6 +157,9 @@ abstract class BaseProcessPeer /** the column name for the PRO_ACTION_DONE field */ const PRO_ACTION_DONE = 'PROCESS.PRO_ACTION_DONE'; + /** the column name for the CATEGORY_ID field */ + const CATEGORY_ID = 'PROCESS.CATEGORY_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -165,10 +171,10 @@ abstract class BaseProcessPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProId', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriCreate', '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_ID, 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_CREATE, 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_ID', '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_CREATE', '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, 38, 39, 40, ) + BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProId', 'ProTitle', 'ProDescription', 'ProParent', 'ProTime', 'ProTimeunit', 'ProStatus', 'ProStatusId', 'ProTypeDay', 'ProType', 'ProAssignment', 'ProShowMap', 'ProShowMessage', 'ProSubprocess', 'ProTriCreate', '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', 'CategoryId', ), + BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID, ProcessPeer::PRO_ID, ProcessPeer::PRO_TITLE, ProcessPeer::PRO_DESCRIPTION, ProcessPeer::PRO_PARENT, ProcessPeer::PRO_TIME, ProcessPeer::PRO_TIMEUNIT, ProcessPeer::PRO_STATUS, ProcessPeer::PRO_STATUS_ID, ProcessPeer::PRO_TYPE_DAY, ProcessPeer::PRO_TYPE, ProcessPeer::PRO_ASSIGNMENT, ProcessPeer::PRO_SHOW_MAP, ProcessPeer::PRO_SHOW_MESSAGE, ProcessPeer::PRO_SUBPROCESS, ProcessPeer::PRO_TRI_CREATE, 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, ProcessPeer::CATEGORY_ID, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_ID', 'PRO_TITLE', 'PRO_DESCRIPTION', 'PRO_PARENT', 'PRO_TIME', 'PRO_TIMEUNIT', 'PRO_STATUS', 'PRO_STATUS_ID', 'PRO_TYPE_DAY', 'PRO_TYPE', 'PRO_ASSIGNMENT', 'PRO_SHOW_MAP', 'PRO_SHOW_MESSAGE', 'PRO_SUBPROCESS', 'PRO_TRI_CREATE', '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', 'CATEGORY_ID', ), + 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, 39, 40, 41, 42, ) ); /** @@ -178,10 +184,10 @@ abstract class BaseProcessPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProId' => 1, 'ProTitle' => 2, 'ProDescription' => 3, 'ProParent' => 4, 'ProTime' => 5, 'ProTimeunit' => 6, 'ProStatus' => 7, 'ProTypeDay' => 8, 'ProType' => 9, 'ProAssignment' => 10, 'ProShowMap' => 11, 'ProShowMessage' => 12, 'ProSubprocess' => 13, 'ProTriCreate' => 14, 'ProTriOpen' => 15, 'ProTriDeleted' => 16, 'ProTriCanceled' => 17, 'ProTriPaused' => 18, 'ProTriReassigned' => 19, 'ProTriUnpaused' => 20, 'ProTypeProcess' => 21, 'ProShowDelegate' => 22, 'ProShowDynaform' => 23, 'ProCategory' => 24, 'ProSubCategory' => 25, 'ProIndustry' => 26, 'ProUpdateDate' => 27, 'ProCreateDate' => 28, 'ProCreateUser' => 29, 'ProHeight' => 30, 'ProWidth' => 31, 'ProTitleX' => 32, 'ProTitleY' => 33, 'ProDebug' => 34, 'ProDynaforms' => 35, 'ProDerivationScreenTpl' => 36, 'ProCost' => 37, 'ProUnitCost' => 38, 'ProItee' => 39, 'ProActionDone' => 40, ), - BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_ID => 1, ProcessPeer::PRO_TITLE => 2, ProcessPeer::PRO_DESCRIPTION => 3, ProcessPeer::PRO_PARENT => 4, ProcessPeer::PRO_TIME => 5, ProcessPeer::PRO_TIMEUNIT => 6, ProcessPeer::PRO_STATUS => 7, ProcessPeer::PRO_TYPE_DAY => 8, ProcessPeer::PRO_TYPE => 9, ProcessPeer::PRO_ASSIGNMENT => 10, ProcessPeer::PRO_SHOW_MAP => 11, ProcessPeer::PRO_SHOW_MESSAGE => 12, ProcessPeer::PRO_SUBPROCESS => 13, ProcessPeer::PRO_TRI_CREATE => 14, ProcessPeer::PRO_TRI_OPEN => 15, ProcessPeer::PRO_TRI_DELETED => 16, ProcessPeer::PRO_TRI_CANCELED => 17, ProcessPeer::PRO_TRI_PAUSED => 18, ProcessPeer::PRO_TRI_REASSIGNED => 19, ProcessPeer::PRO_TRI_UNPAUSED => 20, ProcessPeer::PRO_TYPE_PROCESS => 21, ProcessPeer::PRO_SHOW_DELEGATE => 22, ProcessPeer::PRO_SHOW_DYNAFORM => 23, ProcessPeer::PRO_CATEGORY => 24, ProcessPeer::PRO_SUB_CATEGORY => 25, ProcessPeer::PRO_INDUSTRY => 26, ProcessPeer::PRO_UPDATE_DATE => 27, ProcessPeer::PRO_CREATE_DATE => 28, ProcessPeer::PRO_CREATE_USER => 29, ProcessPeer::PRO_HEIGHT => 30, ProcessPeer::PRO_WIDTH => 31, ProcessPeer::PRO_TITLE_X => 32, ProcessPeer::PRO_TITLE_Y => 33, ProcessPeer::PRO_DEBUG => 34, ProcessPeer::PRO_DYNAFORMS => 35, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 36, ProcessPeer::PRO_COST => 37, ProcessPeer::PRO_UNIT_COST => 38, ProcessPeer::PRO_ITEE => 39, ProcessPeer::PRO_ACTION_DONE => 40, ), - BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_ID' => 1, 'PRO_TITLE' => 2, 'PRO_DESCRIPTION' => 3, 'PRO_PARENT' => 4, 'PRO_TIME' => 5, 'PRO_TIMEUNIT' => 6, 'PRO_STATUS' => 7, 'PRO_TYPE_DAY' => 8, 'PRO_TYPE' => 9, 'PRO_ASSIGNMENT' => 10, 'PRO_SHOW_MAP' => 11, 'PRO_SHOW_MESSAGE' => 12, 'PRO_SUBPROCESS' => 13, 'PRO_TRI_CREATE' => 14, 'PRO_TRI_OPEN' => 15, 'PRO_TRI_DELETED' => 16, 'PRO_TRI_CANCELED' => 17, 'PRO_TRI_PAUSED' => 18, 'PRO_TRI_REASSIGNED' => 19, 'PRO_TRI_UNPAUSED' => 20, 'PRO_TYPE_PROCESS' => 21, 'PRO_SHOW_DELEGATE' => 22, 'PRO_SHOW_DYNAFORM' => 23, 'PRO_CATEGORY' => 24, 'PRO_SUB_CATEGORY' => 25, 'PRO_INDUSTRY' => 26, 'PRO_UPDATE_DATE' => 27, 'PRO_CREATE_DATE' => 28, 'PRO_CREATE_USER' => 29, 'PRO_HEIGHT' => 30, 'PRO_WIDTH' => 31, 'PRO_TITLE_X' => 32, 'PRO_TITLE_Y' => 33, 'PRO_DEBUG' => 34, 'PRO_DYNAFORMS' => 35, 'PRO_DERIVATION_SCREEN_TPL' => 36, 'PRO_COST' => 37, 'PRO_UNIT_COST' => 38, 'PRO_ITEE' => 39, 'PRO_ACTION_DONE' => 40, ), - 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, 39, 40, ) + BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProId' => 1, 'ProTitle' => 2, 'ProDescription' => 3, 'ProParent' => 4, 'ProTime' => 5, 'ProTimeunit' => 6, 'ProStatus' => 7, 'ProStatusId' => 8, 'ProTypeDay' => 9, 'ProType' => 10, 'ProAssignment' => 11, 'ProShowMap' => 12, 'ProShowMessage' => 13, 'ProSubprocess' => 14, 'ProTriCreate' => 15, 'ProTriOpen' => 16, 'ProTriDeleted' => 17, 'ProTriCanceled' => 18, 'ProTriPaused' => 19, 'ProTriReassigned' => 20, 'ProTriUnpaused' => 21, 'ProTypeProcess' => 22, 'ProShowDelegate' => 23, 'ProShowDynaform' => 24, 'ProCategory' => 25, 'ProSubCategory' => 26, 'ProIndustry' => 27, 'ProUpdateDate' => 28, 'ProCreateDate' => 29, 'ProCreateUser' => 30, 'ProHeight' => 31, 'ProWidth' => 32, 'ProTitleX' => 33, 'ProTitleY' => 34, 'ProDebug' => 35, 'ProDynaforms' => 36, 'ProDerivationScreenTpl' => 37, 'ProCost' => 38, 'ProUnitCost' => 39, 'ProItee' => 40, 'ProActionDone' => 41, 'CategoryId' => 42, ), + BasePeer::TYPE_COLNAME => array (ProcessPeer::PRO_UID => 0, ProcessPeer::PRO_ID => 1, ProcessPeer::PRO_TITLE => 2, ProcessPeer::PRO_DESCRIPTION => 3, ProcessPeer::PRO_PARENT => 4, ProcessPeer::PRO_TIME => 5, ProcessPeer::PRO_TIMEUNIT => 6, ProcessPeer::PRO_STATUS => 7, ProcessPeer::PRO_STATUS_ID => 8, ProcessPeer::PRO_TYPE_DAY => 9, ProcessPeer::PRO_TYPE => 10, ProcessPeer::PRO_ASSIGNMENT => 11, ProcessPeer::PRO_SHOW_MAP => 12, ProcessPeer::PRO_SHOW_MESSAGE => 13, ProcessPeer::PRO_SUBPROCESS => 14, ProcessPeer::PRO_TRI_CREATE => 15, ProcessPeer::PRO_TRI_OPEN => 16, ProcessPeer::PRO_TRI_DELETED => 17, ProcessPeer::PRO_TRI_CANCELED => 18, ProcessPeer::PRO_TRI_PAUSED => 19, ProcessPeer::PRO_TRI_REASSIGNED => 20, ProcessPeer::PRO_TRI_UNPAUSED => 21, ProcessPeer::PRO_TYPE_PROCESS => 22, ProcessPeer::PRO_SHOW_DELEGATE => 23, ProcessPeer::PRO_SHOW_DYNAFORM => 24, ProcessPeer::PRO_CATEGORY => 25, ProcessPeer::PRO_SUB_CATEGORY => 26, ProcessPeer::PRO_INDUSTRY => 27, ProcessPeer::PRO_UPDATE_DATE => 28, ProcessPeer::PRO_CREATE_DATE => 29, ProcessPeer::PRO_CREATE_USER => 30, ProcessPeer::PRO_HEIGHT => 31, ProcessPeer::PRO_WIDTH => 32, ProcessPeer::PRO_TITLE_X => 33, ProcessPeer::PRO_TITLE_Y => 34, ProcessPeer::PRO_DEBUG => 35, ProcessPeer::PRO_DYNAFORMS => 36, ProcessPeer::PRO_DERIVATION_SCREEN_TPL => 37, ProcessPeer::PRO_COST => 38, ProcessPeer::PRO_UNIT_COST => 39, ProcessPeer::PRO_ITEE => 40, ProcessPeer::PRO_ACTION_DONE => 41, ProcessPeer::CATEGORY_ID => 42, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_ID' => 1, 'PRO_TITLE' => 2, 'PRO_DESCRIPTION' => 3, 'PRO_PARENT' => 4, 'PRO_TIME' => 5, 'PRO_TIMEUNIT' => 6, 'PRO_STATUS' => 7, 'PRO_STATUS_ID' => 8, 'PRO_TYPE_DAY' => 9, 'PRO_TYPE' => 10, 'PRO_ASSIGNMENT' => 11, 'PRO_SHOW_MAP' => 12, 'PRO_SHOW_MESSAGE' => 13, 'PRO_SUBPROCESS' => 14, 'PRO_TRI_CREATE' => 15, 'PRO_TRI_OPEN' => 16, 'PRO_TRI_DELETED' => 17, 'PRO_TRI_CANCELED' => 18, 'PRO_TRI_PAUSED' => 19, 'PRO_TRI_REASSIGNED' => 20, 'PRO_TRI_UNPAUSED' => 21, 'PRO_TYPE_PROCESS' => 22, 'PRO_SHOW_DELEGATE' => 23, 'PRO_SHOW_DYNAFORM' => 24, 'PRO_CATEGORY' => 25, 'PRO_SUB_CATEGORY' => 26, 'PRO_INDUSTRY' => 27, 'PRO_UPDATE_DATE' => 28, 'PRO_CREATE_DATE' => 29, 'PRO_CREATE_USER' => 30, 'PRO_HEIGHT' => 31, 'PRO_WIDTH' => 32, 'PRO_TITLE_X' => 33, 'PRO_TITLE_Y' => 34, 'PRO_DEBUG' => 35, 'PRO_DYNAFORMS' => 36, 'PRO_DERIVATION_SCREEN_TPL' => 37, 'PRO_COST' => 38, 'PRO_UNIT_COST' => 39, 'PRO_ITEE' => 40, 'PRO_ACTION_DONE' => 41, 'CATEGORY_ID' => 42, ), + 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, 39, 40, 41, 42, ) ); /** @@ -298,6 +304,8 @@ abstract class BaseProcessPeer $criteria->addSelectColumn(ProcessPeer::PRO_STATUS); + $criteria->addSelectColumn(ProcessPeer::PRO_STATUS_ID); + $criteria->addSelectColumn(ProcessPeer::PRO_TYPE_DAY); $criteria->addSelectColumn(ProcessPeer::PRO_TYPE); @@ -364,6 +372,8 @@ abstract class BaseProcessPeer $criteria->addSelectColumn(ProcessPeer::PRO_ACTION_DONE); + $criteria->addSelectColumn(ProcessPeer::CATEGORY_ID); + } const COUNT = 'COUNT(PROCESS.PRO_UID)'; diff --git a/workflow/engine/classes/model/om/BaseTask.php b/workflow/engine/classes/model/om/BaseTask.php index 70364552f..773e4e279 100644 --- a/workflow/engine/classes/model/om/BaseTask.php +++ b/workflow/engine/classes/model/om/BaseTask.php @@ -33,6 +33,12 @@ abstract class BaseTask extends BaseObject implements Persistent */ protected $pro_uid = ''; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + /** * The value for the tas_uid field. * @var string @@ -97,7 +103,7 @@ abstract class BaseTask extends BaseObject implements Persistent * The value for the tas_duration field. * @var double */ - protected $tas_duration = 0; + protected $tas_duration = 0.0; /** * The value for the tas_delay_type field. @@ -109,7 +115,7 @@ abstract class BaseTask extends BaseObject implements Persistent * The value for the tas_temporizer field. * @var double */ - protected $tas_temporizer = 0; + protected $tas_temporizer = 0.0; /** * The value for the tas_type_day field. @@ -448,6 +454,17 @@ abstract class BaseTask extends BaseObject implements Persistent return $this->pro_uid; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + /** * Get the [tas_uid] column value. * @@ -1185,6 +1202,28 @@ abstract class BaseTask extends BaseObject implements Persistent } // setProUid() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = TaskPeer::PRO_ID; + } + + } // setProId() + /** * Set the value of [tas_uid] column. * @@ -1414,7 +1453,7 @@ abstract class BaseTask extends BaseObject implements Persistent public function setTasDuration($v) { - if ($this->tas_duration !== $v || $v === 0) { + if ($this->tas_duration !== $v || $v === 0.0) { $this->tas_duration = $v; $this->modifiedColumns[] = TaskPeer::TAS_DURATION; } @@ -1452,7 +1491,7 @@ abstract class BaseTask extends BaseObject implements Persistent public function setTasTemporizer($v) { - if ($this->tas_temporizer !== $v || $v === 0) { + if ($this->tas_temporizer !== $v || $v === 0.0) { $this->tas_temporizer = $v; $this->modifiedColumns[] = TaskPeer::TAS_TEMPORIZER; } @@ -2622,142 +2661,144 @@ abstract class BaseTask extends BaseObject implements Persistent $this->pro_uid = $rs->getString($startcol + 0); - $this->tas_uid = $rs->getString($startcol + 1); + $this->pro_id = $rs->getInt($startcol + 1); - $this->tas_id = $rs->getInt($startcol + 2); + $this->tas_uid = $rs->getString($startcol + 2); - $this->tas_title = $rs->getString($startcol + 3); + $this->tas_id = $rs->getInt($startcol + 3); - $this->tas_description = $rs->getString($startcol + 4); + $this->tas_title = $rs->getString($startcol + 4); - $this->tas_def_title = $rs->getString($startcol + 5); + $this->tas_description = $rs->getString($startcol + 5); - $this->tas_def_subject_message = $rs->getString($startcol + 6); + $this->tas_def_title = $rs->getString($startcol + 6); - $this->tas_def_proc_code = $rs->getString($startcol + 7); + $this->tas_def_subject_message = $rs->getString($startcol + 7); - $this->tas_def_message = $rs->getString($startcol + 8); + $this->tas_def_proc_code = $rs->getString($startcol + 8); - $this->tas_def_description = $rs->getString($startcol + 9); + $this->tas_def_message = $rs->getString($startcol + 9); - $this->tas_type = $rs->getString($startcol + 10); + $this->tas_def_description = $rs->getString($startcol + 10); - $this->tas_duration = $rs->getFloat($startcol + 11); + $this->tas_type = $rs->getString($startcol + 11); - $this->tas_delay_type = $rs->getString($startcol + 12); + $this->tas_duration = $rs->getFloat($startcol + 12); - $this->tas_temporizer = $rs->getFloat($startcol + 13); + $this->tas_delay_type = $rs->getString($startcol + 13); - $this->tas_type_day = $rs->getString($startcol + 14); + $this->tas_temporizer = $rs->getFloat($startcol + 14); - $this->tas_timeunit = $rs->getString($startcol + 15); + $this->tas_type_day = $rs->getString($startcol + 15); - $this->tas_alert = $rs->getString($startcol + 16); + $this->tas_timeunit = $rs->getString($startcol + 16); - $this->tas_priority_variable = $rs->getString($startcol + 17); + $this->tas_alert = $rs->getString($startcol + 17); - $this->tas_assign_type = $rs->getString($startcol + 18); + $this->tas_priority_variable = $rs->getString($startcol + 18); - $this->tas_assign_variable = $rs->getString($startcol + 19); + $this->tas_assign_type = $rs->getString($startcol + 19); - $this->tas_group_variable = $rs->getString($startcol + 20); + $this->tas_assign_variable = $rs->getString($startcol + 20); - $this->tas_mi_instance_variable = $rs->getString($startcol + 21); + $this->tas_group_variable = $rs->getString($startcol + 21); - $this->tas_mi_complete_variable = $rs->getString($startcol + 22); + $this->tas_mi_instance_variable = $rs->getString($startcol + 22); - $this->tas_assign_location = $rs->getString($startcol + 23); + $this->tas_mi_complete_variable = $rs->getString($startcol + 23); - $this->tas_assign_location_adhoc = $rs->getString($startcol + 24); + $this->tas_assign_location = $rs->getString($startcol + 24); - $this->tas_transfer_fly = $rs->getString($startcol + 25); + $this->tas_assign_location_adhoc = $rs->getString($startcol + 25); - $this->tas_last_assigned = $rs->getString($startcol + 26); + $this->tas_transfer_fly = $rs->getString($startcol + 26); - $this->tas_user = $rs->getString($startcol + 27); + $this->tas_last_assigned = $rs->getString($startcol + 27); - $this->tas_can_upload = $rs->getString($startcol + 28); + $this->tas_user = $rs->getString($startcol + 28); - $this->tas_view_upload = $rs->getString($startcol + 29); + $this->tas_can_upload = $rs->getString($startcol + 29); - $this->tas_view_additional_documentation = $rs->getString($startcol + 30); + $this->tas_view_upload = $rs->getString($startcol + 30); - $this->tas_can_cancel = $rs->getString($startcol + 31); + $this->tas_view_additional_documentation = $rs->getString($startcol + 31); - $this->tas_owner_app = $rs->getString($startcol + 32); + $this->tas_can_cancel = $rs->getString($startcol + 32); - $this->stg_uid = $rs->getString($startcol + 33); + $this->tas_owner_app = $rs->getString($startcol + 33); - $this->tas_can_pause = $rs->getString($startcol + 34); + $this->stg_uid = $rs->getString($startcol + 34); - $this->tas_can_send_message = $rs->getString($startcol + 35); + $this->tas_can_pause = $rs->getString($startcol + 35); - $this->tas_can_delete_docs = $rs->getString($startcol + 36); + $this->tas_can_send_message = $rs->getString($startcol + 36); - $this->tas_self_service = $rs->getString($startcol + 37); + $this->tas_can_delete_docs = $rs->getString($startcol + 37); - $this->tas_start = $rs->getString($startcol + 38); + $this->tas_self_service = $rs->getString($startcol + 38); - $this->tas_to_last_user = $rs->getString($startcol + 39); + $this->tas_start = $rs->getString($startcol + 39); - $this->tas_send_last_email = $rs->getString($startcol + 40); + $this->tas_to_last_user = $rs->getString($startcol + 40); - $this->tas_derivation = $rs->getString($startcol + 41); + $this->tas_send_last_email = $rs->getString($startcol + 41); - $this->tas_posx = $rs->getInt($startcol + 42); + $this->tas_derivation = $rs->getString($startcol + 42); - $this->tas_posy = $rs->getInt($startcol + 43); + $this->tas_posx = $rs->getInt($startcol + 43); - $this->tas_width = $rs->getInt($startcol + 44); + $this->tas_posy = $rs->getInt($startcol + 44); - $this->tas_height = $rs->getInt($startcol + 45); + $this->tas_width = $rs->getInt($startcol + 45); - $this->tas_color = $rs->getString($startcol + 46); + $this->tas_height = $rs->getInt($startcol + 46); - $this->tas_evn_uid = $rs->getString($startcol + 47); + $this->tas_color = $rs->getString($startcol + 47); - $this->tas_boundary = $rs->getString($startcol + 48); + $this->tas_evn_uid = $rs->getString($startcol + 48); - $this->tas_derivation_screen_tpl = $rs->getString($startcol + 49); + $this->tas_boundary = $rs->getString($startcol + 49); - $this->tas_selfservice_timeout = $rs->getInt($startcol + 50); + $this->tas_derivation_screen_tpl = $rs->getString($startcol + 50); - $this->tas_selfservice_time = $rs->getInt($startcol + 51); + $this->tas_selfservice_timeout = $rs->getInt($startcol + 51); - $this->tas_selfservice_time_unit = $rs->getString($startcol + 52); + $this->tas_selfservice_time = $rs->getInt($startcol + 52); - $this->tas_selfservice_trigger_uid = $rs->getString($startcol + 53); + $this->tas_selfservice_time_unit = $rs->getString($startcol + 53); - $this->tas_selfservice_execution = $rs->getString($startcol + 54); + $this->tas_selfservice_trigger_uid = $rs->getString($startcol + 54); - $this->tas_not_email_from_format = $rs->getInt($startcol + 55); + $this->tas_selfservice_execution = $rs->getString($startcol + 55); - $this->tas_offline = $rs->getString($startcol + 56); + $this->tas_not_email_from_format = $rs->getInt($startcol + 56); - $this->tas_email_server_uid = $rs->getString($startcol + 57); + $this->tas_offline = $rs->getString($startcol + 57); - $this->tas_auto_root = $rs->getString($startcol + 58); + $this->tas_email_server_uid = $rs->getString($startcol + 58); - $this->tas_receive_server_uid = $rs->getString($startcol + 59); + $this->tas_auto_root = $rs->getString($startcol + 59); - $this->tas_receive_last_email = $rs->getString($startcol + 60); + $this->tas_receive_server_uid = $rs->getString($startcol + 60); - $this->tas_receive_email_from_format = $rs->getInt($startcol + 61); + $this->tas_receive_last_email = $rs->getString($startcol + 61); - $this->tas_receive_message_type = $rs->getString($startcol + 62); + $this->tas_receive_email_from_format = $rs->getInt($startcol + 62); - $this->tas_receive_message_template = $rs->getString($startcol + 63); + $this->tas_receive_message_type = $rs->getString($startcol + 63); - $this->tas_receive_subject_message = $rs->getString($startcol + 64); + $this->tas_receive_message_template = $rs->getString($startcol + 64); - $this->tas_receive_message = $rs->getString($startcol + 65); + $this->tas_receive_subject_message = $rs->getString($startcol + 65); + + $this->tas_receive_message = $rs->getString($startcol + 66); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 66; // 66 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 67; // 67 = TaskPeer::NUM_COLUMNS - TaskPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Task object", $e); @@ -2965,198 +3006,201 @@ abstract class BaseTask extends BaseObject implements Persistent return $this->getProUid(); break; case 1: - return $this->getTasUid(); + return $this->getProId(); break; case 2: - return $this->getTasId(); + return $this->getTasUid(); break; case 3: - return $this->getTasTitle(); + return $this->getTasId(); break; case 4: - return $this->getTasDescription(); + return $this->getTasTitle(); break; case 5: - return $this->getTasDefTitle(); + return $this->getTasDescription(); break; case 6: - return $this->getTasDefSubjectMessage(); + return $this->getTasDefTitle(); break; case 7: - return $this->getTasDefProcCode(); + return $this->getTasDefSubjectMessage(); break; case 8: - return $this->getTasDefMessage(); + return $this->getTasDefProcCode(); break; case 9: - return $this->getTasDefDescription(); + return $this->getTasDefMessage(); break; case 10: - return $this->getTasType(); + return $this->getTasDefDescription(); break; case 11: - return $this->getTasDuration(); + return $this->getTasType(); break; case 12: - return $this->getTasDelayType(); + return $this->getTasDuration(); break; case 13: - return $this->getTasTemporizer(); + return $this->getTasDelayType(); break; case 14: - return $this->getTasTypeDay(); + return $this->getTasTemporizer(); break; case 15: - return $this->getTasTimeunit(); + return $this->getTasTypeDay(); break; case 16: - return $this->getTasAlert(); + return $this->getTasTimeunit(); break; case 17: - return $this->getTasPriorityVariable(); + return $this->getTasAlert(); break; case 18: - return $this->getTasAssignType(); + return $this->getTasPriorityVariable(); break; case 19: - return $this->getTasAssignVariable(); + return $this->getTasAssignType(); break; case 20: - return $this->getTasGroupVariable(); + return $this->getTasAssignVariable(); break; case 21: - return $this->getTasMiInstanceVariable(); + return $this->getTasGroupVariable(); break; case 22: - return $this->getTasMiCompleteVariable(); + return $this->getTasMiInstanceVariable(); break; case 23: - return $this->getTasAssignLocation(); + return $this->getTasMiCompleteVariable(); break; case 24: - return $this->getTasAssignLocationAdhoc(); + return $this->getTasAssignLocation(); break; case 25: - return $this->getTasTransferFly(); + return $this->getTasAssignLocationAdhoc(); break; case 26: - return $this->getTasLastAssigned(); + return $this->getTasTransferFly(); break; case 27: - return $this->getTasUser(); + return $this->getTasLastAssigned(); break; case 28: - return $this->getTasCanUpload(); + return $this->getTasUser(); break; case 29: - return $this->getTasViewUpload(); + return $this->getTasCanUpload(); break; case 30: - return $this->getTasViewAdditionalDocumentation(); + return $this->getTasViewUpload(); break; case 31: - return $this->getTasCanCancel(); + return $this->getTasViewAdditionalDocumentation(); break; case 32: - return $this->getTasOwnerApp(); + return $this->getTasCanCancel(); break; case 33: - return $this->getStgUid(); + return $this->getTasOwnerApp(); break; case 34: - return $this->getTasCanPause(); + return $this->getStgUid(); break; case 35: - return $this->getTasCanSendMessage(); + return $this->getTasCanPause(); break; case 36: - return $this->getTasCanDeleteDocs(); + return $this->getTasCanSendMessage(); break; case 37: - return $this->getTasSelfService(); + return $this->getTasCanDeleteDocs(); break; case 38: - return $this->getTasStart(); + return $this->getTasSelfService(); break; case 39: - return $this->getTasToLastUser(); + return $this->getTasStart(); break; case 40: - return $this->getTasSendLastEmail(); + return $this->getTasToLastUser(); break; case 41: - return $this->getTasDerivation(); + return $this->getTasSendLastEmail(); break; case 42: - return $this->getTasPosx(); + return $this->getTasDerivation(); break; case 43: - return $this->getTasPosy(); + return $this->getTasPosx(); break; case 44: - return $this->getTasWidth(); + return $this->getTasPosy(); break; case 45: - return $this->getTasHeight(); + return $this->getTasWidth(); break; case 46: - return $this->getTasColor(); + return $this->getTasHeight(); break; case 47: - return $this->getTasEvnUid(); + return $this->getTasColor(); break; case 48: - return $this->getTasBoundary(); + return $this->getTasEvnUid(); break; case 49: - return $this->getTasDerivationScreenTpl(); + return $this->getTasBoundary(); break; case 50: - return $this->getTasSelfserviceTimeout(); + return $this->getTasDerivationScreenTpl(); break; case 51: - return $this->getTasSelfserviceTime(); + return $this->getTasSelfserviceTimeout(); break; case 52: - return $this->getTasSelfserviceTimeUnit(); + return $this->getTasSelfserviceTime(); break; case 53: - return $this->getTasSelfserviceTriggerUid(); + return $this->getTasSelfserviceTimeUnit(); break; case 54: - return $this->getTasSelfserviceExecution(); + return $this->getTasSelfserviceTriggerUid(); break; case 55: - return $this->getTasNotEmailFromFormat(); + return $this->getTasSelfserviceExecution(); break; case 56: - return $this->getTasOffline(); + return $this->getTasNotEmailFromFormat(); break; case 57: - return $this->getTasEmailServerUid(); + return $this->getTasOffline(); break; case 58: - return $this->getTasAutoRoot(); + return $this->getTasEmailServerUid(); break; case 59: - return $this->getTasReceiveServerUid(); + return $this->getTasAutoRoot(); break; case 60: - return $this->getTasReceiveLastEmail(); + return $this->getTasReceiveServerUid(); break; case 61: - return $this->getTasReceiveEmailFromFormat(); + return $this->getTasReceiveLastEmail(); break; case 62: - return $this->getTasReceiveMessageType(); + return $this->getTasReceiveEmailFromFormat(); break; case 63: - return $this->getTasReceiveMessageTemplate(); + return $this->getTasReceiveMessageType(); break; case 64: - return $this->getTasReceiveSubjectMessage(); + return $this->getTasReceiveMessageTemplate(); break; case 65: + return $this->getTasReceiveSubjectMessage(); + break; + case 66: return $this->getTasReceiveMessage(); break; default: @@ -3180,71 +3224,72 @@ abstract class BaseTask extends BaseObject implements Persistent $keys = TaskPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getProUid(), - $keys[1] => $this->getTasUid(), - $keys[2] => $this->getTasId(), - $keys[3] => $this->getTasTitle(), - $keys[4] => $this->getTasDescription(), - $keys[5] => $this->getTasDefTitle(), - $keys[6] => $this->getTasDefSubjectMessage(), - $keys[7] => $this->getTasDefProcCode(), - $keys[8] => $this->getTasDefMessage(), - $keys[9] => $this->getTasDefDescription(), - $keys[10] => $this->getTasType(), - $keys[11] => $this->getTasDuration(), - $keys[12] => $this->getTasDelayType(), - $keys[13] => $this->getTasTemporizer(), - $keys[14] => $this->getTasTypeDay(), - $keys[15] => $this->getTasTimeunit(), - $keys[16] => $this->getTasAlert(), - $keys[17] => $this->getTasPriorityVariable(), - $keys[18] => $this->getTasAssignType(), - $keys[19] => $this->getTasAssignVariable(), - $keys[20] => $this->getTasGroupVariable(), - $keys[21] => $this->getTasMiInstanceVariable(), - $keys[22] => $this->getTasMiCompleteVariable(), - $keys[23] => $this->getTasAssignLocation(), - $keys[24] => $this->getTasAssignLocationAdhoc(), - $keys[25] => $this->getTasTransferFly(), - $keys[26] => $this->getTasLastAssigned(), - $keys[27] => $this->getTasUser(), - $keys[28] => $this->getTasCanUpload(), - $keys[29] => $this->getTasViewUpload(), - $keys[30] => $this->getTasViewAdditionalDocumentation(), - $keys[31] => $this->getTasCanCancel(), - $keys[32] => $this->getTasOwnerApp(), - $keys[33] => $this->getStgUid(), - $keys[34] => $this->getTasCanPause(), - $keys[35] => $this->getTasCanSendMessage(), - $keys[36] => $this->getTasCanDeleteDocs(), - $keys[37] => $this->getTasSelfService(), - $keys[38] => $this->getTasStart(), - $keys[39] => $this->getTasToLastUser(), - $keys[40] => $this->getTasSendLastEmail(), - $keys[41] => $this->getTasDerivation(), - $keys[42] => $this->getTasPosx(), - $keys[43] => $this->getTasPosy(), - $keys[44] => $this->getTasWidth(), - $keys[45] => $this->getTasHeight(), - $keys[46] => $this->getTasColor(), - $keys[47] => $this->getTasEvnUid(), - $keys[48] => $this->getTasBoundary(), - $keys[49] => $this->getTasDerivationScreenTpl(), - $keys[50] => $this->getTasSelfserviceTimeout(), - $keys[51] => $this->getTasSelfserviceTime(), - $keys[52] => $this->getTasSelfserviceTimeUnit(), - $keys[53] => $this->getTasSelfserviceTriggerUid(), - $keys[54] => $this->getTasSelfserviceExecution(), - $keys[55] => $this->getTasNotEmailFromFormat(), - $keys[56] => $this->getTasOffline(), - $keys[57] => $this->getTasEmailServerUid(), - $keys[58] => $this->getTasAutoRoot(), - $keys[59] => $this->getTasReceiveServerUid(), - $keys[60] => $this->getTasReceiveLastEmail(), - $keys[61] => $this->getTasReceiveEmailFromFormat(), - $keys[62] => $this->getTasReceiveMessageType(), - $keys[63] => $this->getTasReceiveMessageTemplate(), - $keys[64] => $this->getTasReceiveSubjectMessage(), - $keys[65] => $this->getTasReceiveMessage(), + $keys[1] => $this->getProId(), + $keys[2] => $this->getTasUid(), + $keys[3] => $this->getTasId(), + $keys[4] => $this->getTasTitle(), + $keys[5] => $this->getTasDescription(), + $keys[6] => $this->getTasDefTitle(), + $keys[7] => $this->getTasDefSubjectMessage(), + $keys[8] => $this->getTasDefProcCode(), + $keys[9] => $this->getTasDefMessage(), + $keys[10] => $this->getTasDefDescription(), + $keys[11] => $this->getTasType(), + $keys[12] => $this->getTasDuration(), + $keys[13] => $this->getTasDelayType(), + $keys[14] => $this->getTasTemporizer(), + $keys[15] => $this->getTasTypeDay(), + $keys[16] => $this->getTasTimeunit(), + $keys[17] => $this->getTasAlert(), + $keys[18] => $this->getTasPriorityVariable(), + $keys[19] => $this->getTasAssignType(), + $keys[20] => $this->getTasAssignVariable(), + $keys[21] => $this->getTasGroupVariable(), + $keys[22] => $this->getTasMiInstanceVariable(), + $keys[23] => $this->getTasMiCompleteVariable(), + $keys[24] => $this->getTasAssignLocation(), + $keys[25] => $this->getTasAssignLocationAdhoc(), + $keys[26] => $this->getTasTransferFly(), + $keys[27] => $this->getTasLastAssigned(), + $keys[28] => $this->getTasUser(), + $keys[29] => $this->getTasCanUpload(), + $keys[30] => $this->getTasViewUpload(), + $keys[31] => $this->getTasViewAdditionalDocumentation(), + $keys[32] => $this->getTasCanCancel(), + $keys[33] => $this->getTasOwnerApp(), + $keys[34] => $this->getStgUid(), + $keys[35] => $this->getTasCanPause(), + $keys[36] => $this->getTasCanSendMessage(), + $keys[37] => $this->getTasCanDeleteDocs(), + $keys[38] => $this->getTasSelfService(), + $keys[39] => $this->getTasStart(), + $keys[40] => $this->getTasToLastUser(), + $keys[41] => $this->getTasSendLastEmail(), + $keys[42] => $this->getTasDerivation(), + $keys[43] => $this->getTasPosx(), + $keys[44] => $this->getTasPosy(), + $keys[45] => $this->getTasWidth(), + $keys[46] => $this->getTasHeight(), + $keys[47] => $this->getTasColor(), + $keys[48] => $this->getTasEvnUid(), + $keys[49] => $this->getTasBoundary(), + $keys[50] => $this->getTasDerivationScreenTpl(), + $keys[51] => $this->getTasSelfserviceTimeout(), + $keys[52] => $this->getTasSelfserviceTime(), + $keys[53] => $this->getTasSelfserviceTimeUnit(), + $keys[54] => $this->getTasSelfserviceTriggerUid(), + $keys[55] => $this->getTasSelfserviceExecution(), + $keys[56] => $this->getTasNotEmailFromFormat(), + $keys[57] => $this->getTasOffline(), + $keys[58] => $this->getTasEmailServerUid(), + $keys[59] => $this->getTasAutoRoot(), + $keys[60] => $this->getTasReceiveServerUid(), + $keys[61] => $this->getTasReceiveLastEmail(), + $keys[62] => $this->getTasReceiveEmailFromFormat(), + $keys[63] => $this->getTasReceiveMessageType(), + $keys[64] => $this->getTasReceiveMessageTemplate(), + $keys[65] => $this->getTasReceiveSubjectMessage(), + $keys[66] => $this->getTasReceiveMessage(), ); return $result; } @@ -3280,198 +3325,201 @@ abstract class BaseTask extends BaseObject implements Persistent $this->setProUid($value); break; case 1: - $this->setTasUid($value); + $this->setProId($value); break; case 2: - $this->setTasId($value); + $this->setTasUid($value); break; case 3: - $this->setTasTitle($value); + $this->setTasId($value); break; case 4: - $this->setTasDescription($value); + $this->setTasTitle($value); break; case 5: - $this->setTasDefTitle($value); + $this->setTasDescription($value); break; case 6: - $this->setTasDefSubjectMessage($value); + $this->setTasDefTitle($value); break; case 7: - $this->setTasDefProcCode($value); + $this->setTasDefSubjectMessage($value); break; case 8: - $this->setTasDefMessage($value); + $this->setTasDefProcCode($value); break; case 9: - $this->setTasDefDescription($value); + $this->setTasDefMessage($value); break; case 10: - $this->setTasType($value); + $this->setTasDefDescription($value); break; case 11: - $this->setTasDuration($value); + $this->setTasType($value); break; case 12: - $this->setTasDelayType($value); + $this->setTasDuration($value); break; case 13: - $this->setTasTemporizer($value); + $this->setTasDelayType($value); break; case 14: - $this->setTasTypeDay($value); + $this->setTasTemporizer($value); break; case 15: - $this->setTasTimeunit($value); + $this->setTasTypeDay($value); break; case 16: - $this->setTasAlert($value); + $this->setTasTimeunit($value); break; case 17: - $this->setTasPriorityVariable($value); + $this->setTasAlert($value); break; case 18: - $this->setTasAssignType($value); + $this->setTasPriorityVariable($value); break; case 19: - $this->setTasAssignVariable($value); + $this->setTasAssignType($value); break; case 20: - $this->setTasGroupVariable($value); + $this->setTasAssignVariable($value); break; case 21: - $this->setTasMiInstanceVariable($value); + $this->setTasGroupVariable($value); break; case 22: - $this->setTasMiCompleteVariable($value); + $this->setTasMiInstanceVariable($value); break; case 23: - $this->setTasAssignLocation($value); + $this->setTasMiCompleteVariable($value); break; case 24: - $this->setTasAssignLocationAdhoc($value); + $this->setTasAssignLocation($value); break; case 25: - $this->setTasTransferFly($value); + $this->setTasAssignLocationAdhoc($value); break; case 26: - $this->setTasLastAssigned($value); + $this->setTasTransferFly($value); break; case 27: - $this->setTasUser($value); + $this->setTasLastAssigned($value); break; case 28: - $this->setTasCanUpload($value); + $this->setTasUser($value); break; case 29: - $this->setTasViewUpload($value); + $this->setTasCanUpload($value); break; case 30: - $this->setTasViewAdditionalDocumentation($value); + $this->setTasViewUpload($value); break; case 31: - $this->setTasCanCancel($value); + $this->setTasViewAdditionalDocumentation($value); break; case 32: - $this->setTasOwnerApp($value); + $this->setTasCanCancel($value); break; case 33: - $this->setStgUid($value); + $this->setTasOwnerApp($value); break; case 34: - $this->setTasCanPause($value); + $this->setStgUid($value); break; case 35: - $this->setTasCanSendMessage($value); + $this->setTasCanPause($value); break; case 36: - $this->setTasCanDeleteDocs($value); + $this->setTasCanSendMessage($value); break; case 37: - $this->setTasSelfService($value); + $this->setTasCanDeleteDocs($value); break; case 38: - $this->setTasStart($value); + $this->setTasSelfService($value); break; case 39: - $this->setTasToLastUser($value); + $this->setTasStart($value); break; case 40: - $this->setTasSendLastEmail($value); + $this->setTasToLastUser($value); break; case 41: - $this->setTasDerivation($value); + $this->setTasSendLastEmail($value); break; case 42: - $this->setTasPosx($value); + $this->setTasDerivation($value); break; case 43: - $this->setTasPosy($value); + $this->setTasPosx($value); break; case 44: - $this->setTasWidth($value); + $this->setTasPosy($value); break; case 45: - $this->setTasHeight($value); + $this->setTasWidth($value); break; case 46: - $this->setTasColor($value); + $this->setTasHeight($value); break; case 47: - $this->setTasEvnUid($value); + $this->setTasColor($value); break; case 48: - $this->setTasBoundary($value); + $this->setTasEvnUid($value); break; case 49: - $this->setTasDerivationScreenTpl($value); + $this->setTasBoundary($value); break; case 50: - $this->setTasSelfserviceTimeout($value); + $this->setTasDerivationScreenTpl($value); break; case 51: - $this->setTasSelfserviceTime($value); + $this->setTasSelfserviceTimeout($value); break; case 52: - $this->setTasSelfserviceTimeUnit($value); + $this->setTasSelfserviceTime($value); break; case 53: - $this->setTasSelfserviceTriggerUid($value); + $this->setTasSelfserviceTimeUnit($value); break; case 54: - $this->setTasSelfserviceExecution($value); + $this->setTasSelfserviceTriggerUid($value); break; case 55: - $this->setTasNotEmailFromFormat($value); + $this->setTasSelfserviceExecution($value); break; case 56: - $this->setTasOffline($value); + $this->setTasNotEmailFromFormat($value); break; case 57: - $this->setTasEmailServerUid($value); + $this->setTasOffline($value); break; case 58: - $this->setTasAutoRoot($value); + $this->setTasEmailServerUid($value); break; case 59: - $this->setTasReceiveServerUid($value); + $this->setTasAutoRoot($value); break; case 60: - $this->setTasReceiveLastEmail($value); + $this->setTasReceiveServerUid($value); break; case 61: - $this->setTasReceiveEmailFromFormat($value); + $this->setTasReceiveLastEmail($value); break; case 62: - $this->setTasReceiveMessageType($value); + $this->setTasReceiveEmailFromFormat($value); break; case 63: - $this->setTasReceiveMessageTemplate($value); + $this->setTasReceiveMessageType($value); break; case 64: - $this->setTasReceiveSubjectMessage($value); + $this->setTasReceiveMessageTemplate($value); break; case 65: + $this->setTasReceiveSubjectMessage($value); + break; + case 66: $this->setTasReceiveMessage($value); break; } // switch() @@ -3502,263 +3550,267 @@ abstract class BaseTask extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setTasUid($arr[$keys[1]]); + $this->setProId($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setTasId($arr[$keys[2]]); + $this->setTasUid($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setTasTitle($arr[$keys[3]]); + $this->setTasId($arr[$keys[3]]); } if (array_key_exists($keys[4], $arr)) { - $this->setTasDescription($arr[$keys[4]]); + $this->setTasTitle($arr[$keys[4]]); } if (array_key_exists($keys[5], $arr)) { - $this->setTasDefTitle($arr[$keys[5]]); + $this->setTasDescription($arr[$keys[5]]); } if (array_key_exists($keys[6], $arr)) { - $this->setTasDefSubjectMessage($arr[$keys[6]]); + $this->setTasDefTitle($arr[$keys[6]]); } if (array_key_exists($keys[7], $arr)) { - $this->setTasDefProcCode($arr[$keys[7]]); + $this->setTasDefSubjectMessage($arr[$keys[7]]); } if (array_key_exists($keys[8], $arr)) { - $this->setTasDefMessage($arr[$keys[8]]); + $this->setTasDefProcCode($arr[$keys[8]]); } if (array_key_exists($keys[9], $arr)) { - $this->setTasDefDescription($arr[$keys[9]]); + $this->setTasDefMessage($arr[$keys[9]]); } if (array_key_exists($keys[10], $arr)) { - $this->setTasType($arr[$keys[10]]); + $this->setTasDefDescription($arr[$keys[10]]); } if (array_key_exists($keys[11], $arr)) { - $this->setTasDuration($arr[$keys[11]]); + $this->setTasType($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setTasDelayType($arr[$keys[12]]); + $this->setTasDuration($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setTasTemporizer($arr[$keys[13]]); + $this->setTasDelayType($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setTasTypeDay($arr[$keys[14]]); + $this->setTasTemporizer($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setTasTimeunit($arr[$keys[15]]); + $this->setTasTypeDay($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setTasAlert($arr[$keys[16]]); + $this->setTasTimeunit($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setTasPriorityVariable($arr[$keys[17]]); + $this->setTasAlert($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setTasAssignType($arr[$keys[18]]); + $this->setTasPriorityVariable($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setTasAssignVariable($arr[$keys[19]]); + $this->setTasAssignType($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setTasGroupVariable($arr[$keys[20]]); + $this->setTasAssignVariable($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setTasMiInstanceVariable($arr[$keys[21]]); + $this->setTasGroupVariable($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setTasMiCompleteVariable($arr[$keys[22]]); + $this->setTasMiInstanceVariable($arr[$keys[22]]); } if (array_key_exists($keys[23], $arr)) { - $this->setTasAssignLocation($arr[$keys[23]]); + $this->setTasMiCompleteVariable($arr[$keys[23]]); } if (array_key_exists($keys[24], $arr)) { - $this->setTasAssignLocationAdhoc($arr[$keys[24]]); + $this->setTasAssignLocation($arr[$keys[24]]); } if (array_key_exists($keys[25], $arr)) { - $this->setTasTransferFly($arr[$keys[25]]); + $this->setTasAssignLocationAdhoc($arr[$keys[25]]); } if (array_key_exists($keys[26], $arr)) { - $this->setTasLastAssigned($arr[$keys[26]]); + $this->setTasTransferFly($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setTasUser($arr[$keys[27]]); + $this->setTasLastAssigned($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setTasCanUpload($arr[$keys[28]]); + $this->setTasUser($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setTasViewUpload($arr[$keys[29]]); + $this->setTasCanUpload($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setTasViewAdditionalDocumentation($arr[$keys[30]]); + $this->setTasViewUpload($arr[$keys[30]]); } if (array_key_exists($keys[31], $arr)) { - $this->setTasCanCancel($arr[$keys[31]]); + $this->setTasViewAdditionalDocumentation($arr[$keys[31]]); } if (array_key_exists($keys[32], $arr)) { - $this->setTasOwnerApp($arr[$keys[32]]); + $this->setTasCanCancel($arr[$keys[32]]); } if (array_key_exists($keys[33], $arr)) { - $this->setStgUid($arr[$keys[33]]); + $this->setTasOwnerApp($arr[$keys[33]]); } if (array_key_exists($keys[34], $arr)) { - $this->setTasCanPause($arr[$keys[34]]); + $this->setStgUid($arr[$keys[34]]); } if (array_key_exists($keys[35], $arr)) { - $this->setTasCanSendMessage($arr[$keys[35]]); + $this->setTasCanPause($arr[$keys[35]]); } if (array_key_exists($keys[36], $arr)) { - $this->setTasCanDeleteDocs($arr[$keys[36]]); + $this->setTasCanSendMessage($arr[$keys[36]]); } if (array_key_exists($keys[37], $arr)) { - $this->setTasSelfService($arr[$keys[37]]); + $this->setTasCanDeleteDocs($arr[$keys[37]]); } if (array_key_exists($keys[38], $arr)) { - $this->setTasStart($arr[$keys[38]]); + $this->setTasSelfService($arr[$keys[38]]); } if (array_key_exists($keys[39], $arr)) { - $this->setTasToLastUser($arr[$keys[39]]); + $this->setTasStart($arr[$keys[39]]); } if (array_key_exists($keys[40], $arr)) { - $this->setTasSendLastEmail($arr[$keys[40]]); + $this->setTasToLastUser($arr[$keys[40]]); } if (array_key_exists($keys[41], $arr)) { - $this->setTasDerivation($arr[$keys[41]]); + $this->setTasSendLastEmail($arr[$keys[41]]); } if (array_key_exists($keys[42], $arr)) { - $this->setTasPosx($arr[$keys[42]]); + $this->setTasDerivation($arr[$keys[42]]); } if (array_key_exists($keys[43], $arr)) { - $this->setTasPosy($arr[$keys[43]]); + $this->setTasPosx($arr[$keys[43]]); } if (array_key_exists($keys[44], $arr)) { - $this->setTasWidth($arr[$keys[44]]); + $this->setTasPosy($arr[$keys[44]]); } if (array_key_exists($keys[45], $arr)) { - $this->setTasHeight($arr[$keys[45]]); + $this->setTasWidth($arr[$keys[45]]); } if (array_key_exists($keys[46], $arr)) { - $this->setTasColor($arr[$keys[46]]); + $this->setTasHeight($arr[$keys[46]]); } if (array_key_exists($keys[47], $arr)) { - $this->setTasEvnUid($arr[$keys[47]]); + $this->setTasColor($arr[$keys[47]]); } if (array_key_exists($keys[48], $arr)) { - $this->setTasBoundary($arr[$keys[48]]); + $this->setTasEvnUid($arr[$keys[48]]); } if (array_key_exists($keys[49], $arr)) { - $this->setTasDerivationScreenTpl($arr[$keys[49]]); + $this->setTasBoundary($arr[$keys[49]]); } if (array_key_exists($keys[50], $arr)) { - $this->setTasSelfserviceTimeout($arr[$keys[50]]); + $this->setTasDerivationScreenTpl($arr[$keys[50]]); } if (array_key_exists($keys[51], $arr)) { - $this->setTasSelfserviceTime($arr[$keys[51]]); + $this->setTasSelfserviceTimeout($arr[$keys[51]]); } if (array_key_exists($keys[52], $arr)) { - $this->setTasSelfserviceTimeUnit($arr[$keys[52]]); + $this->setTasSelfserviceTime($arr[$keys[52]]); } if (array_key_exists($keys[53], $arr)) { - $this->setTasSelfserviceTriggerUid($arr[$keys[53]]); + $this->setTasSelfserviceTimeUnit($arr[$keys[53]]); } if (array_key_exists($keys[54], $arr)) { - $this->setTasSelfserviceExecution($arr[$keys[54]]); + $this->setTasSelfserviceTriggerUid($arr[$keys[54]]); } if (array_key_exists($keys[55], $arr)) { - $this->setTasNotEmailFromFormat($arr[$keys[55]]); + $this->setTasSelfserviceExecution($arr[$keys[55]]); } if (array_key_exists($keys[56], $arr)) { - $this->setTasOffline($arr[$keys[56]]); + $this->setTasNotEmailFromFormat($arr[$keys[56]]); } if (array_key_exists($keys[57], $arr)) { - $this->setTasEmailServerUid($arr[$keys[57]]); + $this->setTasOffline($arr[$keys[57]]); } if (array_key_exists($keys[58], $arr)) { - $this->setTasAutoRoot($arr[$keys[58]]); + $this->setTasEmailServerUid($arr[$keys[58]]); } if (array_key_exists($keys[59], $arr)) { - $this->setTasReceiveServerUid($arr[$keys[59]]); + $this->setTasAutoRoot($arr[$keys[59]]); } if (array_key_exists($keys[60], $arr)) { - $this->setTasReceiveLastEmail($arr[$keys[60]]); + $this->setTasReceiveServerUid($arr[$keys[60]]); } if (array_key_exists($keys[61], $arr)) { - $this->setTasReceiveEmailFromFormat($arr[$keys[61]]); + $this->setTasReceiveLastEmail($arr[$keys[61]]); } if (array_key_exists($keys[62], $arr)) { - $this->setTasReceiveMessageType($arr[$keys[62]]); + $this->setTasReceiveEmailFromFormat($arr[$keys[62]]); } if (array_key_exists($keys[63], $arr)) { - $this->setTasReceiveMessageTemplate($arr[$keys[63]]); + $this->setTasReceiveMessageType($arr[$keys[63]]); } if (array_key_exists($keys[64], $arr)) { - $this->setTasReceiveSubjectMessage($arr[$keys[64]]); + $this->setTasReceiveMessageTemplate($arr[$keys[64]]); } if (array_key_exists($keys[65], $arr)) { - $this->setTasReceiveMessage($arr[$keys[65]]); + $this->setTasReceiveSubjectMessage($arr[$keys[65]]); + } + + if (array_key_exists($keys[66], $arr)) { + $this->setTasReceiveMessage($arr[$keys[66]]); } } @@ -3776,6 +3828,10 @@ abstract class BaseTask extends BaseObject implements Persistent $criteria->add(TaskPeer::PRO_UID, $this->pro_uid); } + if ($this->isColumnModified(TaskPeer::PRO_ID)) { + $criteria->add(TaskPeer::PRO_ID, $this->pro_id); + } + if ($this->isColumnModified(TaskPeer::TAS_UID)) { $criteria->add(TaskPeer::TAS_UID, $this->tas_uid); } @@ -4092,6 +4148,8 @@ abstract class BaseTask extends BaseObject implements Persistent $copyObj->setProUid($this->pro_uid); + $copyObj->setProId($this->pro_id); + $copyObj->setTasId($this->tas_id); $copyObj->setTasTitle($this->tas_title); diff --git a/workflow/engine/classes/model/om/BaseTaskPeer.php b/workflow/engine/classes/model/om/BaseTaskPeer.php index acbce437c..fe5621f4f 100644 --- a/workflow/engine/classes/model/om/BaseTaskPeer.php +++ b/workflow/engine/classes/model/om/BaseTaskPeer.php @@ -25,7 +25,7 @@ abstract class BaseTaskPeer const CLASS_DEFAULT = 'classes.model.Task'; /** The total number of columns. */ - const NUM_COLUMNS = 66; + const NUM_COLUMNS = 67; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,9 @@ abstract class BaseTaskPeer /** the column name for the PRO_UID field */ const PRO_UID = 'TASK.PRO_UID'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'TASK.PRO_ID'; + /** the column name for the TAS_UID field */ const TAS_UID = 'TASK.TAS_UID'; @@ -240,10 +243,10 @@ abstract class BaseTaskPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasId', 'TasTitle', 'TasDescription', 'TasDefTitle', 'TasDefSubjectMessage', 'TasDefProcCode', 'TasDefMessage', 'TasDefDescription', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', 'TasNotEmailFromFormat', 'TasOffline', 'TasEmailServerUid', 'TasAutoRoot', 'TasReceiveServerUid', 'TasReceiveLastEmail', 'TasReceiveEmailFromFormat', 'TasReceiveMessageType', 'TasReceiveMessageTemplate', 'TasReceiveSubjectMessage', 'TasReceiveMessage', ), - BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_ID, TaskPeer::TAS_TITLE, TaskPeer::TAS_DESCRIPTION, TaskPeer::TAS_DEF_TITLE, TaskPeer::TAS_DEF_SUBJECT_MESSAGE, TaskPeer::TAS_DEF_PROC_CODE, TaskPeer::TAS_DEF_MESSAGE, TaskPeer::TAS_DEF_DESCRIPTION, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, TaskPeer::TAS_NOT_EMAIL_FROM_FORMAT, TaskPeer::TAS_OFFLINE, TaskPeer::TAS_EMAIL_SERVER_UID, TaskPeer::TAS_AUTO_ROOT, TaskPeer::TAS_RECEIVE_SERVER_UID, TaskPeer::TAS_RECEIVE_LAST_EMAIL, TaskPeer::TAS_RECEIVE_EMAIL_FROM_FORMAT, TaskPeer::TAS_RECEIVE_MESSAGE_TYPE, TaskPeer::TAS_RECEIVE_MESSAGE_TEMPLATE, TaskPeer::TAS_RECEIVE_SUBJECT_MESSAGE, TaskPeer::TAS_RECEIVE_MESSAGE, ), - BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_ID', 'TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', 'TAS_NOT_EMAIL_FROM_FORMAT', 'TAS_OFFLINE', 'TAS_EMAIL_SERVER_UID', 'TAS_AUTO_ROOT', 'TAS_RECEIVE_SERVER_UID', 'TAS_RECEIVE_LAST_EMAIL', 'TAS_RECEIVE_EMAIL_FROM_FORMAT', 'TAS_RECEIVE_MESSAGE_TYPE', 'TAS_RECEIVE_MESSAGE_TEMPLATE', 'TAS_RECEIVE_SUBJECT_MESSAGE', 'TAS_RECEIVE_MESSAGE', ), - 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, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ) + BasePeer::TYPE_PHPNAME => array ('ProUid', 'ProId', 'TasUid', 'TasId', 'TasTitle', 'TasDescription', 'TasDefTitle', 'TasDefSubjectMessage', 'TasDefProcCode', 'TasDefMessage', 'TasDefDescription', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', 'TasSelfserviceTimeout', 'TasSelfserviceTime', 'TasSelfserviceTimeUnit', 'TasSelfserviceTriggerUid', 'TasSelfserviceExecution', 'TasNotEmailFromFormat', 'TasOffline', 'TasEmailServerUid', 'TasAutoRoot', 'TasReceiveServerUid', 'TasReceiveLastEmail', 'TasReceiveEmailFromFormat', 'TasReceiveMessageType', 'TasReceiveMessageTemplate', 'TasReceiveSubjectMessage', 'TasReceiveMessage', ), + BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::PRO_ID, TaskPeer::TAS_UID, TaskPeer::TAS_ID, TaskPeer::TAS_TITLE, TaskPeer::TAS_DESCRIPTION, TaskPeer::TAS_DEF_TITLE, TaskPeer::TAS_DEF_SUBJECT_MESSAGE, TaskPeer::TAS_DEF_PROC_CODE, TaskPeer::TAS_DEF_MESSAGE, TaskPeer::TAS_DEF_DESCRIPTION, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, TaskPeer::TAS_SELFSERVICE_TIMEOUT, TaskPeer::TAS_SELFSERVICE_TIME, TaskPeer::TAS_SELFSERVICE_TIME_UNIT, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID, TaskPeer::TAS_SELFSERVICE_EXECUTION, TaskPeer::TAS_NOT_EMAIL_FROM_FORMAT, TaskPeer::TAS_OFFLINE, TaskPeer::TAS_EMAIL_SERVER_UID, TaskPeer::TAS_AUTO_ROOT, TaskPeer::TAS_RECEIVE_SERVER_UID, TaskPeer::TAS_RECEIVE_LAST_EMAIL, TaskPeer::TAS_RECEIVE_EMAIL_FROM_FORMAT, TaskPeer::TAS_RECEIVE_MESSAGE_TYPE, TaskPeer::TAS_RECEIVE_MESSAGE_TEMPLATE, TaskPeer::TAS_RECEIVE_SUBJECT_MESSAGE, TaskPeer::TAS_RECEIVE_MESSAGE, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'PRO_ID', 'TAS_UID', 'TAS_ID', 'TAS_TITLE', 'TAS_DESCRIPTION', 'TAS_DEF_TITLE', 'TAS_DEF_SUBJECT_MESSAGE', 'TAS_DEF_PROC_CODE', 'TAS_DEF_MESSAGE', 'TAS_DEF_DESCRIPTION', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', 'TAS_SELFSERVICE_TIMEOUT', 'TAS_SELFSERVICE_TIME', 'TAS_SELFSERVICE_TIME_UNIT', 'TAS_SELFSERVICE_TRIGGER_UID', 'TAS_SELFSERVICE_EXECUTION', 'TAS_NOT_EMAIL_FROM_FORMAT', 'TAS_OFFLINE', 'TAS_EMAIL_SERVER_UID', 'TAS_AUTO_ROOT', 'TAS_RECEIVE_SERVER_UID', 'TAS_RECEIVE_LAST_EMAIL', 'TAS_RECEIVE_EMAIL_FROM_FORMAT', 'TAS_RECEIVE_MESSAGE_TYPE', 'TAS_RECEIVE_MESSAGE_TEMPLATE', 'TAS_RECEIVE_SUBJECT_MESSAGE', 'TAS_RECEIVE_MESSAGE', ), + 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, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ) ); /** @@ -253,10 +256,10 @@ abstract class BaseTaskPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasId' => 2, 'TasTitle' => 3, 'TasDescription' => 4, 'TasDefTitle' => 5, 'TasDefSubjectMessage' => 6, 'TasDefProcCode' => 7, 'TasDefMessage' => 8, 'TasDefDescription' => 9, 'TasType' => 10, 'TasDuration' => 11, 'TasDelayType' => 12, 'TasTemporizer' => 13, 'TasTypeDay' => 14, 'TasTimeunit' => 15, 'TasAlert' => 16, 'TasPriorityVariable' => 17, 'TasAssignType' => 18, 'TasAssignVariable' => 19, 'TasGroupVariable' => 20, 'TasMiInstanceVariable' => 21, 'TasMiCompleteVariable' => 22, 'TasAssignLocation' => 23, 'TasAssignLocationAdhoc' => 24, 'TasTransferFly' => 25, 'TasLastAssigned' => 26, 'TasUser' => 27, 'TasCanUpload' => 28, 'TasViewUpload' => 29, 'TasViewAdditionalDocumentation' => 30, 'TasCanCancel' => 31, 'TasOwnerApp' => 32, 'StgUid' => 33, 'TasCanPause' => 34, 'TasCanSendMessage' => 35, 'TasCanDeleteDocs' => 36, 'TasSelfService' => 37, 'TasStart' => 38, 'TasToLastUser' => 39, 'TasSendLastEmail' => 40, 'TasDerivation' => 41, 'TasPosx' => 42, 'TasPosy' => 43, 'TasWidth' => 44, 'TasHeight' => 45, 'TasColor' => 46, 'TasEvnUid' => 47, 'TasBoundary' => 48, 'TasDerivationScreenTpl' => 49, 'TasSelfserviceTimeout' => 50, 'TasSelfserviceTime' => 51, 'TasSelfserviceTimeUnit' => 52, 'TasSelfserviceTriggerUid' => 53, 'TasSelfserviceExecution' => 54, 'TasNotEmailFromFormat' => 55, 'TasOffline' => 56, 'TasEmailServerUid' => 57, 'TasAutoRoot' => 58, 'TasReceiveServerUid' => 59, 'TasReceiveLastEmail' => 60, 'TasReceiveEmailFromFormat' => 61, 'TasReceiveMessageType' => 62, 'TasReceiveMessageTemplate' => 63, 'TasReceiveSubjectMessage' => 64, 'TasReceiveMessage' => 65, ), - BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_ID => 2, TaskPeer::TAS_TITLE => 3, TaskPeer::TAS_DESCRIPTION => 4, TaskPeer::TAS_DEF_TITLE => 5, TaskPeer::TAS_DEF_SUBJECT_MESSAGE => 6, TaskPeer::TAS_DEF_PROC_CODE => 7, TaskPeer::TAS_DEF_MESSAGE => 8, TaskPeer::TAS_DEF_DESCRIPTION => 9, TaskPeer::TAS_TYPE => 10, TaskPeer::TAS_DURATION => 11, TaskPeer::TAS_DELAY_TYPE => 12, TaskPeer::TAS_TEMPORIZER => 13, TaskPeer::TAS_TYPE_DAY => 14, TaskPeer::TAS_TIMEUNIT => 15, TaskPeer::TAS_ALERT => 16, TaskPeer::TAS_PRIORITY_VARIABLE => 17, TaskPeer::TAS_ASSIGN_TYPE => 18, TaskPeer::TAS_ASSIGN_VARIABLE => 19, TaskPeer::TAS_GROUP_VARIABLE => 20, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 21, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 22, TaskPeer::TAS_ASSIGN_LOCATION => 23, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 24, TaskPeer::TAS_TRANSFER_FLY => 25, TaskPeer::TAS_LAST_ASSIGNED => 26, TaskPeer::TAS_USER => 27, TaskPeer::TAS_CAN_UPLOAD => 28, TaskPeer::TAS_VIEW_UPLOAD => 29, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 30, TaskPeer::TAS_CAN_CANCEL => 31, TaskPeer::TAS_OWNER_APP => 32, TaskPeer::STG_UID => 33, TaskPeer::TAS_CAN_PAUSE => 34, TaskPeer::TAS_CAN_SEND_MESSAGE => 35, TaskPeer::TAS_CAN_DELETE_DOCS => 36, TaskPeer::TAS_SELF_SERVICE => 37, TaskPeer::TAS_START => 38, TaskPeer::TAS_TO_LAST_USER => 39, TaskPeer::TAS_SEND_LAST_EMAIL => 40, TaskPeer::TAS_DERIVATION => 41, TaskPeer::TAS_POSX => 42, TaskPeer::TAS_POSY => 43, TaskPeer::TAS_WIDTH => 44, TaskPeer::TAS_HEIGHT => 45, TaskPeer::TAS_COLOR => 46, TaskPeer::TAS_EVN_UID => 47, TaskPeer::TAS_BOUNDARY => 48, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 49, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 50, TaskPeer::TAS_SELFSERVICE_TIME => 51, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 52, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 53, TaskPeer::TAS_SELFSERVICE_EXECUTION => 54, TaskPeer::TAS_NOT_EMAIL_FROM_FORMAT => 55, TaskPeer::TAS_OFFLINE => 56, TaskPeer::TAS_EMAIL_SERVER_UID => 57, TaskPeer::TAS_AUTO_ROOT => 58, TaskPeer::TAS_RECEIVE_SERVER_UID => 59, TaskPeer::TAS_RECEIVE_LAST_EMAIL => 60, TaskPeer::TAS_RECEIVE_EMAIL_FROM_FORMAT => 61, TaskPeer::TAS_RECEIVE_MESSAGE_TYPE => 62, TaskPeer::TAS_RECEIVE_MESSAGE_TEMPLATE => 63, TaskPeer::TAS_RECEIVE_SUBJECT_MESSAGE => 64, TaskPeer::TAS_RECEIVE_MESSAGE => 65, ), - BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_ID' => 2, 'TAS_TITLE' => 3, 'TAS_DESCRIPTION' => 4, 'TAS_DEF_TITLE' => 5, 'TAS_DEF_SUBJECT_MESSAGE' => 6, 'TAS_DEF_PROC_CODE' => 7, 'TAS_DEF_MESSAGE' => 8, 'TAS_DEF_DESCRIPTION' => 9, 'TAS_TYPE' => 10, 'TAS_DURATION' => 11, 'TAS_DELAY_TYPE' => 12, 'TAS_TEMPORIZER' => 13, 'TAS_TYPE_DAY' => 14, 'TAS_TIMEUNIT' => 15, 'TAS_ALERT' => 16, 'TAS_PRIORITY_VARIABLE' => 17, 'TAS_ASSIGN_TYPE' => 18, 'TAS_ASSIGN_VARIABLE' => 19, 'TAS_GROUP_VARIABLE' => 20, 'TAS_MI_INSTANCE_VARIABLE' => 21, 'TAS_MI_COMPLETE_VARIABLE' => 22, 'TAS_ASSIGN_LOCATION' => 23, 'TAS_ASSIGN_LOCATION_ADHOC' => 24, 'TAS_TRANSFER_FLY' => 25, 'TAS_LAST_ASSIGNED' => 26, 'TAS_USER' => 27, 'TAS_CAN_UPLOAD' => 28, 'TAS_VIEW_UPLOAD' => 29, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 30, 'TAS_CAN_CANCEL' => 31, 'TAS_OWNER_APP' => 32, 'STG_UID' => 33, 'TAS_CAN_PAUSE' => 34, 'TAS_CAN_SEND_MESSAGE' => 35, 'TAS_CAN_DELETE_DOCS' => 36, 'TAS_SELF_SERVICE' => 37, 'TAS_START' => 38, 'TAS_TO_LAST_USER' => 39, 'TAS_SEND_LAST_EMAIL' => 40, 'TAS_DERIVATION' => 41, 'TAS_POSX' => 42, 'TAS_POSY' => 43, 'TAS_WIDTH' => 44, 'TAS_HEIGHT' => 45, 'TAS_COLOR' => 46, 'TAS_EVN_UID' => 47, 'TAS_BOUNDARY' => 48, 'TAS_DERIVATION_SCREEN_TPL' => 49, 'TAS_SELFSERVICE_TIMEOUT' => 50, 'TAS_SELFSERVICE_TIME' => 51, 'TAS_SELFSERVICE_TIME_UNIT' => 52, 'TAS_SELFSERVICE_TRIGGER_UID' => 53, 'TAS_SELFSERVICE_EXECUTION' => 54, 'TAS_NOT_EMAIL_FROM_FORMAT' => 55, 'TAS_OFFLINE' => 56, 'TAS_EMAIL_SERVER_UID' => 57, 'TAS_AUTO_ROOT' => 58, 'TAS_RECEIVE_SERVER_UID' => 59, 'TAS_RECEIVE_LAST_EMAIL' => 60, 'TAS_RECEIVE_EMAIL_FROM_FORMAT' => 61, 'TAS_RECEIVE_MESSAGE_TYPE' => 62, 'TAS_RECEIVE_MESSAGE_TEMPLATE' => 63, 'TAS_RECEIVE_SUBJECT_MESSAGE' => 64, 'TAS_RECEIVE_MESSAGE' => 65, ), - 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, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, ) + BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'ProId' => 1, 'TasUid' => 2, 'TasId' => 3, 'TasTitle' => 4, 'TasDescription' => 5, 'TasDefTitle' => 6, 'TasDefSubjectMessage' => 7, 'TasDefProcCode' => 8, 'TasDefMessage' => 9, 'TasDefDescription' => 10, 'TasType' => 11, 'TasDuration' => 12, 'TasDelayType' => 13, 'TasTemporizer' => 14, 'TasTypeDay' => 15, 'TasTimeunit' => 16, 'TasAlert' => 17, 'TasPriorityVariable' => 18, 'TasAssignType' => 19, 'TasAssignVariable' => 20, 'TasGroupVariable' => 21, 'TasMiInstanceVariable' => 22, 'TasMiCompleteVariable' => 23, 'TasAssignLocation' => 24, 'TasAssignLocationAdhoc' => 25, 'TasTransferFly' => 26, 'TasLastAssigned' => 27, 'TasUser' => 28, 'TasCanUpload' => 29, 'TasViewUpload' => 30, 'TasViewAdditionalDocumentation' => 31, 'TasCanCancel' => 32, 'TasOwnerApp' => 33, 'StgUid' => 34, 'TasCanPause' => 35, 'TasCanSendMessage' => 36, 'TasCanDeleteDocs' => 37, 'TasSelfService' => 38, 'TasStart' => 39, 'TasToLastUser' => 40, 'TasSendLastEmail' => 41, 'TasDerivation' => 42, 'TasPosx' => 43, 'TasPosy' => 44, 'TasWidth' => 45, 'TasHeight' => 46, 'TasColor' => 47, 'TasEvnUid' => 48, 'TasBoundary' => 49, 'TasDerivationScreenTpl' => 50, 'TasSelfserviceTimeout' => 51, 'TasSelfserviceTime' => 52, 'TasSelfserviceTimeUnit' => 53, 'TasSelfserviceTriggerUid' => 54, 'TasSelfserviceExecution' => 55, 'TasNotEmailFromFormat' => 56, 'TasOffline' => 57, 'TasEmailServerUid' => 58, 'TasAutoRoot' => 59, 'TasReceiveServerUid' => 60, 'TasReceiveLastEmail' => 61, 'TasReceiveEmailFromFormat' => 62, 'TasReceiveMessageType' => 63, 'TasReceiveMessageTemplate' => 64, 'TasReceiveSubjectMessage' => 65, 'TasReceiveMessage' => 66, ), + BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::PRO_ID => 1, TaskPeer::TAS_UID => 2, TaskPeer::TAS_ID => 3, TaskPeer::TAS_TITLE => 4, TaskPeer::TAS_DESCRIPTION => 5, TaskPeer::TAS_DEF_TITLE => 6, TaskPeer::TAS_DEF_SUBJECT_MESSAGE => 7, TaskPeer::TAS_DEF_PROC_CODE => 8, TaskPeer::TAS_DEF_MESSAGE => 9, TaskPeer::TAS_DEF_DESCRIPTION => 10, TaskPeer::TAS_TYPE => 11, TaskPeer::TAS_DURATION => 12, TaskPeer::TAS_DELAY_TYPE => 13, TaskPeer::TAS_TEMPORIZER => 14, TaskPeer::TAS_TYPE_DAY => 15, TaskPeer::TAS_TIMEUNIT => 16, TaskPeer::TAS_ALERT => 17, TaskPeer::TAS_PRIORITY_VARIABLE => 18, TaskPeer::TAS_ASSIGN_TYPE => 19, TaskPeer::TAS_ASSIGN_VARIABLE => 20, TaskPeer::TAS_GROUP_VARIABLE => 21, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 22, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 23, TaskPeer::TAS_ASSIGN_LOCATION => 24, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 25, TaskPeer::TAS_TRANSFER_FLY => 26, TaskPeer::TAS_LAST_ASSIGNED => 27, TaskPeer::TAS_USER => 28, TaskPeer::TAS_CAN_UPLOAD => 29, TaskPeer::TAS_VIEW_UPLOAD => 30, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 31, TaskPeer::TAS_CAN_CANCEL => 32, TaskPeer::TAS_OWNER_APP => 33, TaskPeer::STG_UID => 34, TaskPeer::TAS_CAN_PAUSE => 35, TaskPeer::TAS_CAN_SEND_MESSAGE => 36, TaskPeer::TAS_CAN_DELETE_DOCS => 37, TaskPeer::TAS_SELF_SERVICE => 38, TaskPeer::TAS_START => 39, TaskPeer::TAS_TO_LAST_USER => 40, TaskPeer::TAS_SEND_LAST_EMAIL => 41, TaskPeer::TAS_DERIVATION => 42, TaskPeer::TAS_POSX => 43, TaskPeer::TAS_POSY => 44, TaskPeer::TAS_WIDTH => 45, TaskPeer::TAS_HEIGHT => 46, TaskPeer::TAS_COLOR => 47, TaskPeer::TAS_EVN_UID => 48, TaskPeer::TAS_BOUNDARY => 49, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 50, TaskPeer::TAS_SELFSERVICE_TIMEOUT => 51, TaskPeer::TAS_SELFSERVICE_TIME => 52, TaskPeer::TAS_SELFSERVICE_TIME_UNIT => 53, TaskPeer::TAS_SELFSERVICE_TRIGGER_UID => 54, TaskPeer::TAS_SELFSERVICE_EXECUTION => 55, TaskPeer::TAS_NOT_EMAIL_FROM_FORMAT => 56, TaskPeer::TAS_OFFLINE => 57, TaskPeer::TAS_EMAIL_SERVER_UID => 58, TaskPeer::TAS_AUTO_ROOT => 59, TaskPeer::TAS_RECEIVE_SERVER_UID => 60, TaskPeer::TAS_RECEIVE_LAST_EMAIL => 61, TaskPeer::TAS_RECEIVE_EMAIL_FROM_FORMAT => 62, TaskPeer::TAS_RECEIVE_MESSAGE_TYPE => 63, TaskPeer::TAS_RECEIVE_MESSAGE_TEMPLATE => 64, TaskPeer::TAS_RECEIVE_SUBJECT_MESSAGE => 65, TaskPeer::TAS_RECEIVE_MESSAGE => 66, ), + BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'PRO_ID' => 1, 'TAS_UID' => 2, 'TAS_ID' => 3, 'TAS_TITLE' => 4, 'TAS_DESCRIPTION' => 5, 'TAS_DEF_TITLE' => 6, 'TAS_DEF_SUBJECT_MESSAGE' => 7, 'TAS_DEF_PROC_CODE' => 8, 'TAS_DEF_MESSAGE' => 9, 'TAS_DEF_DESCRIPTION' => 10, 'TAS_TYPE' => 11, 'TAS_DURATION' => 12, 'TAS_DELAY_TYPE' => 13, 'TAS_TEMPORIZER' => 14, 'TAS_TYPE_DAY' => 15, 'TAS_TIMEUNIT' => 16, 'TAS_ALERT' => 17, 'TAS_PRIORITY_VARIABLE' => 18, 'TAS_ASSIGN_TYPE' => 19, 'TAS_ASSIGN_VARIABLE' => 20, 'TAS_GROUP_VARIABLE' => 21, 'TAS_MI_INSTANCE_VARIABLE' => 22, 'TAS_MI_COMPLETE_VARIABLE' => 23, 'TAS_ASSIGN_LOCATION' => 24, 'TAS_ASSIGN_LOCATION_ADHOC' => 25, 'TAS_TRANSFER_FLY' => 26, 'TAS_LAST_ASSIGNED' => 27, 'TAS_USER' => 28, 'TAS_CAN_UPLOAD' => 29, 'TAS_VIEW_UPLOAD' => 30, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 31, 'TAS_CAN_CANCEL' => 32, 'TAS_OWNER_APP' => 33, 'STG_UID' => 34, 'TAS_CAN_PAUSE' => 35, 'TAS_CAN_SEND_MESSAGE' => 36, 'TAS_CAN_DELETE_DOCS' => 37, 'TAS_SELF_SERVICE' => 38, 'TAS_START' => 39, 'TAS_TO_LAST_USER' => 40, 'TAS_SEND_LAST_EMAIL' => 41, 'TAS_DERIVATION' => 42, 'TAS_POSX' => 43, 'TAS_POSY' => 44, 'TAS_WIDTH' => 45, 'TAS_HEIGHT' => 46, 'TAS_COLOR' => 47, 'TAS_EVN_UID' => 48, 'TAS_BOUNDARY' => 49, 'TAS_DERIVATION_SCREEN_TPL' => 50, 'TAS_SELFSERVICE_TIMEOUT' => 51, 'TAS_SELFSERVICE_TIME' => 52, 'TAS_SELFSERVICE_TIME_UNIT' => 53, 'TAS_SELFSERVICE_TRIGGER_UID' => 54, 'TAS_SELFSERVICE_EXECUTION' => 55, 'TAS_NOT_EMAIL_FROM_FORMAT' => 56, 'TAS_OFFLINE' => 57, 'TAS_EMAIL_SERVER_UID' => 58, 'TAS_AUTO_ROOT' => 59, 'TAS_RECEIVE_SERVER_UID' => 60, 'TAS_RECEIVE_LAST_EMAIL' => 61, 'TAS_RECEIVE_EMAIL_FROM_FORMAT' => 62, 'TAS_RECEIVE_MESSAGE_TYPE' => 63, 'TAS_RECEIVE_MESSAGE_TEMPLATE' => 64, 'TAS_RECEIVE_SUBJECT_MESSAGE' => 65, 'TAS_RECEIVE_MESSAGE' => 66, ), + 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, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, ) ); /** @@ -359,6 +362,8 @@ abstract class BaseTaskPeer $criteria->addSelectColumn(TaskPeer::PRO_UID); + $criteria->addSelectColumn(TaskPeer::PRO_ID); + $criteria->addSelectColumn(TaskPeer::TAS_UID); $criteria->addSelectColumn(TaskPeer::TAS_ID); diff --git a/workflow/engine/classes/model/om/BaseTaskUser.php b/workflow/engine/classes/model/om/BaseTaskUser.php index 89e7f375c..c12a96e2a 100644 --- a/workflow/engine/classes/model/om/BaseTaskUser.php +++ b/workflow/engine/classes/model/om/BaseTaskUser.php @@ -33,6 +33,12 @@ abstract class BaseTaskUser extends BaseObject implements Persistent */ protected $tas_uid = ''; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * The value for the usr_uid field. * @var string @@ -51,6 +57,12 @@ abstract class BaseTaskUser extends BaseObject implements Persistent */ protected $tu_relation = 0; + /** + * The value for the assigned_id field. + * @var int + */ + protected $assigned_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -76,6 +88,17 @@ abstract class BaseTaskUser extends BaseObject implements Persistent return $this->tas_uid; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Get the [usr_uid] column value. * @@ -109,6 +132,17 @@ abstract class BaseTaskUser extends BaseObject implements Persistent return $this->tu_relation; } + /** + * Get the [assigned_id] column value. + * + * @return int + */ + public function getAssignedId() + { + + return $this->assigned_id; + } + /** * Set the value of [tas_uid] column. * @@ -131,6 +165,28 @@ abstract class BaseTaskUser extends BaseObject implements Persistent } // setTasUid() + /** + * Set the value of [tas_id] column. + * + * @param int $v new value + * @return void + */ + public function setTasId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->tas_id !== $v || $v === 0) { + $this->tas_id = $v; + $this->modifiedColumns[] = TaskUserPeer::TAS_ID; + } + + } // setTasId() + /** * Set the value of [usr_uid] column. * @@ -197,6 +253,28 @@ abstract class BaseTaskUser extends BaseObject implements Persistent } // setTuRelation() + /** + * Set the value of [assigned_id] column. + * + * @param int $v new value + * @return void + */ + public function setAssignedId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->assigned_id !== $v || $v === 0) { + $this->assigned_id = $v; + $this->modifiedColumns[] = TaskUserPeer::ASSIGNED_ID; + } + + } // setAssignedId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -216,18 +294,22 @@ abstract class BaseTaskUser extends BaseObject implements Persistent $this->tas_uid = $rs->getString($startcol + 0); - $this->usr_uid = $rs->getString($startcol + 1); + $this->tas_id = $rs->getInt($startcol + 1); - $this->tu_type = $rs->getInt($startcol + 2); + $this->usr_uid = $rs->getString($startcol + 2); - $this->tu_relation = $rs->getInt($startcol + 3); + $this->tu_type = $rs->getInt($startcol + 3); + + $this->tu_relation = $rs->getInt($startcol + 4); + + $this->assigned_id = $rs->getInt($startcol + 5); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 4; // 4 = TaskUserPeer::NUM_COLUMNS - TaskUserPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 6; // 6 = TaskUserPeer::NUM_COLUMNS - TaskUserPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating TaskUser object", $e); @@ -435,14 +517,20 @@ abstract class BaseTaskUser extends BaseObject implements Persistent return $this->getTasUid(); break; case 1: - return $this->getUsrUid(); + return $this->getTasId(); break; case 2: - return $this->getTuType(); + return $this->getUsrUid(); break; case 3: + return $this->getTuType(); + break; + case 4: return $this->getTuRelation(); break; + case 5: + return $this->getAssignedId(); + break; default: return null; break; @@ -464,9 +552,11 @@ abstract class BaseTaskUser extends BaseObject implements Persistent $keys = TaskUserPeer::getFieldNames($keyType); $result = array( $keys[0] => $this->getTasUid(), - $keys[1] => $this->getUsrUid(), - $keys[2] => $this->getTuType(), - $keys[3] => $this->getTuRelation(), + $keys[1] => $this->getTasId(), + $keys[2] => $this->getUsrUid(), + $keys[3] => $this->getTuType(), + $keys[4] => $this->getTuRelation(), + $keys[5] => $this->getAssignedId(), ); return $result; } @@ -502,14 +592,20 @@ abstract class BaseTaskUser extends BaseObject implements Persistent $this->setTasUid($value); break; case 1: - $this->setUsrUid($value); + $this->setTasId($value); break; case 2: - $this->setTuType($value); + $this->setUsrUid($value); break; case 3: + $this->setTuType($value); + break; + case 4: $this->setTuRelation($value); break; + case 5: + $this->setAssignedId($value); + break; } // switch() } @@ -538,15 +634,23 @@ abstract class BaseTaskUser extends BaseObject implements Persistent } if (array_key_exists($keys[1], $arr)) { - $this->setUsrUid($arr[$keys[1]]); + $this->setTasId($arr[$keys[1]]); } if (array_key_exists($keys[2], $arr)) { - $this->setTuType($arr[$keys[2]]); + $this->setUsrUid($arr[$keys[2]]); } if (array_key_exists($keys[3], $arr)) { - $this->setTuRelation($arr[$keys[3]]); + $this->setTuType($arr[$keys[3]]); + } + + if (array_key_exists($keys[4], $arr)) { + $this->setTuRelation($arr[$keys[4]]); + } + + if (array_key_exists($keys[5], $arr)) { + $this->setAssignedId($arr[$keys[5]]); } } @@ -564,6 +668,10 @@ abstract class BaseTaskUser extends BaseObject implements Persistent $criteria->add(TaskUserPeer::TAS_UID, $this->tas_uid); } + if ($this->isColumnModified(TaskUserPeer::TAS_ID)) { + $criteria->add(TaskUserPeer::TAS_ID, $this->tas_id); + } + if ($this->isColumnModified(TaskUserPeer::USR_UID)) { $criteria->add(TaskUserPeer::USR_UID, $this->usr_uid); } @@ -576,6 +684,10 @@ abstract class BaseTaskUser extends BaseObject implements Persistent $criteria->add(TaskUserPeer::TU_RELATION, $this->tu_relation); } + if ($this->isColumnModified(TaskUserPeer::ASSIGNED_ID)) { + $criteria->add(TaskUserPeer::ASSIGNED_ID, $this->assigned_id); + } + return $criteria; } @@ -652,6 +764,10 @@ abstract class BaseTaskUser extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setTasId($this->tas_id); + + $copyObj->setAssignedId($this->assigned_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseTaskUserPeer.php b/workflow/engine/classes/model/om/BaseTaskUserPeer.php index 4bd8110ca..167f11d10 100644 --- a/workflow/engine/classes/model/om/BaseTaskUserPeer.php +++ b/workflow/engine/classes/model/om/BaseTaskUserPeer.php @@ -25,7 +25,7 @@ abstract class BaseTaskUserPeer const CLASS_DEFAULT = 'classes.model.TaskUser'; /** The total number of columns. */ - const NUM_COLUMNS = 4; + const NUM_COLUMNS = 6; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -34,6 +34,9 @@ abstract class BaseTaskUserPeer /** the column name for the TAS_UID field */ const TAS_UID = 'TASK_USER.TAS_UID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'TASK_USER.TAS_ID'; + /** the column name for the USR_UID field */ const USR_UID = 'TASK_USER.USR_UID'; @@ -43,6 +46,9 @@ abstract class BaseTaskUserPeer /** the column name for the TU_RELATION field */ const TU_RELATION = 'TASK_USER.TU_RELATION'; + /** the column name for the ASSIGNED_ID field */ + const ASSIGNED_ID = 'TASK_USER.ASSIGNED_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -54,10 +60,10 @@ abstract class BaseTaskUserPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('TasUid', 'UsrUid', 'TuType', 'TuRelation', ), - BasePeer::TYPE_COLNAME => array (TaskUserPeer::TAS_UID, TaskUserPeer::USR_UID, TaskUserPeer::TU_TYPE, TaskUserPeer::TU_RELATION, ), - BasePeer::TYPE_FIELDNAME => array ('TAS_UID', 'USR_UID', 'TU_TYPE', 'TU_RELATION', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('TasUid', 'TasId', 'UsrUid', 'TuType', 'TuRelation', 'AssignedId', ), + BasePeer::TYPE_COLNAME => array (TaskUserPeer::TAS_UID, TaskUserPeer::TAS_ID, TaskUserPeer::USR_UID, TaskUserPeer::TU_TYPE, TaskUserPeer::TU_RELATION, TaskUserPeer::ASSIGNED_ID, ), + BasePeer::TYPE_FIELDNAME => array ('TAS_UID', 'TAS_ID', 'USR_UID', 'TU_TYPE', 'TU_RELATION', 'ASSIGNED_ID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) ); /** @@ -67,10 +73,10 @@ abstract class BaseTaskUserPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('TasUid' => 0, 'UsrUid' => 1, 'TuType' => 2, 'TuRelation' => 3, ), - BasePeer::TYPE_COLNAME => array (TaskUserPeer::TAS_UID => 0, TaskUserPeer::USR_UID => 1, TaskUserPeer::TU_TYPE => 2, TaskUserPeer::TU_RELATION => 3, ), - BasePeer::TYPE_FIELDNAME => array ('TAS_UID' => 0, 'USR_UID' => 1, 'TU_TYPE' => 2, 'TU_RELATION' => 3, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('TasUid' => 0, 'TasId' => 1, 'UsrUid' => 2, 'TuType' => 3, 'TuRelation' => 4, 'AssignedId' => 5, ), + BasePeer::TYPE_COLNAME => array (TaskUserPeer::TAS_UID => 0, TaskUserPeer::TAS_ID => 1, TaskUserPeer::USR_UID => 2, TaskUserPeer::TU_TYPE => 3, TaskUserPeer::TU_RELATION => 4, TaskUserPeer::ASSIGNED_ID => 5, ), + BasePeer::TYPE_FIELDNAME => array ('TAS_UID' => 0, 'TAS_ID' => 1, 'USR_UID' => 2, 'TU_TYPE' => 3, 'TU_RELATION' => 4, 'ASSIGNED_ID' => 5, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) ); /** @@ -173,12 +179,16 @@ abstract class BaseTaskUserPeer $criteria->addSelectColumn(TaskUserPeer::TAS_UID); + $criteria->addSelectColumn(TaskUserPeer::TAS_ID); + $criteria->addSelectColumn(TaskUserPeer::USR_UID); $criteria->addSelectColumn(TaskUserPeer::TU_TYPE); $criteria->addSelectColumn(TaskUserPeer::TU_RELATION); + $criteria->addSelectColumn(TaskUserPeer::ASSIGNED_ID); + } const COUNT = 'COUNT(TASK_USER.TAS_UID)'; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 64fc4382f..a71a5e6cb 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -621,6 +621,7 @@ + @@ -655,6 +656,7 @@ + @@ -991,6 +993,7 @@ + @@ -1024,6 +1027,7 @@ + @@ -1376,6 +1380,7 @@ + @@ -1541,9 +1546,11 @@ + + @@ -3156,7 +3163,7 @@ - +
@@ -3178,6 +3185,7 @@ + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 9e16bc356..c648e4202 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -285,6 +285,7 @@ CREATE TABLE `GROUPWF` `GRP_ID` INTEGER NOT NULL AUTO_INCREMENT, `GRP_TITLE` MEDIUMTEXT NOT NULL, `GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL, + `GRP_STATUS_ID` INTEGER default 0, `GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL, `GRP_UX` VARCHAR(128) default 'NORMAL', PRIMARY KEY (`GRP_UID`), @@ -302,6 +303,7 @@ CREATE TABLE `GROUP_USER` `GRP_UID` VARCHAR(32) default '0' NOT NULL, `GRP_ID` INTEGER default 0, `USR_UID` VARCHAR(32) default '0' NOT NULL, + `USR_ID` INTEGER default 0, PRIMARY KEY (`GRP_UID`,`USR_UID`), KEY `indexForUsrUid`(`USR_UID`), KEY `INDEX_GRP_ID`(`GRP_ID`) @@ -479,6 +481,7 @@ CREATE TABLE `PROCESS` `PRO_TIME` DOUBLE default 1 NOT NULL, `PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL, `PRO_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL, + `PRO_STATUS_ID` INTEGER default 0, `PRO_TYPE_DAY` CHAR(1) default '0' NOT NULL, `PRO_TYPE` VARCHAR(256) default 'NORMAL' NOT NULL, `PRO_ASSIGNMENT` VARCHAR(20) default 'FALSE' NOT NULL, @@ -512,6 +515,7 @@ CREATE TABLE `PROCESS` `PRO_UNIT_COST` VARCHAR(50) default '', `PRO_ITEE` INTEGER default 0 NOT NULL, `PRO_ACTION_DONE` MEDIUMTEXT, + `CATEGORY_ID` INTEGER default 0, PRIMARY KEY (`PRO_UID`), UNIQUE KEY `INDEX_PRO_ID` (`PRO_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information'; @@ -659,6 +663,7 @@ DROP TABLE IF EXISTS `TASK`; CREATE TABLE `TASK` ( `PRO_UID` VARCHAR(32) default '' NOT NULL, + `PRO_ID` INTEGER default 0, `TAS_UID` VARCHAR(32) default '' NOT NULL, `TAS_ID` INTEGER NOT NULL AUTO_INCREMENT, `TAS_TITLE` MEDIUMTEXT NOT NULL, @@ -738,9 +743,11 @@ DROP TABLE IF EXISTS `TASK_USER`; CREATE TABLE `TASK_USER` ( `TAS_UID` VARCHAR(32) default '' NOT NULL, + `TAS_ID` INTEGER default 0, `USR_UID` VARCHAR(32) default '' NOT NULL, `TU_TYPE` INTEGER default 1 NOT NULL, `TU_RELATION` INTEGER default 0 NOT NULL, + `ASSIGNED_ID` INTEGER default 0, PRIMARY KEY (`TAS_UID`,`USR_UID`,`TU_TYPE`,`TU_RELATION`) )ENGINE=InnoDB DEFAULT CHARSET='utf8'; #----------------------------------------------------------------------------- @@ -1541,6 +1548,7 @@ DROP TABLE IF EXISTS `PROCESS_CATEGORY`; CREATE TABLE `PROCESS_CATEGORY` ( `CATEGORY_UID` VARCHAR(32) default '' NOT NULL, + `CATEGORY_ID` INTEGER NOT NULL AUTO_INCREMENT, `CATEGORY_PARENT` VARCHAR(32) default '0' NOT NULL, `CATEGORY_NAME` VARCHAR(100) default '' NOT NULL, `CATEGORY_ICON` VARCHAR(100) default '', diff --git a/workflow/engine/src/ProcessMaker/Model/TaskUser.php b/workflow/engine/src/ProcessMaker/Model/TaskUser.php index b56897ff7..841b55a2f 100644 --- a/workflow/engine/src/ProcessMaker/Model/TaskUser.php +++ b/workflow/engine/src/ProcessMaker/Model/TaskUser.php @@ -39,7 +39,7 @@ class TaskUser extends Model $groups = GroupUser::getGroups($usrUid, 'GRP_UID'); // Build query - $query = Task::query()->select('TAS_ID'); + $query = Task::query()->select('TASK.TAS_ID'); //Add Join with process filtering only the active process $query->join('PROCESS', function ($join) { $join->on('PROCESS.PRO_UID', '=', 'TASK.PRO_UID')