diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index 4b2ada9d7..d7064ced5 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -113,6 +113,10 @@ class ListCanceled extends BaseListCanceled { if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -148,6 +152,10 @@ class ListCanceled extends BaseListCanceled { if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 698d3fbc9..bd1fcb838 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -105,6 +105,10 @@ class ListCompleted extends BaseListCompleted if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -140,6 +144,10 @@ class ListCompleted extends BaseListCompleted if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 7f4c18e71..372167426 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -40,6 +40,10 @@ class ListInbox extends BaseListInbox if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { $result = $this->save(); @@ -162,6 +166,10 @@ class ListInbox extends BaseListInbox if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index 68947f79c..fbf8a2c7a 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -33,6 +33,10 @@ class ListMyInbox extends BaseListMyInbox if (!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -66,6 +70,10 @@ class ListMyInbox extends BaseListMyInbox if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index d158ea00b..4bcbf42d5 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -33,6 +33,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -68,6 +72,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 945f43fce..fa01937e8 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -78,6 +78,10 @@ class ListParticipatedLast extends BaseListParticipatedLast if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -114,6 +118,10 @@ class ListParticipatedLast extends BaseListParticipatedLast if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index a04e07b08..29b22ac4c 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -30,6 +30,10 @@ class ListUnassigned extends BaseListUnassigned if(!empty($data['PRO_UID'])) { $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -61,6 +65,10 @@ class ListUnassigned extends BaseListUnassigned if(!empty($data['PRO_UID'])) { $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } + $t = new Task(); + if (!empty($data['TAS_UID'])) { + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/map/ListCanceledMapBuilder.php b/workflow/engine/classes/model/map/ListCanceledMapBuilder.php index 388154337..138d26707 100644 --- a/workflow/engine/classes/model/map/ListCanceledMapBuilder.php +++ b/workflow/engine/classes/model/map/ListCanceledMapBuilder.php @@ -105,6 +105,8 @@ class ListCanceledMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListCanceledMapBuilder diff --git a/workflow/engine/classes/model/map/ListCompletedMapBuilder.php b/workflow/engine/classes/model/map/ListCompletedMapBuilder.php index 7e8d73564..d81b321ed 100644 --- a/workflow/engine/classes/model/map/ListCompletedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListCompletedMapBuilder.php @@ -99,6 +99,8 @@ class ListCompletedMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListCompletedMapBuilder diff --git a/workflow/engine/classes/model/map/ListInboxMapBuilder.php b/workflow/engine/classes/model/map/ListInboxMapBuilder.php index 5a75040a3..08255cc41 100644 --- a/workflow/engine/classes/model/map/ListInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListInboxMapBuilder.php @@ -109,6 +109,8 @@ class ListInboxMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); } // doBuild() diff --git a/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php b/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php index f0f8c519b..bc53e8ada 100644 --- a/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php @@ -119,6 +119,8 @@ class ListMyInboxMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); } // doBuild() diff --git a/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php b/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php index a1651a68b..3b4a451a4 100644 --- a/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php @@ -109,6 +109,8 @@ class ListParticipatedHistoryMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListParticipatedHistoryMapBuilder diff --git a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php index 30002d9b0..caf73a20b 100644 --- a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php @@ -115,6 +115,8 @@ class ListParticipatedLastMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); } // doBuild() diff --git a/workflow/engine/classes/model/map/ListPausedMapBuilder.php b/workflow/engine/classes/model/map/ListPausedMapBuilder.php index 119fe6662..f6f2b8b2f 100644 --- a/workflow/engine/classes/model/map/ListPausedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListPausedMapBuilder.php @@ -113,6 +113,8 @@ class ListPausedMapBuilder $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListPausedMapBuilder diff --git a/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php b/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php index d2fe9c40c..34293d00e 100644 --- a/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php @@ -99,6 +99,8 @@ class ListUnassignedMapBuilder $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('TAS_ID', 'TasId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListUnassignedMapBuilder diff --git a/workflow/engine/classes/model/om/BaseListCanceled.php b/workflow/engine/classes/model/om/BaseListCanceled.php index 7c3bd56eb..a00d41076 100644 --- a/workflow/engine/classes/model/om/BaseListCanceled.php +++ b/workflow/engine/classes/model/om/BaseListCanceled.php @@ -147,6 +147,12 @@ abstract class BaseListCanceled extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -465,6 +471,17 @@ abstract class BaseListCanceled extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Set the value of [app_uid] column. * @@ -933,6 +950,28 @@ abstract class BaseListCanceled extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListCanceledPeer::TAS_ID; + } + + } // setTasId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -990,12 +1029,14 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 19); + $this->tas_id = $rs->getInt($startcol + 20); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 20; // 20 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 21; // 21 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListCanceled object", $e); @@ -1259,6 +1300,9 @@ abstract class BaseListCanceled extends BaseObject implements Persistent case 19: return $this->getUsrId(); break; + case 20: + return $this->getTasId(); + break; default: return null; break; @@ -1299,6 +1343,7 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $keys[17] => $this->getDelPriority(), $keys[18] => $this->getProId(), $keys[19] => $this->getUsrId(), + $keys[20] => $this->getTasId(), ); return $result; } @@ -1390,6 +1435,9 @@ abstract class BaseListCanceled extends BaseObject implements Persistent case 19: $this->setUsrId($value); break; + case 20: + $this->setTasId($value); + break; } // switch() } @@ -1493,6 +1541,10 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $this->setUsrId($arr[$keys[19]]); } + if (array_key_exists($keys[20], $arr)) { + $this->setTasId($arr[$keys[20]]); + } + } /** @@ -1584,6 +1636,10 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $criteria->add(ListCanceledPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListCanceledPeer::TAS_ID)) { + $criteria->add(ListCanceledPeer::TAS_ID, $this->tas_id); + } + return $criteria; } @@ -1676,6 +1732,8 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListCanceledPeer.php b/workflow/engine/classes/model/om/BaseListCanceledPeer.php index 00809df5f..777713c3a 100644 --- a/workflow/engine/classes/model/om/BaseListCanceledPeer.php +++ b/workflow/engine/classes/model/om/BaseListCanceledPeer.php @@ -25,7 +25,7 @@ abstract class BaseListCanceledPeer const CLASS_DEFAULT = 'classes.model.ListCanceled'; /** The total number of columns. */ - const NUM_COLUMNS = 20; + const NUM_COLUMNS = 21; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -91,6 +91,9 @@ abstract class BaseListCanceledPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_CANCELED.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_CANCELED.TAS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -102,10 +105,10 @@ abstract class BaseListCanceledPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCanceledDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', ), - BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID, ListCanceledPeer::USR_UID, ListCanceledPeer::TAS_UID, ListCanceledPeer::PRO_UID, ListCanceledPeer::APP_NUMBER, ListCanceledPeer::APP_TITLE, ListCanceledPeer::APP_PRO_TITLE, ListCanceledPeer::APP_TAS_TITLE, ListCanceledPeer::APP_CANCELED_DATE, ListCanceledPeer::DEL_INDEX, ListCanceledPeer::DEL_PREVIOUS_USR_UID, ListCanceledPeer::DEL_CURRENT_USR_USERNAME, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME, ListCanceledPeer::DEL_DELEGATE_DATE, ListCanceledPeer::DEL_INIT_DATE, ListCanceledPeer::DEL_DUE_DATE, ListCanceledPeer::DEL_PRIORITY, ListCanceledPeer::PRO_ID, ListCanceledPeer::USR_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CANCELED_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCanceledDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ), + BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID, ListCanceledPeer::USR_UID, ListCanceledPeer::TAS_UID, ListCanceledPeer::PRO_UID, ListCanceledPeer::APP_NUMBER, ListCanceledPeer::APP_TITLE, ListCanceledPeer::APP_PRO_TITLE, ListCanceledPeer::APP_TAS_TITLE, ListCanceledPeer::APP_CANCELED_DATE, ListCanceledPeer::DEL_INDEX, ListCanceledPeer::DEL_PREVIOUS_USR_UID, ListCanceledPeer::DEL_CURRENT_USR_USERNAME, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME, ListCanceledPeer::DEL_DELEGATE_DATE, ListCanceledPeer::DEL_INIT_DATE, ListCanceledPeer::DEL_DUE_DATE, ListCanceledPeer::DEL_PRIORITY, ListCanceledPeer::PRO_ID, ListCanceledPeer::USR_ID, ListCanceledPeer::TAS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CANCELED_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_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, ) ); /** @@ -115,10 +118,10 @@ abstract class BaseListCanceledPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCanceledDate' => 8, 'DelIndex' => 9, 'DelPreviousUsrUid' => 10, 'DelCurrentUsrUsername' => 11, 'DelCurrentUsrFirstname' => 12, 'DelCurrentUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, 'ProId' => 18, 'UsrId' => 19, ), - BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID => 0, ListCanceledPeer::USR_UID => 1, ListCanceledPeer::TAS_UID => 2, ListCanceledPeer::PRO_UID => 3, ListCanceledPeer::APP_NUMBER => 4, ListCanceledPeer::APP_TITLE => 5, ListCanceledPeer::APP_PRO_TITLE => 6, ListCanceledPeer::APP_TAS_TITLE => 7, ListCanceledPeer::APP_CANCELED_DATE => 8, ListCanceledPeer::DEL_INDEX => 9, ListCanceledPeer::DEL_PREVIOUS_USR_UID => 10, ListCanceledPeer::DEL_CURRENT_USR_USERNAME => 11, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME => 12, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME => 13, ListCanceledPeer::DEL_DELEGATE_DATE => 14, ListCanceledPeer::DEL_INIT_DATE => 15, ListCanceledPeer::DEL_DUE_DATE => 16, ListCanceledPeer::DEL_PRIORITY => 17, ListCanceledPeer::PRO_ID => 18, ListCanceledPeer::USR_ID => 19, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CANCELED_DATE' => 8, 'DEL_INDEX' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_CURRENT_USR_USERNAME' => 11, 'DEL_CURRENT_USR_FIRSTNAME' => 12, 'DEL_CURRENT_USR_LASTNAME' => 13, 'DEL_DELEGATE_DATE' => 14, 'DEL_INIT_DATE' => 15, 'DEL_DUE_DATE' => 16, 'DEL_PRIORITY' => 17, 'PRO_ID' => 18, 'USR_ID' => 19, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCanceledDate' => 8, 'DelIndex' => 9, 'DelPreviousUsrUid' => 10, 'DelCurrentUsrUsername' => 11, 'DelCurrentUsrFirstname' => 12, 'DelCurrentUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, 'ProId' => 18, 'UsrId' => 19, 'TasId' => 20, ), + BasePeer::TYPE_COLNAME => array (ListCanceledPeer::APP_UID => 0, ListCanceledPeer::USR_UID => 1, ListCanceledPeer::TAS_UID => 2, ListCanceledPeer::PRO_UID => 3, ListCanceledPeer::APP_NUMBER => 4, ListCanceledPeer::APP_TITLE => 5, ListCanceledPeer::APP_PRO_TITLE => 6, ListCanceledPeer::APP_TAS_TITLE => 7, ListCanceledPeer::APP_CANCELED_DATE => 8, ListCanceledPeer::DEL_INDEX => 9, ListCanceledPeer::DEL_PREVIOUS_USR_UID => 10, ListCanceledPeer::DEL_CURRENT_USR_USERNAME => 11, ListCanceledPeer::DEL_CURRENT_USR_FIRSTNAME => 12, ListCanceledPeer::DEL_CURRENT_USR_LASTNAME => 13, ListCanceledPeer::DEL_DELEGATE_DATE => 14, ListCanceledPeer::DEL_INIT_DATE => 15, ListCanceledPeer::DEL_DUE_DATE => 16, ListCanceledPeer::DEL_PRIORITY => 17, ListCanceledPeer::PRO_ID => 18, ListCanceledPeer::USR_ID => 19, ListCanceledPeer::TAS_ID => 20, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CANCELED_DATE' => 8, 'DEL_INDEX' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_CURRENT_USR_USERNAME' => 11, 'DEL_CURRENT_USR_FIRSTNAME' => 12, 'DEL_CURRENT_USR_LASTNAME' => 13, 'DEL_DELEGATE_DATE' => 14, 'DEL_INIT_DATE' => 15, 'DEL_DUE_DATE' => 16, 'DEL_PRIORITY' => 17, 'PRO_ID' => 18, 'USR_ID' => 19, 'TAS_ID' => 20, ), + 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, ) ); /** @@ -259,6 +262,8 @@ abstract class BaseListCanceledPeer $criteria->addSelectColumn(ListCanceledPeer::USR_ID); + $criteria->addSelectColumn(ListCanceledPeer::TAS_ID); + } const COUNT = 'COUNT(LIST_CANCELED.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListCompleted.php b/workflow/engine/classes/model/om/BaseListCompleted.php index b703dcdda..58fa32a0c 100644 --- a/workflow/engine/classes/model/om/BaseListCompleted.php +++ b/workflow/engine/classes/model/om/BaseListCompleted.php @@ -129,6 +129,12 @@ abstract class BaseListCompleted extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -372,6 +378,17 @@ abstract class BaseListCompleted extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Set the value of [app_uid] column. * @@ -760,6 +777,28 @@ abstract class BaseListCompleted extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListCompletedPeer::TAS_ID; + } + + } // setTasId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -811,12 +850,14 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 16); + $this->tas_id = $rs->getInt($startcol + 17); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 17; // 17 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 18; // 18 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListCompleted object", $e); @@ -1071,6 +1112,9 @@ abstract class BaseListCompleted extends BaseObject implements Persistent case 16: return $this->getUsrId(); break; + case 17: + return $this->getTasId(); + break; default: return null; break; @@ -1108,6 +1152,7 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $keys[14] => $this->getDelCurrentUsrLastname(), $keys[15] => $this->getProId(), $keys[16] => $this->getUsrId(), + $keys[17] => $this->getTasId(), ); return $result; } @@ -1190,6 +1235,9 @@ abstract class BaseListCompleted extends BaseObject implements Persistent case 16: $this->setUsrId($value); break; + case 17: + $this->setTasId($value); + break; } // switch() } @@ -1281,6 +1329,10 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $this->setUsrId($arr[$keys[16]]); } + if (array_key_exists($keys[17], $arr)) { + $this->setTasId($arr[$keys[17]]); + } + } /** @@ -1360,6 +1412,10 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $criteria->add(ListCompletedPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListCompletedPeer::TAS_ID)) { + $criteria->add(ListCompletedPeer::TAS_ID, $this->tas_id); + } + return $criteria; } @@ -1446,6 +1502,8 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListCompletedPeer.php b/workflow/engine/classes/model/om/BaseListCompletedPeer.php index 4036783d8..dc2844ef4 100644 --- a/workflow/engine/classes/model/om/BaseListCompletedPeer.php +++ b/workflow/engine/classes/model/om/BaseListCompletedPeer.php @@ -25,7 +25,7 @@ abstract class BaseListCompletedPeer const CLASS_DEFAULT = 'classes.model.ListCompleted'; /** The total number of columns. */ - const NUM_COLUMNS = 17; + const NUM_COLUMNS = 18; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -82,6 +82,9 @@ abstract class BaseListCompletedPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_COMPLETED.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_COMPLETED.TAS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -93,10 +96,10 @@ abstract class BaseListCompletedPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppFinishDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'ProId', 'UsrId', ), - BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID, ListCompletedPeer::USR_UID, ListCompletedPeer::TAS_UID, ListCompletedPeer::PRO_UID, ListCompletedPeer::APP_NUMBER, ListCompletedPeer::APP_TITLE, ListCompletedPeer::APP_PRO_TITLE, ListCompletedPeer::APP_TAS_TITLE, ListCompletedPeer::APP_CREATE_DATE, ListCompletedPeer::APP_FINISH_DATE, ListCompletedPeer::DEL_INDEX, ListCompletedPeer::DEL_PREVIOUS_USR_UID, ListCompletedPeer::DEL_CURRENT_USR_USERNAME, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, ListCompletedPeer::PRO_ID, ListCompletedPeer::USR_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'PRO_ID', 'USR_ID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppFinishDate', 'DelIndex', 'DelPreviousUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'ProId', 'UsrId', 'TasId', ), + BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID, ListCompletedPeer::USR_UID, ListCompletedPeer::TAS_UID, ListCompletedPeer::PRO_UID, ListCompletedPeer::APP_NUMBER, ListCompletedPeer::APP_TITLE, ListCompletedPeer::APP_PRO_TITLE, ListCompletedPeer::APP_TAS_TITLE, ListCompletedPeer::APP_CREATE_DATE, ListCompletedPeer::APP_FINISH_DATE, ListCompletedPeer::DEL_INDEX, ListCompletedPeer::DEL_PREVIOUS_USR_UID, ListCompletedPeer::DEL_CURRENT_USR_USERNAME, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, ListCompletedPeer::PRO_ID, ListCompletedPeer::USR_ID, ListCompletedPeer::TAS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_FINISH_DATE', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'PRO_ID', 'USR_ID', 'TAS_ID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -106,10 +109,10 @@ abstract class BaseListCompletedPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppFinishDate' => 9, 'DelIndex' => 10, 'DelPreviousUsrUid' => 11, 'DelCurrentUsrUsername' => 12, 'DelCurrentUsrFirstname' => 13, 'DelCurrentUsrLastname' => 14, 'ProId' => 15, 'UsrId' => 16, ), - BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID => 0, ListCompletedPeer::USR_UID => 1, ListCompletedPeer::TAS_UID => 2, ListCompletedPeer::PRO_UID => 3, ListCompletedPeer::APP_NUMBER => 4, ListCompletedPeer::APP_TITLE => 5, ListCompletedPeer::APP_PRO_TITLE => 6, ListCompletedPeer::APP_TAS_TITLE => 7, ListCompletedPeer::APP_CREATE_DATE => 8, ListCompletedPeer::APP_FINISH_DATE => 9, ListCompletedPeer::DEL_INDEX => 10, ListCompletedPeer::DEL_PREVIOUS_USR_UID => 11, ListCompletedPeer::DEL_CURRENT_USR_USERNAME => 12, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME => 13, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME => 14, ListCompletedPeer::PRO_ID => 15, ListCompletedPeer::USR_ID => 16, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_FINISH_DATE' => 9, 'DEL_INDEX' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_CURRENT_USR_USERNAME' => 12, 'DEL_CURRENT_USR_FIRSTNAME' => 13, 'DEL_CURRENT_USR_LASTNAME' => 14, 'PRO_ID' => 15, 'USR_ID' => 16, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppFinishDate' => 9, 'DelIndex' => 10, 'DelPreviousUsrUid' => 11, 'DelCurrentUsrUsername' => 12, 'DelCurrentUsrFirstname' => 13, 'DelCurrentUsrLastname' => 14, 'ProId' => 15, 'UsrId' => 16, 'TasId' => 17, ), + BasePeer::TYPE_COLNAME => array (ListCompletedPeer::APP_UID => 0, ListCompletedPeer::USR_UID => 1, ListCompletedPeer::TAS_UID => 2, ListCompletedPeer::PRO_UID => 3, ListCompletedPeer::APP_NUMBER => 4, ListCompletedPeer::APP_TITLE => 5, ListCompletedPeer::APP_PRO_TITLE => 6, ListCompletedPeer::APP_TAS_TITLE => 7, ListCompletedPeer::APP_CREATE_DATE => 8, ListCompletedPeer::APP_FINISH_DATE => 9, ListCompletedPeer::DEL_INDEX => 10, ListCompletedPeer::DEL_PREVIOUS_USR_UID => 11, ListCompletedPeer::DEL_CURRENT_USR_USERNAME => 12, ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME => 13, ListCompletedPeer::DEL_CURRENT_USR_LASTNAME => 14, ListCompletedPeer::PRO_ID => 15, ListCompletedPeer::USR_ID => 16, ListCompletedPeer::TAS_ID => 17, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_FINISH_DATE' => 9, 'DEL_INDEX' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_CURRENT_USR_USERNAME' => 12, 'DEL_CURRENT_USR_FIRSTNAME' => 13, 'DEL_CURRENT_USR_LASTNAME' => 14, 'PRO_ID' => 15, 'USR_ID' => 16, 'TAS_ID' => 17, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -244,6 +247,8 @@ abstract class BaseListCompletedPeer $criteria->addSelectColumn(ListCompletedPeer::USR_ID); + $criteria->addSelectColumn(ListCompletedPeer::TAS_ID); + } const COUNT = 'COUNT(LIST_COMPLETED.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListInbox.php b/workflow/engine/classes/model/om/BaseListInbox.php index 43e963742..48a5faa98 100644 --- a/workflow/engine/classes/model/om/BaseListInbox.php +++ b/workflow/engine/classes/model/om/BaseListInbox.php @@ -159,6 +159,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * The value for the app_status_id field. * @var int @@ -526,6 +532,17 @@ abstract class BaseListInbox extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Get the [app_status_id] column value. * @@ -1056,6 +1073,28 @@ abstract class BaseListInbox extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListInboxPeer::TAS_ID; + } + + } // setTasId() + /** * Set the value of [app_status_id] column. * @@ -1139,14 +1178,16 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 21); - $this->app_status_id = $rs->getInt($startcol + 22); + $this->tas_id = $rs->getInt($startcol + 22); + + $this->app_status_id = $rs->getInt($startcol + 23); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 23; // 23 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 24; // 24 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListInbox object", $e); @@ -1417,6 +1458,9 @@ abstract class BaseListInbox extends BaseObject implements Persistent return $this->getUsrId(); break; case 22: + return $this->getTasId(); + break; + case 23: return $this->getAppStatusId(); break; default: @@ -1461,7 +1505,8 @@ abstract class BaseListInbox extends BaseObject implements Persistent $keys[19] => $this->getDelPriority(), $keys[20] => $this->getProId(), $keys[21] => $this->getUsrId(), - $keys[22] => $this->getAppStatusId(), + $keys[22] => $this->getTasId(), + $keys[23] => $this->getAppStatusId(), ); return $result; } @@ -1560,6 +1605,9 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->setUsrId($value); break; case 22: + $this->setTasId($value); + break; + case 23: $this->setAppStatusId($value); break; } // switch() @@ -1674,7 +1722,11 @@ abstract class BaseListInbox extends BaseObject implements Persistent } if (array_key_exists($keys[22], $arr)) { - $this->setAppStatusId($arr[$keys[22]]); + $this->setTasId($arr[$keys[22]]); + } + + if (array_key_exists($keys[23], $arr)) { + $this->setAppStatusId($arr[$keys[23]]); } } @@ -1776,6 +1828,10 @@ abstract class BaseListInbox extends BaseObject implements Persistent $criteria->add(ListInboxPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListInboxPeer::TAS_ID)) { + $criteria->add(ListInboxPeer::TAS_ID, $this->tas_id); + } + if ($this->isColumnModified(ListInboxPeer::APP_STATUS_ID)) { $criteria->add(ListInboxPeer::APP_STATUS_ID, $this->app_status_id); } @@ -1886,6 +1942,8 @@ abstract class BaseListInbox extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setAppStatusId($this->app_status_id); diff --git a/workflow/engine/classes/model/om/BaseListInboxPeer.php b/workflow/engine/classes/model/om/BaseListInboxPeer.php index 19590e8ae..fdf184e64 100644 --- a/workflow/engine/classes/model/om/BaseListInboxPeer.php +++ b/workflow/engine/classes/model/om/BaseListInboxPeer.php @@ -25,7 +25,7 @@ abstract class BaseListInboxPeer const CLASS_DEFAULT = 'classes.model.ListInbox'; /** The total number of columns. */ - const NUM_COLUMNS = 23; + const NUM_COLUMNS = 24; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -97,6 +97,9 @@ abstract class BaseListInboxPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_INBOX.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_INBOX.TAS_ID'; + /** the column name for the APP_STATUS_ID field */ const APP_STATUS_ID = 'LIST_INBOX.APP_STATUS_ID'; @@ -111,10 +114,10 @@ abstract class BaseListInboxPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelRiskDate', 'DelPriority', 'ProId', 'UsrId', 'AppStatusId', ), - BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_RISK_DATE, ListInboxPeer::DEL_PRIORITY, ListInboxPeer::PRO_ID, ListInboxPeer::USR_ID, ListInboxPeer::APP_STATUS_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_RISK_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'APP_STATUS_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelRiskDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ), + BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID, ListInboxPeer::DEL_INDEX, ListInboxPeer::USR_UID, ListInboxPeer::TAS_UID, ListInboxPeer::PRO_UID, ListInboxPeer::APP_NUMBER, ListInboxPeer::APP_STATUS, ListInboxPeer::APP_TITLE, ListInboxPeer::APP_PRO_TITLE, ListInboxPeer::APP_TAS_TITLE, ListInboxPeer::APP_UPDATE_DATE, ListInboxPeer::DEL_PREVIOUS_USR_UID, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListInboxPeer::DEL_DELEGATE_DATE, ListInboxPeer::DEL_INIT_DATE, ListInboxPeer::DEL_DUE_DATE, ListInboxPeer::DEL_RISK_DATE, ListInboxPeer::DEL_PRIORITY, ListInboxPeer::PRO_ID, ListInboxPeer::USR_ID, ListInboxPeer::TAS_ID, ListInboxPeer::APP_STATUS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_STATUS', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_RISK_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_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, ) ); /** @@ -124,10 +127,10 @@ abstract class BaseListInboxPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelRiskDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, 'AppStatusId' => 22, ), - BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_RISK_DATE => 18, ListInboxPeer::DEL_PRIORITY => 19, ListInboxPeer::PRO_ID => 20, ListInboxPeer::USR_ID => 21, ListInboxPeer::APP_STATUS_ID => 22, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_RISK_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, 'APP_STATUS_ID' => 22, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppStatus' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppUpdateDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelDelegateDate' => 15, 'DelInitDate' => 16, 'DelDueDate' => 17, 'DelRiskDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, 'TasId' => 22, 'AppStatusId' => 23, ), + BasePeer::TYPE_COLNAME => array (ListInboxPeer::APP_UID => 0, ListInboxPeer::DEL_INDEX => 1, ListInboxPeer::USR_UID => 2, ListInboxPeer::TAS_UID => 3, ListInboxPeer::PRO_UID => 4, ListInboxPeer::APP_NUMBER => 5, ListInboxPeer::APP_STATUS => 6, ListInboxPeer::APP_TITLE => 7, ListInboxPeer::APP_PRO_TITLE => 8, ListInboxPeer::APP_TAS_TITLE => 9, ListInboxPeer::APP_UPDATE_DATE => 10, ListInboxPeer::DEL_PREVIOUS_USR_UID => 11, ListInboxPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListInboxPeer::DEL_DELEGATE_DATE => 15, ListInboxPeer::DEL_INIT_DATE => 16, ListInboxPeer::DEL_DUE_DATE => 17, ListInboxPeer::DEL_RISK_DATE => 18, ListInboxPeer::DEL_PRIORITY => 19, ListInboxPeer::PRO_ID => 20, ListInboxPeer::USR_ID => 21, ListInboxPeer::TAS_ID => 22, ListInboxPeer::APP_STATUS_ID => 23, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_STATUS' => 6, 'APP_TITLE' => 7, 'APP_PRO_TITLE' => 8, 'APP_TAS_TITLE' => 9, 'APP_UPDATE_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_DELEGATE_DATE' => 15, 'DEL_INIT_DATE' => 16, 'DEL_DUE_DATE' => 17, 'DEL_RISK_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, 'TAS_ID' => 22, 'APP_STATUS_ID' => 23, ), + 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, ) ); /** @@ -272,6 +275,8 @@ abstract class BaseListInboxPeer $criteria->addSelectColumn(ListInboxPeer::USR_ID); + $criteria->addSelectColumn(ListInboxPeer::TAS_ID); + $criteria->addSelectColumn(ListInboxPeer::APP_STATUS_ID); } diff --git a/workflow/engine/classes/model/om/BaseListMyInbox.php b/workflow/engine/classes/model/om/BaseListMyInbox.php index 5db82bafa..5e4b8f443 100644 --- a/workflow/engine/classes/model/om/BaseListMyInbox.php +++ b/workflow/engine/classes/model/om/BaseListMyInbox.php @@ -189,6 +189,12 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * The value for the app_status_id field. * @var int @@ -632,6 +638,17 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Get the [app_status_id] column value. * @@ -1279,6 +1296,28 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListMyInboxPeer::TAS_ID; + } + + } // setTasId() + /** * Set the value of [app_status_id] column. * @@ -1372,14 +1411,16 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 26); - $this->app_status_id = $rs->getInt($startcol + 27); + $this->tas_id = $rs->getInt($startcol + 27); + + $this->app_status_id = $rs->getInt($startcol + 28); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 28; // 28 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 29; // 29 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListMyInbox object", $e); @@ -1665,6 +1706,9 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent return $this->getUsrId(); break; case 27: + return $this->getTasId(); + break; + case 28: return $this->getAppStatusId(); break; default: @@ -1714,7 +1758,8 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $keys[24] => $this->getDelPriority(), $keys[25] => $this->getProId(), $keys[26] => $this->getUsrId(), - $keys[27] => $this->getAppStatusId(), + $keys[27] => $this->getTasId(), + $keys[28] => $this->getAppStatusId(), ); return $result; } @@ -1828,6 +1873,9 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $this->setUsrId($value); break; case 27: + $this->setTasId($value); + break; + case 28: $this->setAppStatusId($value); break; } // switch() @@ -1962,7 +2010,11 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent } if (array_key_exists($keys[27], $arr)) { - $this->setAppStatusId($arr[$keys[27]]); + $this->setTasId($arr[$keys[27]]); + } + + if (array_key_exists($keys[28], $arr)) { + $this->setAppStatusId($arr[$keys[28]]); } } @@ -2084,6 +2136,10 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $criteria->add(ListMyInboxPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListMyInboxPeer::TAS_ID)) { + $criteria->add(ListMyInboxPeer::TAS_ID, $this->tas_id); + } + if ($this->isColumnModified(ListMyInboxPeer::APP_STATUS_ID)) { $criteria->add(ListMyInboxPeer::APP_STATUS_ID, $this->app_status_id); } @@ -2194,6 +2250,8 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setAppStatusId($this->app_status_id); diff --git a/workflow/engine/classes/model/om/BaseListMyInboxPeer.php b/workflow/engine/classes/model/om/BaseListMyInboxPeer.php index efc9fd78b..6919f639c 100644 --- a/workflow/engine/classes/model/om/BaseListMyInboxPeer.php +++ b/workflow/engine/classes/model/om/BaseListMyInboxPeer.php @@ -25,7 +25,7 @@ abstract class BaseListMyInboxPeer const CLASS_DEFAULT = 'classes.model.ListMyInbox'; /** The total number of columns. */ - const NUM_COLUMNS = 28; + const NUM_COLUMNS = 29; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -112,6 +112,9 @@ abstract class BaseListMyInboxPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_MY_INBOX.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_MY_INBOX.TAS_ID'; + /** the column name for the APP_STATUS_ID field */ const APP_STATUS_ID = 'LIST_MY_INBOX.APP_STATUS_ID'; @@ -126,10 +129,10 @@ abstract class BaseListMyInboxPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppUpdateDate', 'AppFinishDate', 'AppStatus', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'AppStatusId', ), - BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID, ListMyInboxPeer::USR_UID, ListMyInboxPeer::TAS_UID, ListMyInboxPeer::PRO_UID, ListMyInboxPeer::APP_NUMBER, ListMyInboxPeer::APP_TITLE, ListMyInboxPeer::APP_PRO_TITLE, ListMyInboxPeer::APP_TAS_TITLE, ListMyInboxPeer::APP_CREATE_DATE, ListMyInboxPeer::APP_UPDATE_DATE, ListMyInboxPeer::APP_FINISH_DATE, ListMyInboxPeer::APP_STATUS, ListMyInboxPeer::DEL_INDEX, ListMyInboxPeer::DEL_PREVIOUS_USR_UID, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListMyInboxPeer::DEL_CURRENT_USR_UID, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME, ListMyInboxPeer::DEL_DELEGATE_DATE, ListMyInboxPeer::DEL_INIT_DATE, ListMyInboxPeer::DEL_DUE_DATE, ListMyInboxPeer::DEL_PRIORITY, ListMyInboxPeer::PRO_ID, ListMyInboxPeer::USR_ID, ListMyInboxPeer::APP_STATUS_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_UPDATE_DATE', 'APP_FINISH_DATE', 'APP_STATUS', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'APP_STATUS_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppCreateDate', 'AppUpdateDate', 'AppFinishDate', 'AppStatus', 'DelIndex', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUid', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ), + BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID, ListMyInboxPeer::USR_UID, ListMyInboxPeer::TAS_UID, ListMyInboxPeer::PRO_UID, ListMyInboxPeer::APP_NUMBER, ListMyInboxPeer::APP_TITLE, ListMyInboxPeer::APP_PRO_TITLE, ListMyInboxPeer::APP_TAS_TITLE, ListMyInboxPeer::APP_CREATE_DATE, ListMyInboxPeer::APP_UPDATE_DATE, ListMyInboxPeer::APP_FINISH_DATE, ListMyInboxPeer::APP_STATUS, ListMyInboxPeer::DEL_INDEX, ListMyInboxPeer::DEL_PREVIOUS_USR_UID, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME, ListMyInboxPeer::DEL_CURRENT_USR_UID, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME, ListMyInboxPeer::DEL_DELEGATE_DATE, ListMyInboxPeer::DEL_INIT_DATE, ListMyInboxPeer::DEL_DUE_DATE, ListMyInboxPeer::DEL_PRIORITY, ListMyInboxPeer::PRO_ID, ListMyInboxPeer::USR_ID, ListMyInboxPeer::TAS_ID, ListMyInboxPeer::APP_STATUS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_CREATE_DATE', 'APP_UPDATE_DATE', 'APP_FINISH_DATE', 'APP_STATUS', 'DEL_INDEX', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_UID', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_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, ) ); /** @@ -139,10 +142,10 @@ abstract class BaseListMyInboxPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppUpdateDate' => 9, 'AppFinishDate' => 10, 'AppStatus' => 11, 'DelIndex' => 12, 'DelPreviousUsrUid' => 13, 'DelPreviousUsrUsername' => 14, 'DelPreviousUsrFirstname' => 15, 'DelPreviousUsrLastname' => 16, 'DelCurrentUsrUid' => 17, 'DelCurrentUsrUsername' => 18, 'DelCurrentUsrFirstname' => 19, 'DelCurrentUsrLastname' => 20, 'DelDelegateDate' => 21, 'DelInitDate' => 22, 'DelDueDate' => 23, 'DelPriority' => 24, 'ProId' => 25, 'UsrId' => 26, 'AppStatusId' => 27, ), - BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID => 0, ListMyInboxPeer::USR_UID => 1, ListMyInboxPeer::TAS_UID => 2, ListMyInboxPeer::PRO_UID => 3, ListMyInboxPeer::APP_NUMBER => 4, ListMyInboxPeer::APP_TITLE => 5, ListMyInboxPeer::APP_PRO_TITLE => 6, ListMyInboxPeer::APP_TAS_TITLE => 7, ListMyInboxPeer::APP_CREATE_DATE => 8, ListMyInboxPeer::APP_UPDATE_DATE => 9, ListMyInboxPeer::APP_FINISH_DATE => 10, ListMyInboxPeer::APP_STATUS => 11, ListMyInboxPeer::DEL_INDEX => 12, ListMyInboxPeer::DEL_PREVIOUS_USR_UID => 13, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME => 14, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 15, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 16, ListMyInboxPeer::DEL_CURRENT_USR_UID => 17, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME => 18, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME => 19, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME => 20, ListMyInboxPeer::DEL_DELEGATE_DATE => 21, ListMyInboxPeer::DEL_INIT_DATE => 22, ListMyInboxPeer::DEL_DUE_DATE => 23, ListMyInboxPeer::DEL_PRIORITY => 24, ListMyInboxPeer::PRO_ID => 25, ListMyInboxPeer::USR_ID => 26, ListMyInboxPeer::APP_STATUS_ID => 27, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_UPDATE_DATE' => 9, 'APP_FINISH_DATE' => 10, 'APP_STATUS' => 11, 'DEL_INDEX' => 12, 'DEL_PREVIOUS_USR_UID' => 13, 'DEL_PREVIOUS_USR_USERNAME' => 14, 'DEL_PREVIOUS_USR_FIRSTNAME' => 15, 'DEL_PREVIOUS_USR_LASTNAME' => 16, 'DEL_CURRENT_USR_UID' => 17, 'DEL_CURRENT_USR_USERNAME' => 18, 'DEL_CURRENT_USR_FIRSTNAME' => 19, 'DEL_CURRENT_USR_LASTNAME' => 20, 'DEL_DELEGATE_DATE' => 21, 'DEL_INIT_DATE' => 22, 'DEL_DUE_DATE' => 23, 'DEL_PRIORITY' => 24, 'PRO_ID' => 25, 'USR_ID' => 26, 'APP_STATUS_ID' => 27, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'AppCreateDate' => 8, 'AppUpdateDate' => 9, 'AppFinishDate' => 10, 'AppStatus' => 11, 'DelIndex' => 12, 'DelPreviousUsrUid' => 13, 'DelPreviousUsrUsername' => 14, 'DelPreviousUsrFirstname' => 15, 'DelPreviousUsrLastname' => 16, 'DelCurrentUsrUid' => 17, 'DelCurrentUsrUsername' => 18, 'DelCurrentUsrFirstname' => 19, 'DelCurrentUsrLastname' => 20, 'DelDelegateDate' => 21, 'DelInitDate' => 22, 'DelDueDate' => 23, 'DelPriority' => 24, 'ProId' => 25, 'UsrId' => 26, 'TasId' => 27, 'AppStatusId' => 28, ), + BasePeer::TYPE_COLNAME => array (ListMyInboxPeer::APP_UID => 0, ListMyInboxPeer::USR_UID => 1, ListMyInboxPeer::TAS_UID => 2, ListMyInboxPeer::PRO_UID => 3, ListMyInboxPeer::APP_NUMBER => 4, ListMyInboxPeer::APP_TITLE => 5, ListMyInboxPeer::APP_PRO_TITLE => 6, ListMyInboxPeer::APP_TAS_TITLE => 7, ListMyInboxPeer::APP_CREATE_DATE => 8, ListMyInboxPeer::APP_UPDATE_DATE => 9, ListMyInboxPeer::APP_FINISH_DATE => 10, ListMyInboxPeer::APP_STATUS => 11, ListMyInboxPeer::DEL_INDEX => 12, ListMyInboxPeer::DEL_PREVIOUS_USR_UID => 13, ListMyInboxPeer::DEL_PREVIOUS_USR_USERNAME => 14, ListMyInboxPeer::DEL_PREVIOUS_USR_FIRSTNAME => 15, ListMyInboxPeer::DEL_PREVIOUS_USR_LASTNAME => 16, ListMyInboxPeer::DEL_CURRENT_USR_UID => 17, ListMyInboxPeer::DEL_CURRENT_USR_USERNAME => 18, ListMyInboxPeer::DEL_CURRENT_USR_FIRSTNAME => 19, ListMyInboxPeer::DEL_CURRENT_USR_LASTNAME => 20, ListMyInboxPeer::DEL_DELEGATE_DATE => 21, ListMyInboxPeer::DEL_INIT_DATE => 22, ListMyInboxPeer::DEL_DUE_DATE => 23, ListMyInboxPeer::DEL_PRIORITY => 24, ListMyInboxPeer::PRO_ID => 25, ListMyInboxPeer::USR_ID => 26, ListMyInboxPeer::TAS_ID => 27, ListMyInboxPeer::APP_STATUS_ID => 28, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'APP_CREATE_DATE' => 8, 'APP_UPDATE_DATE' => 9, 'APP_FINISH_DATE' => 10, 'APP_STATUS' => 11, 'DEL_INDEX' => 12, 'DEL_PREVIOUS_USR_UID' => 13, 'DEL_PREVIOUS_USR_USERNAME' => 14, 'DEL_PREVIOUS_USR_FIRSTNAME' => 15, 'DEL_PREVIOUS_USR_LASTNAME' => 16, 'DEL_CURRENT_USR_UID' => 17, 'DEL_CURRENT_USR_USERNAME' => 18, 'DEL_CURRENT_USR_FIRSTNAME' => 19, 'DEL_CURRENT_USR_LASTNAME' => 20, 'DEL_DELEGATE_DATE' => 21, 'DEL_INIT_DATE' => 22, 'DEL_DUE_DATE' => 23, 'DEL_PRIORITY' => 24, 'PRO_ID' => 25, 'USR_ID' => 26, 'TAS_ID' => 27, 'APP_STATUS_ID' => 28, ), + 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, ) ); /** @@ -297,6 +300,8 @@ abstract class BaseListMyInboxPeer $criteria->addSelectColumn(ListMyInboxPeer::USR_ID); + $criteria->addSelectColumn(ListMyInboxPeer::TAS_ID); + $criteria->addSelectColumn(ListMyInboxPeer::APP_STATUS_ID); } diff --git a/workflow/engine/classes/model/om/BaseListParticipatedHistory.php b/workflow/engine/classes/model/om/BaseListParticipatedHistory.php index 21b6ea21d..cda8b7778 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedHistory.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedHistory.php @@ -159,6 +159,12 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -478,6 +484,17 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Set the value of [app_uid] column. * @@ -983,6 +1000,28 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist } // setUsrId() + /** + * 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[] = ListParticipatedHistoryPeer::TAS_ID; + } + + } // setTasId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1044,12 +1083,14 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $this->usr_id = $rs->getInt($startcol + 21); + $this->tas_id = $rs->getInt($startcol + 22); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 22; // 22 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 23; // 23 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListParticipatedHistory object", $e); @@ -1319,6 +1360,9 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist case 21: return $this->getUsrId(); break; + case 22: + return $this->getTasId(); + break; default: return null; break; @@ -1361,6 +1405,7 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $keys[19] => $this->getDelPriority(), $keys[20] => $this->getProId(), $keys[21] => $this->getUsrId(), + $keys[22] => $this->getTasId(), ); return $result; } @@ -1458,6 +1503,9 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist case 21: $this->setUsrId($value); break; + case 22: + $this->setTasId($value); + break; } // switch() } @@ -1569,6 +1617,10 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $this->setUsrId($arr[$keys[21]]); } + if (array_key_exists($keys[22], $arr)) { + $this->setTasId($arr[$keys[22]]); + } + } /** @@ -1668,6 +1720,10 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $criteria->add(ListParticipatedHistoryPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListParticipatedHistoryPeer::TAS_ID)) { + $criteria->add(ListParticipatedHistoryPeer::TAS_ID, $this->tas_id); + } + return $criteria; } @@ -1774,6 +1830,8 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php b/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php index b98041939..33c0f67de 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php @@ -25,7 +25,7 @@ abstract class BaseListParticipatedHistoryPeer const CLASS_DEFAULT = 'classes.model.ListParticipatedHistory'; /** The total number of columns. */ - const NUM_COLUMNS = 22; + const NUM_COLUMNS = 23; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -97,6 +97,9 @@ abstract class BaseListParticipatedHistoryPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_PARTICIPATED_HISTORY.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_PARTICIPATED_HISTORY.TAS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -108,10 +111,10 @@ abstract class BaseListParticipatedHistoryPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', ), - BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID, ListParticipatedHistoryPeer::DEL_INDEX, ListParticipatedHistoryPeer::USR_UID, ListParticipatedHistoryPeer::TAS_UID, ListParticipatedHistoryPeer::PRO_UID, ListParticipatedHistoryPeer::APP_NUMBER, ListParticipatedHistoryPeer::APP_TITLE, ListParticipatedHistoryPeer::APP_PRO_TITLE, ListParticipatedHistoryPeer::APP_TAS_TITLE, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, ListParticipatedHistoryPeer::DEL_INIT_DATE, ListParticipatedHistoryPeer::DEL_DUE_DATE, ListParticipatedHistoryPeer::DEL_PRIORITY, ListParticipatedHistoryPeer::PRO_ID, ListParticipatedHistoryPeer::USR_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ), + BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID, ListParticipatedHistoryPeer::DEL_INDEX, ListParticipatedHistoryPeer::USR_UID, ListParticipatedHistoryPeer::TAS_UID, ListParticipatedHistoryPeer::PRO_UID, ListParticipatedHistoryPeer::APP_NUMBER, ListParticipatedHistoryPeer::APP_TITLE, ListParticipatedHistoryPeer::APP_PRO_TITLE, ListParticipatedHistoryPeer::APP_TAS_TITLE, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, ListParticipatedHistoryPeer::DEL_INIT_DATE, ListParticipatedHistoryPeer::DEL_DUE_DATE, ListParticipatedHistoryPeer::DEL_PRIORITY, ListParticipatedHistoryPeer::PRO_ID, ListParticipatedHistoryPeer::USR_ID, ListParticipatedHistoryPeer::TAS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_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, ) ); /** @@ -121,10 +124,10 @@ abstract class BaseListParticipatedHistoryPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'DelPreviousUsrUid' => 9, 'DelPreviousUsrUsername' => 10, 'DelPreviousUsrFirstname' => 11, 'DelPreviousUsrLastname' => 12, 'DelCurrentUsrUsername' => 13, 'DelCurrentUsrFirstname' => 14, 'DelCurrentUsrLastname' => 15, 'DelDelegateDate' => 16, 'DelInitDate' => 17, 'DelDueDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, ), - BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID => 0, ListParticipatedHistoryPeer::DEL_INDEX => 1, ListParticipatedHistoryPeer::USR_UID => 2, ListParticipatedHistoryPeer::TAS_UID => 3, ListParticipatedHistoryPeer::PRO_UID => 4, ListParticipatedHistoryPeer::APP_NUMBER => 5, ListParticipatedHistoryPeer::APP_TITLE => 6, ListParticipatedHistoryPeer::APP_PRO_TITLE => 7, ListParticipatedHistoryPeer::APP_TAS_TITLE => 8, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID => 9, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME => 10, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME => 11, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME => 12, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME => 13, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME => 14, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME => 15, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE => 16, ListParticipatedHistoryPeer::DEL_INIT_DATE => 17, ListParticipatedHistoryPeer::DEL_DUE_DATE => 18, ListParticipatedHistoryPeer::DEL_PRIORITY => 19, ListParticipatedHistoryPeer::PRO_ID => 20, ListParticipatedHistoryPeer::USR_ID => 21, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'DEL_PREVIOUS_USR_UID' => 9, 'DEL_PREVIOUS_USR_USERNAME' => 10, 'DEL_PREVIOUS_USR_FIRSTNAME' => 11, 'DEL_PREVIOUS_USR_LASTNAME' => 12, 'DEL_CURRENT_USR_USERNAME' => 13, 'DEL_CURRENT_USR_FIRSTNAME' => 14, 'DEL_CURRENT_USR_LASTNAME' => 15, 'DEL_DELEGATE_DATE' => 16, 'DEL_INIT_DATE' => 17, 'DEL_DUE_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'DelPreviousUsrUid' => 9, 'DelPreviousUsrUsername' => 10, 'DelPreviousUsrFirstname' => 11, 'DelPreviousUsrLastname' => 12, 'DelCurrentUsrUsername' => 13, 'DelCurrentUsrFirstname' => 14, 'DelCurrentUsrLastname' => 15, 'DelDelegateDate' => 16, 'DelInitDate' => 17, 'DelDueDate' => 18, 'DelPriority' => 19, 'ProId' => 20, 'UsrId' => 21, 'TasId' => 22, ), + BasePeer::TYPE_COLNAME => array (ListParticipatedHistoryPeer::APP_UID => 0, ListParticipatedHistoryPeer::DEL_INDEX => 1, ListParticipatedHistoryPeer::USR_UID => 2, ListParticipatedHistoryPeer::TAS_UID => 3, ListParticipatedHistoryPeer::PRO_UID => 4, ListParticipatedHistoryPeer::APP_NUMBER => 5, ListParticipatedHistoryPeer::APP_TITLE => 6, ListParticipatedHistoryPeer::APP_PRO_TITLE => 7, ListParticipatedHistoryPeer::APP_TAS_TITLE => 8, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_UID => 9, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_USERNAME => 10, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_FIRSTNAME => 11, ListParticipatedHistoryPeer::DEL_PREVIOUS_USR_LASTNAME => 12, ListParticipatedHistoryPeer::DEL_CURRENT_USR_USERNAME => 13, ListParticipatedHistoryPeer::DEL_CURRENT_USR_FIRSTNAME => 14, ListParticipatedHistoryPeer::DEL_CURRENT_USR_LASTNAME => 15, ListParticipatedHistoryPeer::DEL_DELEGATE_DATE => 16, ListParticipatedHistoryPeer::DEL_INIT_DATE => 17, ListParticipatedHistoryPeer::DEL_DUE_DATE => 18, ListParticipatedHistoryPeer::DEL_PRIORITY => 19, ListParticipatedHistoryPeer::PRO_ID => 20, ListParticipatedHistoryPeer::USR_ID => 21, ListParticipatedHistoryPeer::TAS_ID => 22, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'DEL_PREVIOUS_USR_UID' => 9, 'DEL_PREVIOUS_USR_USERNAME' => 10, 'DEL_PREVIOUS_USR_FIRSTNAME' => 11, 'DEL_PREVIOUS_USR_LASTNAME' => 12, 'DEL_CURRENT_USR_USERNAME' => 13, 'DEL_CURRENT_USR_FIRSTNAME' => 14, 'DEL_CURRENT_USR_LASTNAME' => 15, 'DEL_DELEGATE_DATE' => 16, 'DEL_INIT_DATE' => 17, 'DEL_DUE_DATE' => 18, 'DEL_PRIORITY' => 19, 'PRO_ID' => 20, 'USR_ID' => 21, 'TAS_ID' => 22, ), + 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, ) ); /** @@ -269,6 +272,8 @@ abstract class BaseListParticipatedHistoryPeer $criteria->addSelectColumn(ListParticipatedHistoryPeer::USR_ID); + $criteria->addSelectColumn(ListParticipatedHistoryPeer::TAS_ID); + } const COUNT = 'COUNT(LIST_PARTICIPATED_HISTORY.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListParticipatedLast.php b/workflow/engine/classes/model/om/BaseListParticipatedLast.php index c378be9da..9881d3c3e 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedLast.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedLast.php @@ -177,6 +177,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * The value for the app_status_id field. * @var int @@ -535,6 +541,17 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Get the [app_status_id] column value. * @@ -1117,6 +1134,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListParticipatedLastPeer::TAS_ID; + } + + } // setTasId() + /** * Set the value of [app_status_id] column. * @@ -1206,14 +1245,16 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 24); - $this->app_status_id = $rs->getInt($startcol + 25); + $this->tas_id = $rs->getInt($startcol + 25); + + $this->app_status_id = $rs->getInt($startcol + 26); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 26; // 26 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 27; // 27 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListParticipatedLast object", $e); @@ -1493,6 +1534,9 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->getUsrId(); break; case 25: + return $this->getTasId(); + break; + case 26: return $this->getAppStatusId(); break; default: @@ -1540,7 +1584,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $keys[22] => $this->getDelThreadStatus(), $keys[23] => $this->getProId(), $keys[24] => $this->getUsrId(), - $keys[25] => $this->getAppStatusId(), + $keys[25] => $this->getTasId(), + $keys[26] => $this->getAppStatusId(), ); return $result; } @@ -1648,6 +1693,9 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->setUsrId($value); break; case 25: + $this->setTasId($value); + break; + case 26: $this->setAppStatusId($value); break; } // switch() @@ -1774,7 +1822,11 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } if (array_key_exists($keys[25], $arr)) { - $this->setAppStatusId($arr[$keys[25]]); + $this->setTasId($arr[$keys[25]]); + } + + if (array_key_exists($keys[26], $arr)) { + $this->setAppStatusId($arr[$keys[26]]); } } @@ -1888,6 +1940,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $criteria->add(ListParticipatedLastPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListParticipatedLastPeer::TAS_ID)) { + $criteria->add(ListParticipatedLastPeer::TAS_ID, $this->tas_id); + } + if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS_ID)) { $criteria->add(ListParticipatedLastPeer::APP_STATUS_ID, $this->app_status_id); } @@ -2007,6 +2063,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setAppStatusId($this->app_status_id); diff --git a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php index 1d1eb92e9..74e5d22d6 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php @@ -25,7 +25,7 @@ abstract class BaseListParticipatedLastPeer const CLASS_DEFAULT = 'classes.model.ListParticipatedLast'; /** The total number of columns. */ - const NUM_COLUMNS = 26; + const NUM_COLUMNS = 27; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -106,6 +106,9 @@ abstract class BaseListParticipatedLastPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_PARTICIPATED_LAST.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_PARTICIPATED_LAST.TAS_ID'; + /** the column name for the APP_STATUS_ID field */ const APP_STATUS_ID = 'LIST_PARTICIPATED_LAST.APP_STATUS_ID'; @@ -120,10 +123,10 @@ abstract class BaseListParticipatedLastPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelCurrentTasTitle', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelThreadStatus', 'ProId', 'UsrId', 'AppStatusId', ), - BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ListParticipatedLastPeer::PRO_ID, ListParticipatedLastPeer::USR_ID, ListParticipatedLastPeer::APP_STATUS_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_CURRENT_TAS_TITLE', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', 'PRO_ID', 'USR_ID', 'APP_STATUS_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelCurrentTasTitle', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelThreadStatus', 'ProId', 'UsrId', 'TasId', 'AppStatusId', ), + BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID, ListParticipatedLastPeer::USR_UID, ListParticipatedLastPeer::DEL_INDEX, ListParticipatedLastPeer::TAS_UID, ListParticipatedLastPeer::PRO_UID, ListParticipatedLastPeer::APP_NUMBER, ListParticipatedLastPeer::APP_TITLE, ListParticipatedLastPeer::APP_PRO_TITLE, ListParticipatedLastPeer::APP_TAS_TITLE, ListParticipatedLastPeer::APP_STATUS, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, ListParticipatedLastPeer::DEL_DELEGATE_DATE, ListParticipatedLastPeer::DEL_INIT_DATE, ListParticipatedLastPeer::DEL_DUE_DATE, ListParticipatedLastPeer::DEL_PRIORITY, ListParticipatedLastPeer::DEL_THREAD_STATUS, ListParticipatedLastPeer::PRO_ID, ListParticipatedLastPeer::USR_ID, ListParticipatedLastPeer::TAS_ID, ListParticipatedLastPeer::APP_STATUS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'USR_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_STATUS', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_CURRENT_TAS_TITLE', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'DEL_THREAD_STATUS', 'PRO_ID', 'USR_ID', 'TAS_ID', 'APP_STATUS_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, ) ); /** @@ -133,10 +136,10 @@ abstract class BaseListParticipatedLastPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'DelIndex' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelCurrentTasTitle' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'DelThreadStatus' => 22, 'ProId' => 23, 'UsrId' => 24, 'AppStatusId' => 25, ), - BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::DEL_INDEX => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE => 17, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 18, ListParticipatedLastPeer::DEL_INIT_DATE => 19, ListParticipatedLastPeer::DEL_DUE_DATE => 20, ListParticipatedLastPeer::DEL_PRIORITY => 21, ListParticipatedLastPeer::DEL_THREAD_STATUS => 22, ListParticipatedLastPeer::PRO_ID => 23, ListParticipatedLastPeer::USR_ID => 24, ListParticipatedLastPeer::APP_STATUS_ID => 25, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'DEL_INDEX' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_CURRENT_TAS_TITLE' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'DEL_THREAD_STATUS' => 22, 'PRO_ID' => 23, 'USR_ID' => 24, 'APP_STATUS_ID' => 25, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 1, 'DelIndex' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelCurrentTasTitle' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'DelThreadStatus' => 22, 'ProId' => 23, 'UsrId' => 24, 'TasId' => 25, 'AppStatusId' => 26, ), + BasePeer::TYPE_COLNAME => array (ListParticipatedLastPeer::APP_UID => 0, ListParticipatedLastPeer::USR_UID => 1, ListParticipatedLastPeer::DEL_INDEX => 2, ListParticipatedLastPeer::TAS_UID => 3, ListParticipatedLastPeer::PRO_UID => 4, ListParticipatedLastPeer::APP_NUMBER => 5, ListParticipatedLastPeer::APP_TITLE => 6, ListParticipatedLastPeer::APP_PRO_TITLE => 7, ListParticipatedLastPeer::APP_TAS_TITLE => 8, ListParticipatedLastPeer::APP_STATUS => 9, ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID => 10, ListParticipatedLastPeer::DEL_PREVIOUS_USR_USERNAME => 11, ListParticipatedLastPeer::DEL_PREVIOUS_USR_FIRSTNAME => 12, ListParticipatedLastPeer::DEL_PREVIOUS_USR_LASTNAME => 13, ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME => 14, ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME => 15, ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME => 16, ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE => 17, ListParticipatedLastPeer::DEL_DELEGATE_DATE => 18, ListParticipatedLastPeer::DEL_INIT_DATE => 19, ListParticipatedLastPeer::DEL_DUE_DATE => 20, ListParticipatedLastPeer::DEL_PRIORITY => 21, ListParticipatedLastPeer::DEL_THREAD_STATUS => 22, ListParticipatedLastPeer::PRO_ID => 23, ListParticipatedLastPeer::USR_ID => 24, ListParticipatedLastPeer::TAS_ID => 25, ListParticipatedLastPeer::APP_STATUS_ID => 26, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'USR_UID' => 1, 'DEL_INDEX' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_STATUS' => 9, 'DEL_PREVIOUS_USR_UID' => 10, 'DEL_PREVIOUS_USR_USERNAME' => 11, 'DEL_PREVIOUS_USR_FIRSTNAME' => 12, 'DEL_PREVIOUS_USR_LASTNAME' => 13, 'DEL_CURRENT_USR_USERNAME' => 14, 'DEL_CURRENT_USR_FIRSTNAME' => 15, 'DEL_CURRENT_USR_LASTNAME' => 16, 'DEL_CURRENT_TAS_TITLE' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'DEL_THREAD_STATUS' => 22, 'PRO_ID' => 23, 'USR_ID' => 24, 'TAS_ID' => 25, 'APP_STATUS_ID' => 26, ), + 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, ) ); /** @@ -287,6 +290,8 @@ abstract class BaseListParticipatedLastPeer $criteria->addSelectColumn(ListParticipatedLastPeer::USR_ID); + $criteria->addSelectColumn(ListParticipatedLastPeer::TAS_ID); + $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS_ID); } diff --git a/workflow/engine/classes/model/om/BaseListPaused.php b/workflow/engine/classes/model/om/BaseListPaused.php index f5f8e75fd..d3a6e2ab4 100644 --- a/workflow/engine/classes/model/om/BaseListPaused.php +++ b/workflow/engine/classes/model/om/BaseListPaused.php @@ -171,6 +171,12 @@ abstract class BaseListPaused extends BaseObject implements Persistent */ protected $usr_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -554,6 +560,17 @@ abstract class BaseListPaused extends BaseObject implements Persistent return $this->usr_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Set the value of [app_uid] column. * @@ -1117,6 +1134,28 @@ abstract class BaseListPaused extends BaseObject implements Persistent } // setUsrId() + /** + * 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[] = ListPausedPeer::TAS_ID; + } + + } // setTasId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1182,12 +1221,14 @@ abstract class BaseListPaused extends BaseObject implements Persistent $this->usr_id = $rs->getInt($startcol + 23); + $this->tas_id = $rs->getInt($startcol + 24); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 24; // 24 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 25; // 25 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListPaused object", $e); @@ -1463,6 +1504,9 @@ abstract class BaseListPaused extends BaseObject implements Persistent case 23: return $this->getUsrId(); break; + case 24: + return $this->getTasId(); + break; default: return null; break; @@ -1507,6 +1551,7 @@ abstract class BaseListPaused extends BaseObject implements Persistent $keys[21] => $this->getDelPriority(), $keys[22] => $this->getProId(), $keys[23] => $this->getUsrId(), + $keys[24] => $this->getTasId(), ); return $result; } @@ -1610,6 +1655,9 @@ abstract class BaseListPaused extends BaseObject implements Persistent case 23: $this->setUsrId($value); break; + case 24: + $this->setTasId($value); + break; } // switch() } @@ -1729,6 +1777,10 @@ abstract class BaseListPaused extends BaseObject implements Persistent $this->setUsrId($arr[$keys[23]]); } + if (array_key_exists($keys[24], $arr)) { + $this->setTasId($arr[$keys[24]]); + } + } /** @@ -1836,6 +1888,10 @@ abstract class BaseListPaused extends BaseObject implements Persistent $criteria->add(ListPausedPeer::USR_ID, $this->usr_id); } + if ($this->isColumnModified(ListPausedPeer::TAS_ID)) { + $criteria->add(ListPausedPeer::TAS_ID, $this->tas_id); + } + return $criteria; } @@ -1946,6 +2002,8 @@ abstract class BaseListPaused extends BaseObject implements Persistent $copyObj->setUsrId($this->usr_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListPausedPeer.php b/workflow/engine/classes/model/om/BaseListPausedPeer.php index 59b17a14c..3976b5731 100644 --- a/workflow/engine/classes/model/om/BaseListPausedPeer.php +++ b/workflow/engine/classes/model/om/BaseListPausedPeer.php @@ -25,7 +25,7 @@ abstract class BaseListPausedPeer const CLASS_DEFAULT = 'classes.model.ListPaused'; /** The total number of columns. */ - const NUM_COLUMNS = 24; + const NUM_COLUMNS = 25; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -103,6 +103,9 @@ abstract class BaseListPausedPeer /** the column name for the USR_ID field */ const USR_ID = 'LIST_PAUSED.USR_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_PAUSED.TAS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -114,10 +117,10 @@ abstract class BaseListPausedPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', ), - BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ListPausedPeer::PRO_ID, ListPausedPeer::USR_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppPausedDate', 'AppRestartDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'ProId', 'UsrId', 'TasId', ), + BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID, ListPausedPeer::DEL_INDEX, ListPausedPeer::USR_UID, ListPausedPeer::TAS_UID, ListPausedPeer::PRO_UID, ListPausedPeer::APP_NUMBER, ListPausedPeer::APP_TITLE, ListPausedPeer::APP_PRO_TITLE, ListPausedPeer::APP_TAS_TITLE, ListPausedPeer::APP_PAUSED_DATE, ListPausedPeer::APP_RESTART_DATE, ListPausedPeer::DEL_PREVIOUS_USR_UID, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME, ListPausedPeer::DEL_CURRENT_USR_USERNAME, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME, ListPausedPeer::DEL_CURRENT_USR_LASTNAME, ListPausedPeer::DEL_DELEGATE_DATE, ListPausedPeer::DEL_INIT_DATE, ListPausedPeer::DEL_DUE_DATE, ListPausedPeer::DEL_PRIORITY, ListPausedPeer::PRO_ID, ListPausedPeer::USR_ID, ListPausedPeer::TAS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'USR_UID', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'APP_PAUSED_DATE', 'APP_RESTART_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'DEL_CURRENT_USR_USERNAME', 'DEL_CURRENT_USR_FIRSTNAME', 'DEL_CURRENT_USR_LASTNAME', 'DEL_DELEGATE_DATE', 'DEL_INIT_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'USR_ID', 'TAS_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, ) ); /** @@ -127,10 +130,10 @@ abstract class BaseListPausedPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelCurrentUsrUsername' => 15, 'DelCurrentUsrFirstname' => 16, 'DelCurrentUsrLastname' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'ProId' => 22, 'UsrId' => 23, ), - BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 15, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 16, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 17, ListPausedPeer::DEL_DELEGATE_DATE => 18, ListPausedPeer::DEL_INIT_DATE => 19, ListPausedPeer::DEL_DUE_DATE => 20, ListPausedPeer::DEL_PRIORITY => 21, ListPausedPeer::PRO_ID => 22, ListPausedPeer::USR_ID => 23, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_CURRENT_USR_USERNAME' => 15, 'DEL_CURRENT_USR_FIRSTNAME' => 16, 'DEL_CURRENT_USR_LASTNAME' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'PRO_ID' => 22, 'USR_ID' => 23, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'UsrUid' => 2, 'TasUid' => 3, 'ProUid' => 4, 'AppNumber' => 5, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppPausedDate' => 9, 'AppRestartDate' => 10, 'DelPreviousUsrUid' => 11, 'DelPreviousUsrUsername' => 12, 'DelPreviousUsrFirstname' => 13, 'DelPreviousUsrLastname' => 14, 'DelCurrentUsrUsername' => 15, 'DelCurrentUsrFirstname' => 16, 'DelCurrentUsrLastname' => 17, 'DelDelegateDate' => 18, 'DelInitDate' => 19, 'DelDueDate' => 20, 'DelPriority' => 21, 'ProId' => 22, 'UsrId' => 23, 'TasId' => 24, ), + BasePeer::TYPE_COLNAME => array (ListPausedPeer::APP_UID => 0, ListPausedPeer::DEL_INDEX => 1, ListPausedPeer::USR_UID => 2, ListPausedPeer::TAS_UID => 3, ListPausedPeer::PRO_UID => 4, ListPausedPeer::APP_NUMBER => 5, ListPausedPeer::APP_TITLE => 6, ListPausedPeer::APP_PRO_TITLE => 7, ListPausedPeer::APP_TAS_TITLE => 8, ListPausedPeer::APP_PAUSED_DATE => 9, ListPausedPeer::APP_RESTART_DATE => 10, ListPausedPeer::DEL_PREVIOUS_USR_UID => 11, ListPausedPeer::DEL_PREVIOUS_USR_USERNAME => 12, ListPausedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 13, ListPausedPeer::DEL_PREVIOUS_USR_LASTNAME => 14, ListPausedPeer::DEL_CURRENT_USR_USERNAME => 15, ListPausedPeer::DEL_CURRENT_USR_FIRSTNAME => 16, ListPausedPeer::DEL_CURRENT_USR_LASTNAME => 17, ListPausedPeer::DEL_DELEGATE_DATE => 18, ListPausedPeer::DEL_INIT_DATE => 19, ListPausedPeer::DEL_DUE_DATE => 20, ListPausedPeer::DEL_PRIORITY => 21, ListPausedPeer::PRO_ID => 22, ListPausedPeer::USR_ID => 23, ListPausedPeer::TAS_ID => 24, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'USR_UID' => 2, 'TAS_UID' => 3, 'PRO_UID' => 4, 'APP_NUMBER' => 5, 'APP_TITLE' => 6, 'APP_PRO_TITLE' => 7, 'APP_TAS_TITLE' => 8, 'APP_PAUSED_DATE' => 9, 'APP_RESTART_DATE' => 10, 'DEL_PREVIOUS_USR_UID' => 11, 'DEL_PREVIOUS_USR_USERNAME' => 12, 'DEL_PREVIOUS_USR_FIRSTNAME' => 13, 'DEL_PREVIOUS_USR_LASTNAME' => 14, 'DEL_CURRENT_USR_USERNAME' => 15, 'DEL_CURRENT_USR_FIRSTNAME' => 16, 'DEL_CURRENT_USR_LASTNAME' => 17, 'DEL_DELEGATE_DATE' => 18, 'DEL_INIT_DATE' => 19, 'DEL_DUE_DATE' => 20, 'DEL_PRIORITY' => 21, 'PRO_ID' => 22, 'USR_ID' => 23, 'TAS_ID' => 24, ), + 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, ) ); /** @@ -279,6 +282,8 @@ abstract class BaseListPausedPeer $criteria->addSelectColumn(ListPausedPeer::USR_ID); + $criteria->addSelectColumn(ListPausedPeer::TAS_ID); + } const COUNT = 'COUNT(LIST_PAUSED.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListUnassigned.php b/workflow/engine/classes/model/om/BaseListUnassigned.php index 3a453da76..60d58309d 100644 --- a/workflow/engine/classes/model/om/BaseListUnassigned.php +++ b/workflow/engine/classes/model/om/BaseListUnassigned.php @@ -129,6 +129,12 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent */ protected $pro_id = 0; + /** + * The value for the tas_id field. + * @var int + */ + protected $tas_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -393,6 +399,17 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent return $this->pro_id; } + /** + * Get the [tas_id] column value. + * + * @return int + */ + public function getTasId() + { + + return $this->tas_id; + } + /** * Set the value of [app_uid] column. * @@ -788,6 +805,28 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent } // setProId() + /** + * 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[] = ListUnassignedPeer::TAS_ID; + } + + } // setTasId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -839,12 +878,14 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $this->pro_id = $rs->getInt($startcol + 16); + $this->tas_id = $rs->getInt($startcol + 17); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 17; // 17 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 18; // 18 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListUnassigned object", $e); @@ -1099,6 +1140,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent case 16: return $this->getProId(); break; + case 17: + return $this->getTasId(); + break; default: return null; break; @@ -1136,6 +1180,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $keys[14] => $this->getDelDueDate(), $keys[15] => $this->getDelPriority(), $keys[16] => $this->getProId(), + $keys[17] => $this->getTasId(), ); return $result; } @@ -1218,6 +1263,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent case 16: $this->setProId($value); break; + case 17: + $this->setTasId($value); + break; } // switch() } @@ -1309,6 +1357,10 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $this->setProId($arr[$keys[16]]); } + if (array_key_exists($keys[17], $arr)) { + $this->setTasId($arr[$keys[17]]); + } + } /** @@ -1388,6 +1440,10 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $criteria->add(ListUnassignedPeer::PRO_ID, $this->pro_id); } + if ($this->isColumnModified(ListUnassignedPeer::TAS_ID)) { + $criteria->add(ListUnassignedPeer::TAS_ID, $this->tas_id); + } + return $criteria; } @@ -1484,6 +1540,8 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $copyObj->setProId($this->pro_id); + $copyObj->setTasId($this->tas_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListUnassignedPeer.php b/workflow/engine/classes/model/om/BaseListUnassignedPeer.php index 3464caa94..848d2e249 100644 --- a/workflow/engine/classes/model/om/BaseListUnassignedPeer.php +++ b/workflow/engine/classes/model/om/BaseListUnassignedPeer.php @@ -25,7 +25,7 @@ abstract class BaseListUnassignedPeer const CLASS_DEFAULT = 'classes.model.ListUnassigned'; /** The total number of columns. */ - const NUM_COLUMNS = 17; + const NUM_COLUMNS = 18; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -82,6 +82,9 @@ abstract class BaseListUnassignedPeer /** the column name for the PRO_ID field */ const PRO_ID = 'LIST_UNASSIGNED.PRO_ID'; + /** the column name for the TAS_ID field */ + const TAS_ID = 'LIST_UNASSIGNED.TAS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -93,10 +96,10 @@ abstract class BaseListUnassignedPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelDelegateDate', 'DelDueDate', 'DelPriority', 'ProId', ), - BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID, ListUnassignedPeer::DEL_INDEX, ListUnassignedPeer::TAS_UID, ListUnassignedPeer::PRO_UID, ListUnassignedPeer::APP_NUMBER, ListUnassignedPeer::APP_TITLE, ListUnassignedPeer::APP_PRO_TITLE, ListUnassignedPeer::APP_TAS_TITLE, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME, ListUnassignedPeer::APP_UPDATE_DATE, ListUnassignedPeer::DEL_PREVIOUS_USR_UID, ListUnassignedPeer::DEL_DELEGATE_DATE, ListUnassignedPeer::DEL_DUE_DATE, ListUnassignedPeer::DEL_PRIORITY, ListUnassignedPeer::PRO_ID, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_DELEGATE_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelDelegateDate', 'DelDueDate', 'DelPriority', 'ProId', 'TasId', ), + BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID, ListUnassignedPeer::DEL_INDEX, ListUnassignedPeer::TAS_UID, ListUnassignedPeer::PRO_UID, ListUnassignedPeer::APP_NUMBER, ListUnassignedPeer::APP_TITLE, ListUnassignedPeer::APP_PRO_TITLE, ListUnassignedPeer::APP_TAS_TITLE, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME, ListUnassignedPeer::APP_UPDATE_DATE, ListUnassignedPeer::DEL_PREVIOUS_USR_UID, ListUnassignedPeer::DEL_DELEGATE_DATE, ListUnassignedPeer::DEL_DUE_DATE, ListUnassignedPeer::DEL_PRIORITY, ListUnassignedPeer::PRO_ID, ListUnassignedPeer::TAS_ID, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID', 'DEL_INDEX', 'TAS_UID', 'PRO_UID', 'APP_NUMBER', 'APP_TITLE', 'APP_PRO_TITLE', 'APP_TAS_TITLE', 'DEL_PREVIOUS_USR_USERNAME', 'DEL_PREVIOUS_USR_FIRSTNAME', 'DEL_PREVIOUS_USR_LASTNAME', 'APP_UPDATE_DATE', 'DEL_PREVIOUS_USR_UID', 'DEL_DELEGATE_DATE', 'DEL_DUE_DATE', 'DEL_PRIORITY', 'PRO_ID', 'TAS_ID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -106,10 +109,10 @@ abstract class BaseListUnassignedPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, 'ProId' => 16, ), - BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ListUnassignedPeer::PRO_ID => 16, ), - BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, 'PRO_ID' => 16, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, ) + BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'DelIndex' => 1, 'TasUid' => 2, 'ProUid' => 3, 'AppNumber' => 4, 'AppTitle' => 5, 'AppProTitle' => 6, 'AppTasTitle' => 7, 'DelPreviousUsrUsername' => 8, 'DelPreviousUsrFirstname' => 9, 'DelPreviousUsrLastname' => 10, 'AppUpdateDate' => 11, 'DelPreviousUsrUid' => 12, 'DelDelegateDate' => 13, 'DelDueDate' => 14, 'DelPriority' => 15, 'ProId' => 16, 'TasId' => 17, ), + BasePeer::TYPE_COLNAME => array (ListUnassignedPeer::APP_UID => 0, ListUnassignedPeer::DEL_INDEX => 1, ListUnassignedPeer::TAS_UID => 2, ListUnassignedPeer::PRO_UID => 3, ListUnassignedPeer::APP_NUMBER => 4, ListUnassignedPeer::APP_TITLE => 5, ListUnassignedPeer::APP_PRO_TITLE => 6, ListUnassignedPeer::APP_TAS_TITLE => 7, ListUnassignedPeer::DEL_PREVIOUS_USR_USERNAME => 8, ListUnassignedPeer::DEL_PREVIOUS_USR_FIRSTNAME => 9, ListUnassignedPeer::DEL_PREVIOUS_USR_LASTNAME => 10, ListUnassignedPeer::APP_UPDATE_DATE => 11, ListUnassignedPeer::DEL_PREVIOUS_USR_UID => 12, ListUnassignedPeer::DEL_DELEGATE_DATE => 13, ListUnassignedPeer::DEL_DUE_DATE => 14, ListUnassignedPeer::DEL_PRIORITY => 15, ListUnassignedPeer::PRO_ID => 16, ListUnassignedPeer::TAS_ID => 17, ), + BasePeer::TYPE_FIELDNAME => array ('APP_UID' => 0, 'DEL_INDEX' => 1, 'TAS_UID' => 2, 'PRO_UID' => 3, 'APP_NUMBER' => 4, 'APP_TITLE' => 5, 'APP_PRO_TITLE' => 6, 'APP_TAS_TITLE' => 7, 'DEL_PREVIOUS_USR_USERNAME' => 8, 'DEL_PREVIOUS_USR_FIRSTNAME' => 9, 'DEL_PREVIOUS_USR_LASTNAME' => 10, 'APP_UPDATE_DATE' => 11, 'DEL_PREVIOUS_USR_UID' => 12, 'DEL_DELEGATE_DATE' => 13, 'DEL_DUE_DATE' => 14, 'DEL_PRIORITY' => 15, 'PRO_ID' => 16, 'TAS_ID' => 17, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) ); /** @@ -244,6 +247,8 @@ abstract class BaseListUnassignedPeer $criteria->addSelectColumn(ListUnassignedPeer::PRO_ID); + $criteria->addSelectColumn(ListUnassignedPeer::TAS_ID); + } const COUNT = 'COUNT(LIST_UNASSIGNED.APP_UID)'; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index aaf7431f0..04e2e75f7 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4186,6 +4186,7 @@ + @@ -4223,6 +4224,12 @@ + + + + + + @@ -4267,6 +4274,7 @@ + @@ -4283,6 +4291,9 @@ + + +
@@ -4330,6 +4341,7 @@ + @@ -4355,6 +4367,9 @@ + + +
@@ -4394,12 +4409,16 @@ + + + + @@ -4455,12 +4474,16 @@ + + + + @@ -4512,12 +4535,16 @@ + + + + @@ -4576,6 +4603,7 @@ + @@ -4583,6 +4611,9 @@ + + +
@@ -4622,9 +4653,13 @@ + + + +
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index d496e7968..80b00adbc 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -99,7 +99,7 @@ CREATE TABLE `APP_DELEGATION` KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_TAS_ID`(`TAS_ID`), KEY `INDEX_USR_UID`(`USR_UID`), - KEY `INDEX_THREAD_STATUS_APP_NUMBER`(`DEL_THREAD_STATUS`, `APP_NUMBER`) + KEY `INDEX_THREAD_STATUS_APP_NUMBER`(`DEL_THREAD_STATUS`, `APP_NUMBER`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Delegation a task to user'; #----------------------------------------------------------------------------- #-- APP_DOCUMENT @@ -2361,13 +2361,16 @@ CREATE TABLE `LIST_INBOX` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, `APP_STATUS_ID` TINYINT default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), KEY `indexUser`(`USR_UID`), KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`), KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`), KEY `INDEX_PRO_ID`(`PRO_ID`), - KEY `INDEX_USR_ID`(`USR_ID`) + KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`), + KEY `INDEX_APP_STATUS_ID`(`APP_STATUS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_HISTORY @@ -2400,10 +2403,12 @@ CREATE TABLE `LIST_PARTICIPATED_HISTORY` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`), KEY `INDEX_PRO_ID`(`PRO_ID`), - KEY `INDEX_USR_ID`(`USR_ID`) + KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated history list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_LAST @@ -2439,12 +2444,14 @@ CREATE TABLE `LIST_PARTICIPATED_LAST` `DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, `APP_STATUS_ID` TINYINT default 0, PRIMARY KEY (`APP_UID`,`USR_UID`,`DEL_INDEX`), KEY `usrIndex`(`USR_UID`), KEY `delDelegateDate`(`DEL_DELEGATE_DATE`), KEY `INDEX_PRO_ID`(`PRO_ID`), - KEY `INDEX_USR_ID`(`USR_ID`) + KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list'; #----------------------------------------------------------------------------- #-- LIST_COMPLETED @@ -2472,9 +2479,11 @@ CREATE TABLE `LIST_COMPLETED` `DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '', `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`), KEY `usrListCompleted`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Completed list'; #----------------------------------------------------------------------------- @@ -2510,9 +2519,11 @@ CREATE TABLE `LIST_PAUSED` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`), KEY `indexPausedUser`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Paused list'; #----------------------------------------------------------------------------- @@ -2544,9 +2555,11 @@ CREATE TABLE `LIST_CANCELED` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`), KEY `indexCanceledUser`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Canceled list'; #----------------------------------------------------------------------------- @@ -2585,10 +2598,12 @@ CREATE TABLE `LIST_MY_INBOX` `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, `USR_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, `APP_STATUS_ID` TINYINT default 0, PRIMARY KEY (`APP_UID`), KEY `INDEX_PRO_ID`(`PRO_ID`), - KEY `INDEX_USR_ID`(`USR_ID`) + KEY `INDEX_USR_ID`(`USR_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='My Inbox list'; #----------------------------------------------------------------------------- #-- LIST_UNASSIGNED @@ -2616,8 +2631,10 @@ CREATE TABLE `LIST_UNASSIGNED` `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `PRO_ID` INTEGER default 0, + `TAS_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), - KEY `INDEX_PRO_ID`(`PRO_ID`) + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_TAS_ID`(`TAS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Unassigned list'; #----------------------------------------------------------------------------- #-- LIST_UNASSIGNED_GROUP