From 6dd758d951f26dcf2c3ac249311a8c62eb175eda Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Tue, 14 Feb 2017 15:43:26 -0400 Subject: [PATCH 01/13] HOR-2440 Add PRO_IOD and USR_ID columns to the list tables. --- .../engine/classes/model/ListCanceled.php | 8 + .../engine/classes/model/ListCompleted.php | 8 + workflow/engine/classes/model/ListInbox.php | 8 + workflow/engine/classes/model/ListMyInbox.php | 8 + .../classes/model/ListParticipatedHistory.php | 8 + .../classes/model/ListParticipatedLast.php | 8 + workflow/engine/classes/model/ListPaused.php | 8 + .../engine/classes/model/ListUnassigned.php | 4 + .../model/map/ListCanceledMapBuilder.php | 4 + .../model/map/ListCompletedMapBuilder.php | 4 + .../classes/model/map/ListInboxMapBuilder.php | 6 + .../model/map/ListMyInboxMapBuilder.php | 6 + .../map/ListParticipatedHistoryMapBuilder.php | 4 + .../map/ListParticipatedLastMapBuilder.php | 6 + .../model/map/ListPausedMapBuilder.php | 4 + .../map/ListUnassignedGroupMapBuilder.php | 2 + .../model/map/ListUnassignedMapBuilder.php | 2 + .../classes/model/om/BaseListCanceled.php | 118 +++++++++++- .../classes/model/om/BaseListCanceledPeer.php | 28 ++- .../classes/model/om/BaseListCompleted.php | 118 +++++++++++- .../model/om/BaseListCompletedPeer.php | 28 ++- .../engine/classes/model/om/BaseListInbox.php | 176 +++++++++++++++++- .../classes/model/om/BaseListInboxPeer.php | 33 +++- .../classes/model/om/BaseListMyInbox.php | 176 +++++++++++++++++- .../classes/model/om/BaseListMyInboxPeer.php | 33 +++- .../model/om/BaseListParticipatedHistory.php | 118 +++++++++++- .../om/BaseListParticipatedHistoryPeer.php | 28 ++- .../model/om/BaseListParticipatedLast.php | 176 +++++++++++++++++- .../model/om/BaseListParticipatedLastPeer.php | 33 +++- .../classes/model/om/BaseListPaused.php | 118 +++++++++++- .../classes/model/om/BaseListPausedPeer.php | 28 ++- .../classes/model/om/BaseListUnassigned.php | 60 +++++- .../model/om/BaseListUnassignedGroup.php | 60 +++++- .../model/om/BaseListUnassignedGroupPeer.php | 23 ++- .../model/om/BaseListUnassignedPeer.php | 23 ++- workflow/engine/config/schema.xml | 67 +++++++ workflow/engine/data/mysql/schema.sql | 47 ++++- 37 files changed, 1493 insertions(+), 96 deletions(-) diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index 8e15a9b09..fcb29f87a 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -105,6 +105,10 @@ class ListCanceled extends BaseListCanceled { $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -132,6 +136,10 @@ class ListCanceled extends BaseListCanceled { */ public function update($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 6106b2afd..a17923153 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -97,6 +97,10 @@ class ListCompleted extends BaseListCompleted $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -124,6 +128,10 @@ class ListCompleted extends BaseListCompleted */ public function update($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 9b02ef50e..3e2a5c652 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -32,6 +32,10 @@ class ListInbox extends BaseListInbox $aData = $oCase->loadCase( $data["APP_UID"] ); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { $result = $this->save(); @@ -146,6 +150,10 @@ class ListInbox extends BaseListInbox $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); } + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 1fb090943..1845d8ad8 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -25,6 +25,10 @@ class ListMyInbox extends BaseListMyInbox */ public function create($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -52,6 +56,10 @@ class ListMyInbox extends BaseListMyInbox */ public function update($data) { + $p = new Process(); + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 0aefc364b..9c8cfc0e5 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -25,6 +25,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function create($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -52,6 +56,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function update($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 728a1ae91..a8f6235cd 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -70,6 +70,10 @@ class ListParticipatedLast extends BaseListParticipatedLast return; } + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -98,6 +102,10 @@ class ListParticipatedLast extends BaseListParticipatedLast public function update($data) { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 2c30913f9..91d7f6cd8 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -114,6 +114,10 @@ class ListPaused extends BaseListPaused { $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -141,6 +145,10 @@ class ListPaused extends BaseListPaused { */ public function update($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 992dcd502..8d2c92b78 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -26,6 +26,8 @@ class ListUnassigned extends BaseListUnassigned */ public function create($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -53,6 +55,8 @@ class ListUnassigned extends BaseListUnassigned */ public function update($data) { + $p = new Process(); + if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_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 f2645b9de..388154337 100644 --- a/workflow/engine/classes/model/map/ListCanceledMapBuilder.php +++ b/workflow/engine/classes/model/map/ListCanceledMapBuilder.php @@ -101,6 +101,10 @@ class ListCanceledMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', '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 63ca013e3..7e8d73564 100644 --- a/workflow/engine/classes/model/map/ListCompletedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListCompletedMapBuilder.php @@ -95,6 +95,10 @@ class ListCompletedMapBuilder $tMap->addColumn('DEL_CURRENT_USR_LASTNAME', 'DelCurrentUsrLastname', 'string', CreoleTypes::VARCHAR, false, 50); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', '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 d4c56233e..5a75040a3 100644 --- a/workflow/engine/classes/model/map/ListInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListInboxMapBuilder.php @@ -105,6 +105,12 @@ class ListInboxMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); + } // doBuild() } // ListInboxMapBuilder diff --git a/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php b/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php index 42c8fbc11..f0f8c519b 100644 --- a/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListMyInboxMapBuilder.php @@ -115,6 +115,12 @@ class ListMyInboxMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); + } // doBuild() } // ListMyInboxMapBuilder diff --git a/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php b/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php index 79afcc5fc..a1651a68b 100644 --- a/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedHistoryMapBuilder.php @@ -105,6 +105,10 @@ class ListParticipatedHistoryMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', '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 a502485a0..30002d9b0 100644 --- a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php @@ -111,6 +111,12 @@ class ListParticipatedLastMapBuilder $tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('APP_STATUS_ID', 'AppStatusId', 'int', CreoleTypes::TINYINT, false, null); + } // doBuild() } // ListParticipatedLastMapBuilder diff --git a/workflow/engine/classes/model/map/ListPausedMapBuilder.php b/workflow/engine/classes/model/map/ListPausedMapBuilder.php index a535e261d..119fe6662 100644 --- a/workflow/engine/classes/model/map/ListPausedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListPausedMapBuilder.php @@ -109,6 +109,10 @@ class ListPausedMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListPausedMapBuilder diff --git a/workflow/engine/classes/model/map/ListUnassignedGroupMapBuilder.php b/workflow/engine/classes/model/map/ListUnassignedGroupMapBuilder.php index 8dceba57f..9e9837af7 100644 --- a/workflow/engine/classes/model/map/ListUnassignedGroupMapBuilder.php +++ b/workflow/engine/classes/model/map/ListUnassignedGroupMapBuilder.php @@ -73,6 +73,8 @@ class ListUnassignedGroupMapBuilder $tMap->addColumn('TYP_UID', 'TypUid', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('USR_ID', 'UsrId', 'int', CreoleTypes::INTEGER, false, null); + } // doBuild() } // ListUnassignedGroupMapBuilder diff --git a/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php b/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php index 46e5714ae..d2fe9c40c 100644 --- a/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php +++ b/workflow/engine/classes/model/map/ListUnassignedMapBuilder.php @@ -97,6 +97,8 @@ class ListUnassignedMapBuilder $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('PRO_ID', 'ProId', '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 14bdcb1d6..7c3bd56eb 100644 --- a/workflow/engine/classes/model/om/BaseListCanceled.php +++ b/workflow/engine/classes/model/om/BaseListCanceled.php @@ -135,6 +135,18 @@ abstract class BaseListCanceled extends BaseObject implements Persistent */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -431,6 +443,28 @@ abstract class BaseListCanceled extends BaseObject implements Persistent return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [app_uid] column. * @@ -855,6 +889,50 @@ abstract class BaseListCanceled extends BaseObject implements Persistent } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListCanceledPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListCanceledPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -908,12 +986,16 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $this->del_priority = $rs->getString($startcol + 17); + $this->pro_id = $rs->getInt($startcol + 18); + + $this->usr_id = $rs->getInt($startcol + 19); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 18; // 18 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 20; // 20 = ListCanceledPeer::NUM_COLUMNS - ListCanceledPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListCanceled object", $e); @@ -1171,6 +1253,12 @@ abstract class BaseListCanceled extends BaseObject implements Persistent case 17: return $this->getDelPriority(); break; + case 18: + return $this->getProId(); + break; + case 19: + return $this->getUsrId(); + break; default: return null; break; @@ -1209,6 +1297,8 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $keys[15] => $this->getDelInitDate(), $keys[16] => $this->getDelDueDate(), $keys[17] => $this->getDelPriority(), + $keys[18] => $this->getProId(), + $keys[19] => $this->getUsrId(), ); return $result; } @@ -1294,6 +1384,12 @@ abstract class BaseListCanceled extends BaseObject implements Persistent case 17: $this->setDelPriority($value); break; + case 18: + $this->setProId($value); + break; + case 19: + $this->setUsrId($value); + break; } // switch() } @@ -1389,6 +1485,14 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $this->setDelPriority($arr[$keys[17]]); } + if (array_key_exists($keys[18], $arr)) { + $this->setProId($arr[$keys[18]]); + } + + if (array_key_exists($keys[19], $arr)) { + $this->setUsrId($arr[$keys[19]]); + } + } /** @@ -1472,6 +1576,14 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $criteria->add(ListCanceledPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListCanceledPeer::PRO_ID)) { + $criteria->add(ListCanceledPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListCanceledPeer::USR_ID)) { + $criteria->add(ListCanceledPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -1560,6 +1672,10 @@ abstract class BaseListCanceled extends BaseObject implements Persistent $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListCanceledPeer.php b/workflow/engine/classes/model/om/BaseListCanceledPeer.php index 0ab6942a9..00809df5f 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 = 18; + const NUM_COLUMNS = 20; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -85,6 +85,12 @@ abstract class BaseListCanceledPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_CANCELED.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_CANCELED.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_CANCELED.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -96,10 +102,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', ), - 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, ), - 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', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + 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, ) ); /** @@ -109,10 +115,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, ), - 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, ), - 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, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, ) + 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, ) ); /** @@ -249,6 +255,10 @@ abstract class BaseListCanceledPeer $criteria->addSelectColumn(ListCanceledPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListCanceledPeer::PRO_ID); + + $criteria->addSelectColumn(ListCanceledPeer::USR_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 a0fb8e8ad..b703dcdda 100644 --- a/workflow/engine/classes/model/om/BaseListCompleted.php +++ b/workflow/engine/classes/model/om/BaseListCompleted.php @@ -117,6 +117,18 @@ abstract class BaseListCompleted extends BaseObject implements Persistent */ protected $del_current_usr_lastname = ''; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -338,6 +350,28 @@ abstract class BaseListCompleted extends BaseObject implements Persistent return $this->del_current_usr_lastname; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [app_uid] column. * @@ -682,6 +716,50 @@ abstract class BaseListCompleted extends BaseObject implements Persistent } // setDelCurrentUsrLastname() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListCompletedPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListCompletedPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -729,12 +807,16 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $this->del_current_usr_lastname = $rs->getString($startcol + 14); + $this->pro_id = $rs->getInt($startcol + 15); + + $this->usr_id = $rs->getInt($startcol + 16); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 15; // 15 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 17; // 17 = ListCompletedPeer::NUM_COLUMNS - ListCompletedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListCompleted object", $e); @@ -983,6 +1065,12 @@ abstract class BaseListCompleted extends BaseObject implements Persistent case 14: return $this->getDelCurrentUsrLastname(); break; + case 15: + return $this->getProId(); + break; + case 16: + return $this->getUsrId(); + break; default: return null; break; @@ -1018,6 +1106,8 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $keys[12] => $this->getDelCurrentUsrUsername(), $keys[13] => $this->getDelCurrentUsrFirstname(), $keys[14] => $this->getDelCurrentUsrLastname(), + $keys[15] => $this->getProId(), + $keys[16] => $this->getUsrId(), ); return $result; } @@ -1094,6 +1184,12 @@ abstract class BaseListCompleted extends BaseObject implements Persistent case 14: $this->setDelCurrentUsrLastname($value); break; + case 15: + $this->setProId($value); + break; + case 16: + $this->setUsrId($value); + break; } // switch() } @@ -1177,6 +1273,14 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $this->setDelCurrentUsrLastname($arr[$keys[14]]); } + if (array_key_exists($keys[15], $arr)) { + $this->setProId($arr[$keys[15]]); + } + + if (array_key_exists($keys[16], $arr)) { + $this->setUsrId($arr[$keys[16]]); + } + } /** @@ -1248,6 +1352,14 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $criteria->add(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME, $this->del_current_usr_lastname); } + if ($this->isColumnModified(ListCompletedPeer::PRO_ID)) { + $criteria->add(ListCompletedPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListCompletedPeer::USR_ID)) { + $criteria->add(ListCompletedPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -1330,6 +1442,10 @@ abstract class BaseListCompleted extends BaseObject implements Persistent $copyObj->setDelCurrentUsrLastname($this->del_current_usr_lastname); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListCompletedPeer.php b/workflow/engine/classes/model/om/BaseListCompletedPeer.php index ad8546d19..4036783d8 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 = 15; + const NUM_COLUMNS = 17; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -76,6 +76,12 @@ abstract class BaseListCompletedPeer /** the column name for the DEL_CURRENT_USR_LASTNAME field */ const DEL_CURRENT_USR_LASTNAME = 'LIST_COMPLETED.DEL_CURRENT_USR_LASTNAME'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_COMPLETED.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_COMPLETED.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -87,10 +93,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', ), - 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, ), - 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', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) + 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, ) ); /** @@ -100,10 +106,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, ), - 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, ), - 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, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ) + 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, ) ); /** @@ -234,6 +240,10 @@ abstract class BaseListCompletedPeer $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME); + $criteria->addSelectColumn(ListCompletedPeer::PRO_ID); + + $criteria->addSelectColumn(ListCompletedPeer::USR_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 853fb2c59..43e963742 100644 --- a/workflow/engine/classes/model/om/BaseListInbox.php +++ b/workflow/engine/classes/model/om/BaseListInbox.php @@ -147,6 +147,24 @@ abstract class BaseListInbox extends BaseObject implements Persistent */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + + /** + * The value for the app_status_id field. + * @var int + */ + protected $app_status_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -486,6 +504,39 @@ abstract class BaseListInbox extends BaseObject implements Persistent return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + + /** + * Get the [app_status_id] column value. + * + * @return int + */ + public function getAppStatusId() + { + + return $this->app_status_id; + } + /** * Set the value of [app_uid] column. * @@ -961,6 +1012,72 @@ abstract class BaseListInbox extends BaseObject implements Persistent } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListInboxPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListInboxPeer::USR_ID; + } + + } // setUsrId() + + /** + * Set the value of [app_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setAppStatusId($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->app_status_id !== $v || $v === 0) { + $this->app_status_id = $v; + $this->modifiedColumns[] = ListInboxPeer::APP_STATUS_ID; + } + + } // setAppStatusId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1018,12 +1135,18 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->del_priority = $rs->getString($startcol + 19); + $this->pro_id = $rs->getInt($startcol + 20); + + $this->usr_id = $rs->getInt($startcol + 21); + + $this->app_status_id = $rs->getInt($startcol + 22); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 20; // 20 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 23; // 23 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListInbox object", $e); @@ -1287,6 +1410,15 @@ abstract class BaseListInbox extends BaseObject implements Persistent case 19: return $this->getDelPriority(); break; + case 20: + return $this->getProId(); + break; + case 21: + return $this->getUsrId(); + break; + case 22: + return $this->getAppStatusId(); + break; default: return null; break; @@ -1327,6 +1459,9 @@ abstract class BaseListInbox extends BaseObject implements Persistent $keys[17] => $this->getDelDueDate(), $keys[18] => $this->getDelRiskDate(), $keys[19] => $this->getDelPriority(), + $keys[20] => $this->getProId(), + $keys[21] => $this->getUsrId(), + $keys[22] => $this->getAppStatusId(), ); return $result; } @@ -1418,6 +1553,15 @@ abstract class BaseListInbox extends BaseObject implements Persistent case 19: $this->setDelPriority($value); break; + case 20: + $this->setProId($value); + break; + case 21: + $this->setUsrId($value); + break; + case 22: + $this->setAppStatusId($value); + break; } // switch() } @@ -1521,6 +1665,18 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->setDelPriority($arr[$keys[19]]); } + if (array_key_exists($keys[20], $arr)) { + $this->setProId($arr[$keys[20]]); + } + + if (array_key_exists($keys[21], $arr)) { + $this->setUsrId($arr[$keys[21]]); + } + + if (array_key_exists($keys[22], $arr)) { + $this->setAppStatusId($arr[$keys[22]]); + } + } /** @@ -1612,6 +1768,18 @@ abstract class BaseListInbox extends BaseObject implements Persistent $criteria->add(ListInboxPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListInboxPeer::PRO_ID)) { + $criteria->add(ListInboxPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListInboxPeer::USR_ID)) { + $criteria->add(ListInboxPeer::USR_ID, $this->usr_id); + } + + if ($this->isColumnModified(ListInboxPeer::APP_STATUS_ID)) { + $criteria->add(ListInboxPeer::APP_STATUS_ID, $this->app_status_id); + } + return $criteria; } @@ -1714,6 +1882,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + + $copyObj->setAppStatusId($this->app_status_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListInboxPeer.php b/workflow/engine/classes/model/om/BaseListInboxPeer.php index 4b667d641..19590e8ae 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 = 20; + const NUM_COLUMNS = 23; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -91,6 +91,15 @@ abstract class BaseListInboxPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_INBOX.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_INBOX.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_INBOX.USR_ID'; + + /** the column name for the APP_STATUS_ID field */ + const APP_STATUS_ID = 'LIST_INBOX.APP_STATUS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -102,10 +111,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', ), - 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, ), - 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', ), - 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', '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, ) ); /** @@ -115,10 +124,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, ), - 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, ), - 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, ), - 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, '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, ) ); /** @@ -259,6 +268,12 @@ abstract class BaseListInboxPeer $criteria->addSelectColumn(ListInboxPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListInboxPeer::PRO_ID); + + $criteria->addSelectColumn(ListInboxPeer::USR_ID); + + $criteria->addSelectColumn(ListInboxPeer::APP_STATUS_ID); + } const COUNT = 'COUNT(LIST_INBOX.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListMyInbox.php b/workflow/engine/classes/model/om/BaseListMyInbox.php index 56a9eb6f5..5db82bafa 100644 --- a/workflow/engine/classes/model/om/BaseListMyInbox.php +++ b/workflow/engine/classes/model/om/BaseListMyInbox.php @@ -177,6 +177,24 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + + /** + * The value for the app_status_id field. + * @var int + */ + protected $app_status_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -592,6 +610,39 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + + /** + * Get the [app_status_id] column value. + * + * @return int + */ + public function getAppStatusId() + { + + return $this->app_status_id; + } + /** * Set the value of [app_uid] column. * @@ -1184,6 +1235,72 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListMyInboxPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListMyInboxPeer::USR_ID; + } + + } // setUsrId() + + /** + * Set the value of [app_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setAppStatusId($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->app_status_id !== $v || $v === 0) { + $this->app_status_id = $v; + $this->modifiedColumns[] = ListMyInboxPeer::APP_STATUS_ID; + } + + } // setAppStatusId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1251,12 +1368,18 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $this->del_priority = $rs->getString($startcol + 24); + $this->pro_id = $rs->getInt($startcol + 25); + + $this->usr_id = $rs->getInt($startcol + 26); + + $this->app_status_id = $rs->getInt($startcol + 27); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 25; // 25 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 28; // 28 = ListMyInboxPeer::NUM_COLUMNS - ListMyInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListMyInbox object", $e); @@ -1535,6 +1658,15 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent case 24: return $this->getDelPriority(); break; + case 25: + return $this->getProId(); + break; + case 26: + return $this->getUsrId(); + break; + case 27: + return $this->getAppStatusId(); + break; default: return null; break; @@ -1580,6 +1712,9 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $keys[22] => $this->getDelInitDate(), $keys[23] => $this->getDelDueDate(), $keys[24] => $this->getDelPriority(), + $keys[25] => $this->getProId(), + $keys[26] => $this->getUsrId(), + $keys[27] => $this->getAppStatusId(), ); return $result; } @@ -1686,6 +1821,15 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent case 24: $this->setDelPriority($value); break; + case 25: + $this->setProId($value); + break; + case 26: + $this->setUsrId($value); + break; + case 27: + $this->setAppStatusId($value); + break; } // switch() } @@ -1809,6 +1953,18 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $this->setDelPriority($arr[$keys[24]]); } + if (array_key_exists($keys[25], $arr)) { + $this->setProId($arr[$keys[25]]); + } + + if (array_key_exists($keys[26], $arr)) { + $this->setUsrId($arr[$keys[26]]); + } + + if (array_key_exists($keys[27], $arr)) { + $this->setAppStatusId($arr[$keys[27]]); + } + } /** @@ -1920,6 +2076,18 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $criteria->add(ListMyInboxPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListMyInboxPeer::PRO_ID)) { + $criteria->add(ListMyInboxPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListMyInboxPeer::USR_ID)) { + $criteria->add(ListMyInboxPeer::USR_ID, $this->usr_id); + } + + if ($this->isColumnModified(ListMyInboxPeer::APP_STATUS_ID)) { + $criteria->add(ListMyInboxPeer::APP_STATUS_ID, $this->app_status_id); + } + return $criteria; } @@ -2022,6 +2190,12 @@ abstract class BaseListMyInbox extends BaseObject implements Persistent $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + + $copyObj->setAppStatusId($this->app_status_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListMyInboxPeer.php b/workflow/engine/classes/model/om/BaseListMyInboxPeer.php index 767848769..efc9fd78b 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 = 25; + const NUM_COLUMNS = 28; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -106,6 +106,15 @@ abstract class BaseListMyInboxPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_MY_INBOX.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_MY_INBOX.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_MY_INBOX.USR_ID'; + + /** the column name for the APP_STATUS_ID field */ + const APP_STATUS_ID = 'LIST_MY_INBOX.APP_STATUS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -117,10 +126,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', ), - 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, ), - 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', ), - 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, ) + 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, ) ); /** @@ -130,10 +139,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, ), - 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, ), - 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, ), - 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, ) + 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, ) ); /** @@ -284,6 +293,12 @@ abstract class BaseListMyInboxPeer $criteria->addSelectColumn(ListMyInboxPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListMyInboxPeer::PRO_ID); + + $criteria->addSelectColumn(ListMyInboxPeer::USR_ID); + + $criteria->addSelectColumn(ListMyInboxPeer::APP_STATUS_ID); + } const COUNT = 'COUNT(LIST_MY_INBOX.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListParticipatedHistory.php b/workflow/engine/classes/model/om/BaseListParticipatedHistory.php index ee0fc28bd..21b6ea21d 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedHistory.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedHistory.php @@ -147,6 +147,18 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -444,6 +456,28 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [app_uid] column. * @@ -905,6 +939,50 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListParticipatedHistoryPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListParticipatedHistoryPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -962,12 +1040,16 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $this->del_priority = $rs->getString($startcol + 19); + $this->pro_id = $rs->getInt($startcol + 20); + + $this->usr_id = $rs->getInt($startcol + 21); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 20; // 20 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 22; // 22 = ListParticipatedHistoryPeer::NUM_COLUMNS - ListParticipatedHistoryPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListParticipatedHistory object", $e); @@ -1231,6 +1313,12 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist case 19: return $this->getDelPriority(); break; + case 20: + return $this->getProId(); + break; + case 21: + return $this->getUsrId(); + break; default: return null; break; @@ -1271,6 +1359,8 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $keys[17] => $this->getDelInitDate(), $keys[18] => $this->getDelDueDate(), $keys[19] => $this->getDelPriority(), + $keys[20] => $this->getProId(), + $keys[21] => $this->getUsrId(), ); return $result; } @@ -1362,6 +1452,12 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist case 19: $this->setDelPriority($value); break; + case 20: + $this->setProId($value); + break; + case 21: + $this->setUsrId($value); + break; } // switch() } @@ -1465,6 +1561,14 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $this->setDelPriority($arr[$keys[19]]); } + if (array_key_exists($keys[20], $arr)) { + $this->setProId($arr[$keys[20]]); + } + + if (array_key_exists($keys[21], $arr)) { + $this->setUsrId($arr[$keys[21]]); + } + } /** @@ -1556,6 +1660,14 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $criteria->add(ListParticipatedHistoryPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListParticipatedHistoryPeer::PRO_ID)) { + $criteria->add(ListParticipatedHistoryPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListParticipatedHistoryPeer::USR_ID)) { + $criteria->add(ListParticipatedHistoryPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -1658,6 +1770,10 @@ abstract class BaseListParticipatedHistory extends BaseObject implements Persist $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php b/workflow/engine/classes/model/om/BaseListParticipatedHistoryPeer.php index eed3e090c..b98041939 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 = 20; + const NUM_COLUMNS = 22; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -91,6 +91,12 @@ abstract class BaseListParticipatedHistoryPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_PARTICIPATED_HISTORY.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_PARTICIPATED_HISTORY.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_PARTICIPATED_HISTORY.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -102,10 +108,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', ), - 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, ), - 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', ), - 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', '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, ) ); /** @@ -115,10 +121,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, ), - 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, ), - 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, ), - 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, '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, ) ); /** @@ -259,6 +265,10 @@ abstract class BaseListParticipatedHistoryPeer $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListParticipatedHistoryPeer::PRO_ID); + + $criteria->addSelectColumn(ListParticipatedHistoryPeer::USR_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 bac15d720..c378be9da 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedLast.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedLast.php @@ -165,6 +165,24 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent */ protected $del_thread_status = 'OPEN'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + + /** + * The value for the app_status_id field. + * @var int + */ + protected $app_status_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -495,6 +513,39 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->del_thread_status; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + + /** + * Get the [app_status_id] column value. + * + * @return int + */ + public function getAppStatusId() + { + + return $this->app_status_id; + } + /** * Set the value of [app_uid] column. * @@ -1022,6 +1073,72 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } // setDelThreadStatus() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListParticipatedLastPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListParticipatedLastPeer::USR_ID; + } + + } // setUsrId() + + /** + * Set the value of [app_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setAppStatusId($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->app_status_id !== $v || $v === 0) { + $this->app_status_id = $v; + $this->modifiedColumns[] = ListParticipatedLastPeer::APP_STATUS_ID; + } + + } // setAppStatusId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1085,12 +1202,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->del_thread_status = $rs->getString($startcol + 22); + $this->pro_id = $rs->getInt($startcol + 23); + + $this->usr_id = $rs->getInt($startcol + 24); + + $this->app_status_id = $rs->getInt($startcol + 25); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 23; // 23 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 26; // 26 = ListParticipatedLastPeer::NUM_COLUMNS - ListParticipatedLastPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListParticipatedLast object", $e); @@ -1363,6 +1486,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent case 22: return $this->getDelThreadStatus(); break; + case 23: + return $this->getProId(); + break; + case 24: + return $this->getUsrId(); + break; + case 25: + return $this->getAppStatusId(); + break; default: return null; break; @@ -1406,6 +1538,9 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $keys[20] => $this->getDelDueDate(), $keys[21] => $this->getDelPriority(), $keys[22] => $this->getDelThreadStatus(), + $keys[23] => $this->getProId(), + $keys[24] => $this->getUsrId(), + $keys[25] => $this->getAppStatusId(), ); return $result; } @@ -1506,6 +1641,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent case 22: $this->setDelThreadStatus($value); break; + case 23: + $this->setProId($value); + break; + case 24: + $this->setUsrId($value); + break; + case 25: + $this->setAppStatusId($value); + break; } // switch() } @@ -1621,6 +1765,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->setDelThreadStatus($arr[$keys[22]]); } + if (array_key_exists($keys[23], $arr)) { + $this->setProId($arr[$keys[23]]); + } + + if (array_key_exists($keys[24], $arr)) { + $this->setUsrId($arr[$keys[24]]); + } + + if (array_key_exists($keys[25], $arr)) { + $this->setAppStatusId($arr[$keys[25]]); + } + } /** @@ -1724,6 +1880,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $criteria->add(ListParticipatedLastPeer::DEL_THREAD_STATUS, $this->del_thread_status); } + if ($this->isColumnModified(ListParticipatedLastPeer::PRO_ID)) { + $criteria->add(ListParticipatedLastPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListParticipatedLastPeer::USR_ID)) { + $criteria->add(ListParticipatedLastPeer::USR_ID, $this->usr_id); + } + + if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS_ID)) { + $criteria->add(ListParticipatedLastPeer::APP_STATUS_ID, $this->app_status_id); + } + return $criteria; } @@ -1835,6 +2003,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $copyObj->setDelThreadStatus($this->del_thread_status); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + + $copyObj->setAppStatusId($this->app_status_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php index 04abd7170..1d1eb92e9 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 = 23; + const NUM_COLUMNS = 26; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -100,6 +100,15 @@ abstract class BaseListParticipatedLastPeer /** the column name for the DEL_THREAD_STATUS field */ const DEL_THREAD_STATUS = 'LIST_PARTICIPATED_LAST.DEL_THREAD_STATUS'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_PARTICIPATED_LAST.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_PARTICIPATED_LAST.USR_ID'; + + /** the column name for the APP_STATUS_ID field */ + const APP_STATUS_ID = 'LIST_PARTICIPATED_LAST.APP_STATUS_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -111,10 +120,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', ), - 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, ), - 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', ), - 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', '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, ) ); /** @@ -124,10 +133,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, ), - 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, ), - 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, ), - 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, '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, ) ); /** @@ -274,6 +283,12 @@ abstract class BaseListParticipatedLastPeer $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS); + $criteria->addSelectColumn(ListParticipatedLastPeer::PRO_ID); + + $criteria->addSelectColumn(ListParticipatedLastPeer::USR_ID); + + $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS_ID); + } const COUNT = 'COUNT(LIST_PARTICIPATED_LAST.APP_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListPaused.php b/workflow/engine/classes/model/om/BaseListPaused.php index 9233bc9f9..f5f8e75fd 100644 --- a/workflow/engine/classes/model/om/BaseListPaused.php +++ b/workflow/engine/classes/model/om/BaseListPaused.php @@ -159,6 +159,18 @@ abstract class BaseListPaused extends BaseObject implements Persistent */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -520,6 +532,28 @@ abstract class BaseListPaused extends BaseObject implements Persistent return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [app_uid] column. * @@ -1039,6 +1073,50 @@ abstract class BaseListPaused extends BaseObject implements Persistent } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListPausedPeer::PRO_ID; + } + + } // setProId() + + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListPausedPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1100,12 +1178,16 @@ abstract class BaseListPaused extends BaseObject implements Persistent $this->del_priority = $rs->getString($startcol + 21); + $this->pro_id = $rs->getInt($startcol + 22); + + $this->usr_id = $rs->getInt($startcol + 23); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 22; // 22 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 24; // 24 = ListPausedPeer::NUM_COLUMNS - ListPausedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListPaused object", $e); @@ -1375,6 +1457,12 @@ abstract class BaseListPaused extends BaseObject implements Persistent case 21: return $this->getDelPriority(); break; + case 22: + return $this->getProId(); + break; + case 23: + return $this->getUsrId(); + break; default: return null; break; @@ -1417,6 +1505,8 @@ abstract class BaseListPaused extends BaseObject implements Persistent $keys[19] => $this->getDelInitDate(), $keys[20] => $this->getDelDueDate(), $keys[21] => $this->getDelPriority(), + $keys[22] => $this->getProId(), + $keys[23] => $this->getUsrId(), ); return $result; } @@ -1514,6 +1604,12 @@ abstract class BaseListPaused extends BaseObject implements Persistent case 21: $this->setDelPriority($value); break; + case 22: + $this->setProId($value); + break; + case 23: + $this->setUsrId($value); + break; } // switch() } @@ -1625,6 +1721,14 @@ abstract class BaseListPaused extends BaseObject implements Persistent $this->setDelPriority($arr[$keys[21]]); } + if (array_key_exists($keys[22], $arr)) { + $this->setProId($arr[$keys[22]]); + } + + if (array_key_exists($keys[23], $arr)) { + $this->setUsrId($arr[$keys[23]]); + } + } /** @@ -1724,6 +1828,14 @@ abstract class BaseListPaused extends BaseObject implements Persistent $criteria->add(ListPausedPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListPausedPeer::PRO_ID)) { + $criteria->add(ListPausedPeer::PRO_ID, $this->pro_id); + } + + if ($this->isColumnModified(ListPausedPeer::USR_ID)) { + $criteria->add(ListPausedPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -1830,6 +1942,10 @@ abstract class BaseListPaused extends BaseObject implements Persistent $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListPausedPeer.php b/workflow/engine/classes/model/om/BaseListPausedPeer.php index 16d0ec452..59b17a14c 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 = 22; + const NUM_COLUMNS = 24; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -97,6 +97,12 @@ abstract class BaseListPausedPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_PAUSED.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_PAUSED.PRO_ID'; + + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_PAUSED.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -108,10 +114,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', ), - 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, ), - 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', ), - 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', '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, ) ); /** @@ -121,10 +127,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, ), - 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, ), - 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, ), - 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, '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, ) ); /** @@ -269,6 +275,10 @@ abstract class BaseListPausedPeer $criteria->addSelectColumn(ListPausedPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListPausedPeer::PRO_ID); + + $criteria->addSelectColumn(ListPausedPeer::USR_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 b019cf313..3a453da76 100644 --- a/workflow/engine/classes/model/om/BaseListUnassigned.php +++ b/workflow/engine/classes/model/om/BaseListUnassigned.php @@ -123,6 +123,12 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent */ protected $del_priority = '3'; + /** + * The value for the pro_id field. + * @var int + */ + protected $pro_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -376,6 +382,17 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent return $this->del_priority; } + /** + * Get the [pro_id] column value. + * + * @return int + */ + public function getProId() + { + + return $this->pro_id; + } + /** * Set the value of [app_uid] column. * @@ -749,6 +766,28 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent } // setDelPriority() + /** + * Set the value of [pro_id] column. + * + * @param int $v new value + * @return void + */ + public function setProId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->pro_id !== $v || $v === 0) { + $this->pro_id = $v; + $this->modifiedColumns[] = ListUnassignedPeer::PRO_ID; + } + + } // setProId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -798,12 +837,14 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $this->del_priority = $rs->getString($startcol + 15); + $this->pro_id = $rs->getInt($startcol + 16); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 16; // 16 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 17; // 17 = ListUnassignedPeer::NUM_COLUMNS - ListUnassignedPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListUnassigned object", $e); @@ -1055,6 +1096,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent case 15: return $this->getDelPriority(); break; + case 16: + return $this->getProId(); + break; default: return null; break; @@ -1091,6 +1135,7 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $keys[13] => $this->getDelDelegateDate(), $keys[14] => $this->getDelDueDate(), $keys[15] => $this->getDelPriority(), + $keys[16] => $this->getProId(), ); return $result; } @@ -1170,6 +1215,9 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent case 15: $this->setDelPriority($value); break; + case 16: + $this->setProId($value); + break; } // switch() } @@ -1257,6 +1305,10 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $this->setDelPriority($arr[$keys[15]]); } + if (array_key_exists($keys[16], $arr)) { + $this->setProId($arr[$keys[16]]); + } + } /** @@ -1332,6 +1384,10 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $criteria->add(ListUnassignedPeer::DEL_PRIORITY, $this->del_priority); } + if ($this->isColumnModified(ListUnassignedPeer::PRO_ID)) { + $criteria->add(ListUnassignedPeer::PRO_ID, $this->pro_id); + } + return $criteria; } @@ -1426,6 +1482,8 @@ abstract class BaseListUnassigned extends BaseObject implements Persistent $copyObj->setDelPriority($this->del_priority); + $copyObj->setProId($this->pro_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListUnassignedGroup.php b/workflow/engine/classes/model/om/BaseListUnassignedGroup.php index 4b586fa0b..e6d32701b 100644 --- a/workflow/engine/classes/model/om/BaseListUnassignedGroup.php +++ b/workflow/engine/classes/model/om/BaseListUnassignedGroup.php @@ -51,6 +51,12 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent */ protected $typ_uid = ''; + /** + * The value for the usr_id field. + * @var int + */ + protected $usr_id = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -109,6 +115,17 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent return $this->typ_uid; } + /** + * Get the [usr_id] column value. + * + * @return int + */ + public function getUsrId() + { + + return $this->usr_id; + } + /** * Set the value of [una_uid] column. * @@ -197,6 +214,28 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent } // setTypUid() + /** + * Set the value of [usr_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrId($v) + { + + // Since the native PHP type for this column is integer, + // we will cast the input value to an int (if it is not). + if ($v !== null && !is_int($v) && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->usr_id !== $v || $v === 0) { + $this->usr_id = $v; + $this->modifiedColumns[] = ListUnassignedGroupPeer::USR_ID; + } + + } // setUsrId() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -222,12 +261,14 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent $this->typ_uid = $rs->getString($startcol + 3); + $this->usr_id = $rs->getInt($startcol + 4); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 4; // 4 = ListUnassignedGroupPeer::NUM_COLUMNS - ListUnassignedGroupPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 5; // 5 = ListUnassignedGroupPeer::NUM_COLUMNS - ListUnassignedGroupPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListUnassignedGroup object", $e); @@ -443,6 +484,9 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent case 3: return $this->getTypUid(); break; + case 4: + return $this->getUsrId(); + break; default: return null; break; @@ -467,6 +511,7 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent $keys[1] => $this->getUsrUid(), $keys[2] => $this->getType(), $keys[3] => $this->getTypUid(), + $keys[4] => $this->getUsrId(), ); return $result; } @@ -510,6 +555,9 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent case 3: $this->setTypUid($value); break; + case 4: + $this->setUsrId($value); + break; } // switch() } @@ -549,6 +597,10 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent $this->setTypUid($arr[$keys[3]]); } + if (array_key_exists($keys[4], $arr)) { + $this->setUsrId($arr[$keys[4]]); + } + } /** @@ -576,6 +628,10 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent $criteria->add(ListUnassignedGroupPeer::TYP_UID, $this->typ_uid); } + if ($this->isColumnModified(ListUnassignedGroupPeer::USR_ID)) { + $criteria->add(ListUnassignedGroupPeer::USR_ID, $this->usr_id); + } + return $criteria; } @@ -649,6 +705,8 @@ abstract class BaseListUnassignedGroup extends BaseObject implements Persistent $copyObj->setTypUid($this->typ_uid); + $copyObj->setUsrId($this->usr_id); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseListUnassignedGroupPeer.php b/workflow/engine/classes/model/om/BaseListUnassignedGroupPeer.php index 131c82a82..9eae63c9a 100644 --- a/workflow/engine/classes/model/om/BaseListUnassignedGroupPeer.php +++ b/workflow/engine/classes/model/om/BaseListUnassignedGroupPeer.php @@ -25,7 +25,7 @@ abstract class BaseListUnassignedGroupPeer const CLASS_DEFAULT = 'classes.model.ListUnassignedGroup'; /** The total number of columns. */ - const NUM_COLUMNS = 4; + const NUM_COLUMNS = 5; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -43,6 +43,9 @@ abstract class BaseListUnassignedGroupPeer /** the column name for the TYP_UID field */ const TYP_UID = 'LIST_UNASSIGNED_GROUP.TYP_UID'; + /** the column name for the USR_ID field */ + const USR_ID = 'LIST_UNASSIGNED_GROUP.USR_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -54,10 +57,10 @@ abstract class BaseListUnassignedGroupPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('UnaUid', 'UsrUid', 'Type', 'TypUid', ), - BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID, ListUnassignedGroupPeer::USR_UID, ListUnassignedGroupPeer::TYPE, ListUnassignedGroupPeer::TYP_UID, ), - BasePeer::TYPE_FIELDNAME => array ('UNA_UID', 'USR_UID', 'TYPE', 'TYP_UID', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('UnaUid', 'UsrUid', 'Type', 'TypUid', 'UsrId', ), + BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID, ListUnassignedGroupPeer::USR_UID, ListUnassignedGroupPeer::TYPE, ListUnassignedGroupPeer::TYP_UID, ListUnassignedGroupPeer::USR_ID, ), + BasePeer::TYPE_FIELDNAME => array ('UNA_UID', 'USR_UID', 'TYPE', 'TYP_UID', 'USR_ID', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); /** @@ -67,10 +70,10 @@ abstract class BaseListUnassignedGroupPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('UnaUid' => 0, 'UsrUid' => 1, 'Type' => 2, 'TypUid' => 3, ), - BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID => 0, ListUnassignedGroupPeer::USR_UID => 1, ListUnassignedGroupPeer::TYPE => 2, ListUnassignedGroupPeer::TYP_UID => 3, ), - BasePeer::TYPE_FIELDNAME => array ('UNA_UID' => 0, 'USR_UID' => 1, 'TYPE' => 2, 'TYP_UID' => 3, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, ) + BasePeer::TYPE_PHPNAME => array ('UnaUid' => 0, 'UsrUid' => 1, 'Type' => 2, 'TypUid' => 3, 'UsrId' => 4, ), + BasePeer::TYPE_COLNAME => array (ListUnassignedGroupPeer::UNA_UID => 0, ListUnassignedGroupPeer::USR_UID => 1, ListUnassignedGroupPeer::TYPE => 2, ListUnassignedGroupPeer::TYP_UID => 3, ListUnassignedGroupPeer::USR_ID => 4, ), + BasePeer::TYPE_FIELDNAME => array ('UNA_UID' => 0, 'USR_UID' => 1, 'TYPE' => 2, 'TYP_UID' => 3, 'USR_ID' => 4, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) ); /** @@ -179,6 +182,8 @@ abstract class BaseListUnassignedGroupPeer $criteria->addSelectColumn(ListUnassignedGroupPeer::TYP_UID); + $criteria->addSelectColumn(ListUnassignedGroupPeer::USR_ID); + } const COUNT = 'COUNT(LIST_UNASSIGNED_GROUP.UNA_UID)'; diff --git a/workflow/engine/classes/model/om/BaseListUnassignedPeer.php b/workflow/engine/classes/model/om/BaseListUnassignedPeer.php index b6fd1db99..3464caa94 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 = 16; + const NUM_COLUMNS = 17; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -79,6 +79,9 @@ abstract class BaseListUnassignedPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_UNASSIGNED.DEL_PRIORITY'; + /** the column name for the PRO_ID field */ + const PRO_ID = 'LIST_UNASSIGNED.PRO_ID'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -90,10 +93,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', ), - 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, ), - 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', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ) + 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, ) ); /** @@ -103,10 +106,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, ), - 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, ), - 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, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, ) + 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, ) ); /** @@ -239,6 +242,8 @@ abstract class BaseListUnassignedPeer $criteria->addSelectColumn(ListUnassignedPeer::DEL_PRIORITY); + $criteria->addSelectColumn(ListUnassignedPeer::PRO_ID); + } const COUNT = 'COUNT(LIST_UNASSIGNED.APP_UID)'; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 26e009631..aaf7431f0 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4184,6 +4184,9 @@ + + + @@ -4214,6 +4217,12 @@ + + + + + + @@ -4256,6 +4265,8 @@ + + @@ -4266,6 +4277,12 @@ + + + + + +
@@ -4311,6 +4328,9 @@ + + + @@ -4329,6 +4349,12 @@ + + + + + +
@@ -4366,6 +4392,14 @@ + + + + + + + + @@ -4419,6 +4453,14 @@ + + + + + + + + @@ -4468,6 +4510,14 @@ + + + + + + + + @@ -4524,6 +4574,15 @@ + + + + + + + + +
@@ -4562,6 +4621,10 @@ + + + +
@@ -4588,6 +4651,10 @@ + + + +
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 6fb60490c..d496e7968 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -2359,10 +2359,15 @@ CREATE TABLE `LIST_INBOX` `DEL_DUE_DATE` DATETIME, `DEL_RISK_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, + `PRO_ID` INTEGER default 0, + `USR_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 `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_HISTORY @@ -2393,8 +2398,12 @@ CREATE TABLE `LIST_PARTICIPATED_HISTORY` `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, + `PRO_ID` INTEGER default 0, + `USR_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), - KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) + KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated history list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_LAST @@ -2428,9 +2437,14 @@ CREATE TABLE `LIST_PARTICIPATED_LAST` `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, `DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL, + `PRO_ID` INTEGER default 0, + `USR_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 `delDelegateDate`(`DEL_DELEGATE_DATE`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list'; #----------------------------------------------------------------------------- #-- LIST_COMPLETED @@ -2456,7 +2470,11 @@ CREATE TABLE `LIST_COMPLETED` `DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '', `DEL_CURRENT_USR_FIRSTNAME` VARCHAR(50) default '', `DEL_CURRENT_USR_LASTNAME` VARCHAR(50) default '', + `PRO_ID` INTEGER default 0, + `USR_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`), KEY `usrListCompleted`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Completed list'; #----------------------------------------------------------------------------- @@ -2490,7 +2508,11 @@ CREATE TABLE `LIST_PAUSED` `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, + `PRO_ID` INTEGER default 0, + `USR_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`), KEY `indexPausedUser`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Paused list'; #----------------------------------------------------------------------------- @@ -2520,7 +2542,11 @@ CREATE TABLE `LIST_CANCELED` `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, + `PRO_ID` INTEGER default 0, + `USR_ID` INTEGER default 0, PRIMARY KEY (`APP_UID`), + KEY `INDEX_PRO_ID`(`PRO_ID`), + KEY `INDEX_USR_ID`(`USR_ID`), KEY `indexCanceledUser`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Canceled list'; #----------------------------------------------------------------------------- @@ -2557,7 +2583,12 @@ CREATE TABLE `LIST_MY_INBOX` `DEL_INIT_DATE` DATETIME, `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, - PRIMARY KEY (`APP_UID`) + `PRO_ID` INTEGER default 0, + `USR_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`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='My Inbox list'; #----------------------------------------------------------------------------- #-- LIST_UNASSIGNED @@ -2584,7 +2615,9 @@ CREATE TABLE `LIST_UNASSIGNED` `DEL_DELEGATE_DATE` DATETIME NOT NULL, `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, - PRIMARY KEY (`APP_UID`,`DEL_INDEX`) + `PRO_ID` INTEGER default 0, + PRIMARY KEY (`APP_UID`,`DEL_INDEX`), + KEY `INDEX_PRO_ID`(`PRO_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Unassigned list'; #----------------------------------------------------------------------------- #-- LIST_UNASSIGNED_GROUP @@ -2599,7 +2632,9 @@ CREATE TABLE `LIST_UNASSIGNED_GROUP` `USR_UID` VARCHAR(32) default '' NOT NULL, `TYPE` VARCHAR(255) default '' NOT NULL, `TYP_UID` VARCHAR(32) default '' NOT NULL, - PRIMARY KEY (`UNA_UID`,`USR_UID`,`TYPE`) + `USR_ID` INTEGER default 0, + PRIMARY KEY (`UNA_UID`,`USR_UID`,`TYPE`), + KEY `INDEX_USR_ID`(`USR_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Unassiged list'; #----------------------------------------------------------------------------- #-- MESSAGE_TYPE From 7b980b407d4ba40ae3acb1cef696c9f0af2bed10 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 16 Feb 2017 11:29:02 -0400 Subject: [PATCH 02/13] + Script to fill ID columns --- workflow/engine/bin/tasks/cliListIds.php | 83 ++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 workflow/engine/bin/tasks/cliListIds.php diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php new file mode 100644 index 000000000..c465f00d9 --- /dev/null +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -0,0 +1,83 @@ +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + * @author Alexandre Rosenfeld + * @package workflow-engine-bin-tasks + */ +CLI::taskName('list-ids'); +CLI::taskDescription(<< $workspace) { + $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']); + $hostPort = $hostPort1[0].(isset($hostPort[1]) ? ";port=".$hostPort[1] : ""); + $connectionString = sprintf("%s:host=%s;dbname=%s", + $workspace->dbInfo['DB_ADAPTER'], $hostPort, + $workspace->dbInfo['DB_NAME']); + $dbh = new PDO( + $connectionString, + $workspace->dbInfo['DB_USER'], + $workspace->dbInfo['DB_PASS'] + ); + $dbh->query('UPDATE LIST_CANCELLED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);'); + $dbh->query('UPDATE LIST_COMPLETED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); + $dbh->query('UPDATE LIST_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); + $dbh->query('UPDATE LIST_MY_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); + $dbh->query('UPDATE LIST_PARTICIPATED_HISTORY SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); + $dbh->query('UPDATE LIST_PARTICIPATED_LAST SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); + $dbh->query('UPDATE LIST_PAUSED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); + $dbh->query('UPDATE LIST_UNASSIGNED SET ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); + $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID); ' + ); + } + + //Done + CLI::logging("list-ids\n"); +} From a8ad109ce84c48d24c7489a595e70a4180cb5f4e Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 16 Feb 2017 14:29:52 -0400 Subject: [PATCH 03/13] + Add ListUnassignedGroup --- workflow/engine/classes/model/ListUnassignedGroup.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 9d7538fd2..5086f4b46 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -24,6 +24,8 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function create($data) { + $u = new Users(); + if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); From 4331dcfc764dd0968cbad8e9418d8cb967210342 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 16 Feb 2017 16:40:59 -0400 Subject: [PATCH 04/13] - Remove license text --- workflow/engine/bin/tasks/cliListIds.php | 25 ------------------------ 1 file changed, 25 deletions(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index c465f00d9..767ed8b95 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -1,29 +1,4 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - * @author Alexandre Rosenfeld - * @package workflow-engine-bin-tasks - */ CLI::taskName('list-ids'); CLI::taskDescription(<< Date: Mon, 20 Feb 2017 11:15:23 -0400 Subject: [PATCH 05/13] fix code style add to upgrade --- workflow/engine/bin/tasks/cliListIds.php | 5 ++- workflow/engine/classes/class.wsTools.php | 34 +++++++++++++++++++ .../engine/classes/model/ListCanceled.php | 16 ++++++--- .../engine/classes/model/ListCompleted.php | 16 ++++++--- workflow/engine/classes/model/ListInbox.php | 16 ++++++--- workflow/engine/classes/model/ListMyInbox.php | 12 +++++-- .../classes/model/ListParticipatedHistory.php | 16 ++++++--- .../classes/model/ListParticipatedLast.php | 16 ++++++--- workflow/engine/classes/model/ListPaused.php | 16 ++++++--- .../engine/classes/model/ListUnassigned.php | 8 +++-- .../classes/model/ListUnassignedGroup.php | 7 +++- 11 files changed, 129 insertions(+), 33 deletions(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index 767ed8b95..6bbe1c218 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -16,7 +16,7 @@ function list_ids($command, $args) foreach ($workspaces as $index => $workspace) { $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']); - $hostPort = $hostPort1[0].(isset($hostPort[1]) ? ";port=".$hostPort[1] : ""); + $hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : ""); $connectionString = sprintf("%s:host=%s;dbname=%s", $workspace->dbInfo['DB_ADAPTER'], $hostPort, $workspace->dbInfo['DB_NAME']); @@ -49,8 +49,7 @@ function list_ids($command, $args) $dbh->query('UPDATE LIST_UNASSIGNED SET ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID); ' - ); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); } //Done diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 7b5047092..dc4b808d2 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -3587,6 +3587,40 @@ class workspaceTools $con->commit(); CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n"); + + // Populating PRO_ID, USR_ID + CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* \n"); + $con->begin(); + $stmt = $con->createStatement(); + $rs = $stmt->executeQuery(); + $stmt->executeQuery('UPDATE LIST_CANCELLED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_COMPLETED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); + $stmt->executeQuery('UPDATE LIST_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_MY_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_PAUSED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_UNASSIGNED SET ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); + $con->commit(); + + CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n"); } } diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index fcb29f87a..4b2ada9d7 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -106,9 +106,13 @@ class ListCanceled extends BaseListCanceled { BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -137,9 +141,13 @@ class ListCanceled extends BaseListCanceled { public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 a17923153..698d3fbc9 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -98,9 +98,13 @@ class ListCompleted extends BaseListCompleted BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -129,9 +133,13 @@ class ListCompleted extends BaseListCompleted public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 3e2a5c652..4804e0a32 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -33,9 +33,13 @@ class ListInbox extends BaseListInbox $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { $result = $this->save(); @@ -151,9 +155,13 @@ class ListInbox extends BaseListInbox } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 1845d8ad8..68947f79c 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -26,9 +26,13 @@ class ListMyInbox extends BaseListMyInbox public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if (!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if (!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -59,7 +63,9 @@ class ListMyInbox extends BaseListMyInbox $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 9c8cfc0e5..d158ea00b 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -26,9 +26,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -57,9 +61,13 @@ class ListParticipatedHistory extends BaseListParticipatedHistory public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_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 a8f6235cd..945f43fce 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -71,9 +71,13 @@ class ListParticipatedLast extends BaseListParticipatedLast } $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -103,9 +107,13 @@ class ListParticipatedLast extends BaseListParticipatedLast { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 91d7f6cd8..d4b67d7a2 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -115,9 +115,13 @@ class ListPaused extends BaseListPaused { $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -146,9 +150,13 @@ class ListPaused extends BaseListPaused { public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 8d2c92b78..3fa12a6d8 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -27,7 +27,9 @@ class ListUnassigned extends BaseListUnassigned public function create($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -56,7 +58,9 @@ class ListUnassigned extends BaseListUnassigned public function update($data) { $p = new Process(); - if(!empty($data['PRO_UID'])) $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 5086f4b46..5bd90dda6 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -25,7 +25,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { public function create($data) { $u = new Users(); - if(!empty($data['USR_UID'])) $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -52,6 +54,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { + if(!empty($data['USR_UID'])) { + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { $con->begin(); From d6ce82cef474db2588c9f444a77da22e95f8942e Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Mon, 20 Feb 2017 13:08:08 -0400 Subject: [PATCH 06/13] + Add TAS_ID --- .../engine/classes/model/ListCanceled.php | 8 +++ .../engine/classes/model/ListCompleted.php | 8 +++ workflow/engine/classes/model/ListInbox.php | 8 +++ workflow/engine/classes/model/ListMyInbox.php | 8 +++ .../classes/model/ListParticipatedHistory.php | 8 +++ .../classes/model/ListParticipatedLast.php | 8 +++ .../engine/classes/model/ListUnassigned.php | 8 +++ .../model/map/ListCanceledMapBuilder.php | 2 + .../model/map/ListCompletedMapBuilder.php | 2 + .../classes/model/map/ListInboxMapBuilder.php | 2 + .../model/map/ListMyInboxMapBuilder.php | 2 + .../map/ListParticipatedHistoryMapBuilder.php | 2 + .../map/ListParticipatedLastMapBuilder.php | 2 + .../model/map/ListPausedMapBuilder.php | 2 + .../model/map/ListUnassignedMapBuilder.php | 2 + .../classes/model/om/BaseListCanceled.php | 60 ++++++++++++++++- .../classes/model/om/BaseListCanceledPeer.php | 23 ++++--- .../classes/model/om/BaseListCompleted.php | 60 ++++++++++++++++- .../model/om/BaseListCompletedPeer.php | 23 ++++--- .../engine/classes/model/om/BaseListInbox.php | 66 +++++++++++++++++-- .../classes/model/om/BaseListInboxPeer.php | 23 ++++--- .../classes/model/om/BaseListMyInbox.php | 66 +++++++++++++++++-- .../classes/model/om/BaseListMyInboxPeer.php | 23 ++++--- .../model/om/BaseListParticipatedHistory.php | 60 ++++++++++++++++- .../om/BaseListParticipatedHistoryPeer.php | 23 ++++--- .../model/om/BaseListParticipatedLast.php | 66 +++++++++++++++++-- .../model/om/BaseListParticipatedLastPeer.php | 23 ++++--- .../classes/model/om/BaseListPaused.php | 60 ++++++++++++++++- .../classes/model/om/BaseListPausedPeer.php | 23 ++++--- .../classes/model/om/BaseListUnassigned.php | 60 ++++++++++++++++- .../model/om/BaseListUnassignedPeer.php | 23 ++++--- workflow/engine/config/schema.xml | 35 ++++++++++ workflow/engine/data/mysql/schema.sql | 29 ++++++-- 33 files changed, 723 insertions(+), 95 deletions(-) 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 4804e0a32..fc41a02eb 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 3fa12a6d8..0b29dc637 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 From 2eae17f1bfe3a8e4a93f57c2f4c20e25c48b8456 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Mon, 20 Feb 2017 13:21:22 -0400 Subject: [PATCH 07/13] Update script to upgrade the database --- workflow/engine/bin/tasks/cliListIds.php | 18 +++++++--- workflow/engine/classes/class.wsTools.php | 43 +++++++++++++---------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index 6bbe1c218..e081f9078 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -10,7 +10,7 @@ CLI::taskRun("list_ids"); function list_ids($command, $args) { - CLI::logging("list-ids\n"); + CLI::logging("list-ids INIT\n"); $workspaces = get_workspaces_from_args($command); @@ -25,33 +25,41 @@ function list_ids($command, $args) $workspace->dbInfo['DB_USER'], $workspace->dbInfo['DB_PASS'] ); - $dbh->query('UPDATE LIST_CANCELLED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);'); + $dbh->query('UPDATE LIST_CANCELED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID);'); $dbh->query('UPDATE LIST_COMPLETED SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); $dbh->query('UPDATE LIST_INBOX SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); $dbh->query('UPDATE LIST_MY_INBOX SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); $dbh->query('UPDATE LIST_PARTICIPATED_HISTORY SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); $dbh->query('UPDATE LIST_PARTICIPATED_LAST SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); $dbh->query('UPDATE LIST_PAUSED SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); $dbh->query('UPDATE LIST_UNASSIGNED SET ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); } //Done - CLI::logging("list-ids\n"); + CLI::logging("list-ids DONE\n"); } diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index dc4b808d2..2db50e75e 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -3589,35 +3589,42 @@ class workspaceTools CLI::logging("-> Migrating And Populating Indexing for avoiding the use of table APP_CACHE_VIEW Done \n"); // Populating PRO_ID, USR_ID - CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* \n"); + CLI::logging("-> Populating PRO_ID, USR_ID at LIST_* \n"); $con->begin(); $stmt = $con->createStatement(); - $rs = $stmt->executeQuery(); - $stmt->executeQuery('UPDATE LIST_CANCELLED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELLED.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELLED.PRO_UID);'); + $stmt->executeQuery('UPDATE LIST_CANCELED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_COMPLETED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_MY_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_PAUSED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_UNASSIGNED SET ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)'); $stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)'); $con->commit(); CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n"); From dee100d22b0388427a39ffa3d4ecb95f390fbd8d Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Mon, 20 Feb 2017 13:23:59 -0400 Subject: [PATCH 08/13] added semicolon --- workflow/engine/bin/tasks/cliListIds.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index e081f9078..00fa8153a 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -32,7 +32,7 @@ function list_ids($command, $args) $dbh->query('UPDATE LIST_COMPLETED SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID);'); $dbh->query('UPDATE LIST_INBOX SET ' . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' From 89a4e7681ffba9ba3dbe9a34af0deceb16effc21 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Mon, 20 Feb 2017 17:37:03 -0400 Subject: [PATCH 09/13] fixes --- workflow/engine/classes/class.wsTools.php | 2 +- workflow/engine/classes/model/ListInbox.php | 2 +- workflow/engine/classes/model/ListMyInbox.php | 4 +++- workflow/engine/classes/model/ListUnassignedGroup.php | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 2db50e75e..bb271fe17 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -3627,7 +3627,7 @@ class workspaceTools . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)'); $con->commit(); - CLI::logging("-> Populating PRO_ID, USR_ID aat LIST_* Done \n"); + CLI::logging("-> Populating PRO_ID, USR_ID at LIST_* Done \n"); } } diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index fc41a02eb..3dff55f07 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -160,7 +160,7 @@ class ListInbox extends BaseListInbox $p = new Process(); if (!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } $u = new Users(); if (!empty($data['USR_UID'])) { diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index fbf8a2c7a..f20ef41f5 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -65,7 +65,9 @@ class ListMyInbox extends BaseListMyInbox public function update($data) { $p = new Process(); - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + if(!empty($data['PRO_UID'])) { + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + } $u = new Users(); if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 5bd90dda6..242f7802f 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -54,6 +54,7 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { + $u = new Users(); if(!empty($data['USR_UID'])) { $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } From f49fe0bb061d251596794e10dd6ce12c4cb942e8 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Tue, 21 Feb 2017 16:25:17 -0400 Subject: [PATCH 10/13] Improve ifs Remove PRO_ID update because it is not required Refresh APP_STATUS_ID --- workflow/engine/bin/tasks/cliListIds.php | 39 ++-------- workflow/engine/classes/class.wsTools.php | 71 ++++++++++--------- .../engine/classes/model/ListCanceled.php | 18 ++--- .../engine/classes/model/ListCompleted.php | 18 ++--- workflow/engine/classes/model/ListInbox.php | 20 +++--- workflow/engine/classes/model/ListMyInbox.php | 24 ++++--- .../classes/model/ListParticipatedHistory.php | 18 ++--- .../classes/model/ListParticipatedLast.php | 33 ++++++--- workflow/engine/classes/model/ListPaused.php | 22 +++--- .../engine/classes/model/ListUnassigned.php | 10 +-- .../classes/model/ListUnassignedGroup.php | 8 +-- 11 files changed, 132 insertions(+), 149 deletions(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index 00fa8153a..6ea52bbf7 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -7,6 +7,7 @@ EOT CLI::taskOpt("lang", "", "lLANG", "lang=LANG"); CLI::taskArg('workspace'); CLI::taskRun("list_ids"); +G::LoadClass("wsTools"); function list_ids($command, $args) { @@ -25,39 +26,11 @@ function list_ids($command, $args) $workspace->dbInfo['DB_USER'], $workspace->dbInfo['DB_PASS'] ); - $dbh->query('UPDATE LIST_CANCELED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID);'); - $dbh->query('UPDATE LIST_COMPLETED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID);'); - $dbh->query('UPDATE LIST_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID);'); - $dbh->query('UPDATE LIST_MY_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID);'); - $dbh->query('UPDATE LIST_PARTICIPATED_HISTORY SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID);'); - $dbh->query('UPDATE LIST_PARTICIPATED_LAST SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID);'); - $dbh->query('UPDATE LIST_PAUSED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID), ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID);'); - $dbh->query('UPDATE LIST_UNASSIGNED SET ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID);'); - $dbh->query('UPDATE LIST_UNASSIGNED_GROUP SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID);'); + foreach(workspaceTools::$populateIdsQueries as $query) { + echo "."; + $dbh->query($query); + } + echo "\n"; } //Done diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index bb271fe17..b034e59c5 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -24,6 +24,41 @@ class workspaceTools public $dbInfoRegExp = "/( *define *\( *'(?P.*?)' *, *\n* *')(?P.*?)(' *\) *;.*)/"; public $initPropel = false; public $initPropelRoot = false; + public static $populateIdsQueries = [ + 'UPDATE LIST_CANCELED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)', + 'UPDATE LIST_COMPLETED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)', + 'UPDATE LIST_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)', + 'UPDATE LIST_MY_INBOX SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)', + 'UPDATE LIST_PARTICIPATED_HISTORY SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)', + 'UPDATE LIST_PARTICIPATED_LAST SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)', + 'UPDATE LIST_PAUSED SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)', + 'UPDATE LIST_UNASSIGNED SET ' + . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), ' + . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)', + 'UPDATE LIST_UNASSIGNED_GROUP SET ' + . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)', + ]; /** * Create a workspace tools object. @@ -3592,39 +3627,9 @@ class workspaceTools CLI::logging("-> Populating PRO_ID, USR_ID at LIST_* \n"); $con->begin(); $stmt = $con->createStatement(); - $stmt->executeQuery('UPDATE LIST_CANCELED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_CANCELED.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_CANCELED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_CANCELED.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_COMPLETED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_COMPLETED.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_COMPLETED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_COMPLETED.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_INBOX.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_INBOX.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_INBOX.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_MY_INBOX SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_MY_INBOX.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_MY_INBOX.TAS_UID),' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_MY_INBOX.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_PARTICIPATED_HISTORY SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_HISTORY.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_HISTORY.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_HISTORY.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_PARTICIPATED_LAST SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PARTICIPATED_LAST.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PARTICIPATED_LAST.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PARTICIPATED_LAST.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_PAUSED SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_PAUSED.USR_UID),' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_PAUSED.TAS_UID),' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_PAUSED.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_UNASSIGNED SET ' - . 'TAS_ID=(SELECT TAS_ID FROM TASK WHERE TASK.TAS_UID=LIST_UNASSIGNED.TAS_UID), ' - . 'PRO_ID=(SELECT PRO_ID FROM PROCESS WHERE PROCESS.PRO_UID=LIST_UNASSIGNED.PRO_UID)'); - $stmt->executeQuery('UPDATE LIST_UNASSIGNED_GROUP SET ' - . 'USR_ID=(SELECT USR_ID FROM USERS WHERE USERS.USR_UID=LIST_UNASSIGNED_GROUP.USR_UID)'); + foreach(workspaceTools::$populateIdsQueries as $query) { + $stmt->executeQuery($query); + } $con->commit(); CLI::logging("-> Populating PRO_ID, USR_ID at LIST_* Done \n"); diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index d7064ced5..e10462320 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -105,16 +105,16 @@ class ListCanceled extends BaseListCanceled { $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - $p = new Process(); if (!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if (!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); @@ -144,16 +144,12 @@ class ListCanceled extends BaseListCanceled { */ public function update($data) { - $p = new Process(); - if (!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if (!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index bd1fcb838..d637ef2bd 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -97,16 +97,16 @@ class ListCompleted extends BaseListCompleted $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - $p = new Process(); if (!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if (!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); @@ -136,16 +136,12 @@ class ListCompleted extends BaseListCompleted */ public function update($data) { - $p = new Process(); - if (!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if (!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 3dff55f07..bf6d9b1eb 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -32,18 +32,21 @@ class ListInbox extends BaseListInbox $aData = $oCase->loadCase( $data["APP_UID"] ); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } - $p = new Process(); if (!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if (!empty($data['USR_UID'])) { + $u = new Users(); $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); if ($this->validate()) { $result = $this->save(); @@ -158,18 +161,17 @@ class ListInbox extends BaseListInbox $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); } - $p = new Process(); - if (!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if (!empty($data['USR_UID'])) { + $u = new Users(); $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $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 f20ef41f5..c3a2808c7 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -25,18 +25,21 @@ class ListMyInbox extends BaseListMyInbox */ public function create($data) { - $p = new Process(); if (!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if (!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -64,18 +67,17 @@ class ListMyInbox extends BaseListMyInbox */ public function update($data) { - $p = new Process(); - if(!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $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 4bcbf42d5..87621c3c1 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -25,16 +25,16 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function create($data) { - $p = new Process(); if(!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); @@ -64,16 +64,12 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function update($data) { - $p = new Process(); - if(!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index fa01937e8..6e6828f43 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -70,18 +70,21 @@ class ListParticipatedLast extends BaseListParticipatedLast return; } - $p = new Process(); if(!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -110,18 +113,17 @@ class ListParticipatedLast extends BaseListParticipatedLast public function update($data) { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; - $p = new Process(); - if(!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if(!empty($data['USR_UID'])) { + $u = new Users(); $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $con->begin(); @@ -151,6 +153,17 @@ class ListParticipatedLast extends BaseListParticipatedLast public function refresh ($data, $isSelfService = false) { $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS']; + if(!empty($data['USR_UID'])) { + $u = new Users(); + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + } + if (!empty($data['TAS_UID'])) { + $t = new Task(); + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; + } + if (!empty($data['APP_STATUS'])) { + $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; + } if (!$isSelfService) { if ($data["USR_UID"] == "") { return; diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index d4b67d7a2..1bb91afc9 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -114,13 +114,17 @@ class ListPaused extends BaseListPaused { $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); - $p = new Process(); if(!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; + } + if (!empty($data['TAS_UID'])) { + $t = new Task(); + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { @@ -149,13 +153,13 @@ class ListPaused extends BaseListPaused { */ public function update($data) { - $p = new Process(); - if(!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; + } + if (!empty($data['TAS_UID'])) { + $t = new Task(); + $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 0b29dc637..fdb97b149 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -26,12 +26,12 @@ class ListUnassigned extends BaseListUnassigned */ public function create($data) { - $p = new Process(); if(!empty($data['PRO_UID'])) { + $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); @@ -61,12 +61,8 @@ class ListUnassigned extends BaseListUnassigned */ public function update($data) { - $p = new Process(); - if(!empty($data['PRO_UID'])) { - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; - } - $t = new Task(); if (!empty($data['TAS_UID'])) { + $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 242f7802f..66684fda0 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -24,9 +24,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function create($data) { - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { @@ -54,9 +54,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { - $u = new Users(); if(!empty($data['USR_UID'])) { - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $u = new Users(); + $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); try { From 5472aebb5c2ff0c70803a02a7cca808fc8644d17 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Wed, 22 Feb 2017 12:12:22 -0400 Subject: [PATCH 11/13] + CS Moved declaration of cli function to cliWorskpaces --- workflow/engine/bin/tasks/cliListIds.php | 23 +- workflow/engine/bin/tasks/cliWorkspaces.php | 15 ++ .../engine/classes/model/ListCanceled.php | 89 ++++--- .../engine/classes/model/ListCompleted.php | 82 +++--- workflow/engine/classes/model/ListInbox.php | 202 ++++++++------ workflow/engine/classes/model/ListMyInbox.php | 84 +++--- .../classes/model/ListParticipatedHistory.php | 84 +++--- .../classes/model/ListParticipatedLast.php | 251 ++++++++++-------- workflow/engine/classes/model/ListPaused.php | 80 +++--- .../engine/classes/model/ListUnassigned.php | 132 +++++---- .../classes/model/ListUnassignedGroup.php | 36 +-- 11 files changed, 638 insertions(+), 440 deletions(-) diff --git a/workflow/engine/bin/tasks/cliListIds.php b/workflow/engine/bin/tasks/cliListIds.php index 6ea52bbf7..e2e4b0052 100644 --- a/workflow/engine/bin/tasks/cliListIds.php +++ b/workflow/engine/bin/tasks/cliListIds.php @@ -1,16 +1,8 @@ $workspace) { $hostPort1 = explode(":", $workspace->dbInfo['DB_HOST']); $hostPort = $hostPort1[0] . (isset($hostPort[1]) ? ";port=" . $hostPort[1] : ""); - $connectionString = sprintf("%s:host=%s;dbname=%s", - $workspace->dbInfo['DB_ADAPTER'], $hostPort, - $workspace->dbInfo['DB_NAME']); + $connectionString = sprintf( + "%s:host=%s;dbname=%s", + $workspace->dbInfo['DB_ADAPTER'], + $hostPort, + $workspace->dbInfo['DB_NAME'] + ); $dbh = new PDO( $connectionString, $workspace->dbInfo['DB_USER'], $workspace->dbInfo['DB_PASS'] ); - foreach(workspaceTools::$populateIdsQueries as $query) { + foreach (workspaceTools::$populateIdsQueries as $query) { echo "."; $dbh->query($query); } diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php index d151e23b0..556ee4d71 100644 --- a/workflow/engine/bin/tasks/cliWorkspaces.php +++ b/workflow/engine/bin/tasks/cliWorkspaces.php @@ -313,6 +313,21 @@ EOT CLI::taskArg('workspace', true, true); CLI::taskRun("run_migrate_self_service_value"); +/** + * Complete the PRO_ID and USR_ID in the LIST_* tables. + * + * It calls the list_ids@cliListIds.php + */ +CLI::taskName('list-ids'); +CLI::taskDescription(<<addSelectColumn(ApplicationPeer::APP_TITLE); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -48,8 +51,8 @@ class ListCanceled extends BaseListCanceled { $criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE); $criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); - $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); + $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); + $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL); $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -62,8 +65,8 @@ class ListCanceled extends BaseListCanceled { $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::USR_UID); - $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); + $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); + $criteria->add(AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL); $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -83,7 +86,7 @@ class ListCanceled extends BaseListCanceled { $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -117,19 +120,19 @@ class ListCanceled extends BaseListCanceled { $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -152,18 +155,18 @@ class ListCanceled extends BaseListCanceled { $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -179,9 +182,9 @@ class ListCanceled extends BaseListCanceled { * @throws type * */ - public function remove ($app_uid) + public function remove($app_uid) { - $con = Propel::getConnection( ListCanceledPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCanceledPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $con->begin(); @@ -193,7 +196,7 @@ class ListCanceled extends BaseListCanceled { } } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -205,25 +208,31 @@ class ListCanceled extends BaseListCanceled { if ($filter != '') { switch ($filter) { case 'read': - $criteria->add( ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL ); + $criteria->add(ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add( ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNULL ); + $criteria->add(ListCanceledPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } } if ($search != '') { $criteria->add( - $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListCanceledPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListCanceledPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListCanceledPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListCanceledPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListCanceledPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListCanceledPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { @@ -246,17 +255,28 @@ class ListCanceled extends BaseListCanceled { $dateTo = $dateTo . " 23:59:59"; } - $criteria->add( $criteria->getNewCriterion( ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )-> - addAnd( $criteria->getNewCriterion( ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); + $criteria->add( + $criteria->getNewCriterion( + ListCanceledPeer::DEL_DELEGATE_DATE, + $dateFrom, + Criteria::GREATER_EQUAL + )->addAnd( + $criteria->getNewCriterion( + ListCanceledPeer::DEL_DELEGATE_DATE, + $dateTo, + Criteria::LESS_EQUAL + ) + ) + ); } else { $dateFrom = $dateFrom . " 00:00:00"; - $criteria->add( ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL ); + $criteria->add(ListCanceledPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL); } } elseif ($dateTo != "") { $dateTo = $dateTo . " 23:59:59"; - $criteria->add( ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); + $criteria->add(ListCanceledPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL); } } @@ -283,7 +303,7 @@ class ListCanceled extends BaseListCanceled { $criteria->addSelectColumn(ListCanceledPeer::DEL_INIT_DATE); $criteria->addSelectColumn(ListCanceledPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListCanceledPeer::DEL_PRIORITY); - $criteria->add( ListCanceledPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListCanceledPeer::USR_UID, $usr_uid, Criteria::EQUAL); self::loadFilters($criteria, $filters); $sort = (!empty($filters['sort'])) ? $filters['sort'] : "APP_FINISH_DATE"; @@ -299,11 +319,11 @@ class ListCanceled extends BaseListCanceled { } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListCanceledPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListCanceledPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); while ($dataset->next()) { @@ -336,4 +356,3 @@ class ListCanceled extends BaseListCanceled { return (int)$aRow['TOTAL']; } } // ListCanceled - diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index d637ef2bd..940fd67e9 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListCompleted.php'; * * @package classes.model */ +// @codingStandardsIgnoreStart class ListCompleted extends BaseListCompleted { + // @codingStandardsIgnoreEnd /** * Create List Completed Table * @@ -27,7 +29,7 @@ class ListCompleted extends BaseListCompleted { $criteria = new Criteria(); $criteria->addSelectColumn(ListCompletedPeer::APP_UID); - $criteria->add( ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ListCompletedPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); if ($dataset->next()) { @@ -36,7 +38,7 @@ class ListCompleted extends BaseListCompleted $criteria = new Criteria(); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -68,7 +70,7 @@ class ListCompleted extends BaseListCompleted $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -81,7 +83,7 @@ class ListCompleted extends BaseListCompleted if ($data['DEL_PREVIOUS'] != 0) { $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::USR_UID); - $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_PREVIOUS'], Criteria::EQUAL ); + $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_PREVIOUS'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -109,19 +111,19 @@ class ListCompleted extends BaseListCompleted $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -144,18 +146,18 @@ class ListCompleted extends BaseListCompleted $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -171,9 +173,9 @@ class ListCompleted extends BaseListCompleted * @throws type * */ - public function remove ($app_uid) + public function remove($app_uid) { - $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListCompletedPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $con->begin(); @@ -185,7 +187,7 @@ class ListCompleted extends BaseListCompleted } } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -197,25 +199,31 @@ class ListCompleted extends BaseListCompleted if ($filter != '') { switch ($filter) { case 'read': - $criteria->add( ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL ); + $criteria->add(ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add( ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNULL ); + $criteria->add(ListCompletedPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } } if ($search != '') { $criteria->add( - $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListCompletedPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListCompletedPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListCompletedPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListCompletedPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListCompletedPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListCompletedPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { @@ -238,17 +246,28 @@ class ListCompleted extends BaseListCompleted $dateTo = $dateTo . " 23:59:59"; } - $criteria->add( $criteria->getNewCriterion( ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )-> - addAnd( $criteria->getNewCriterion( ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); + $criteria->add( + $criteria->getNewCriterion( + ListCompletedPeer::DEL_DELEGATE_DATE, + $dateFrom, + Criteria::GREATER_EQUAL + )->addAnd( + $criteria->getNewCriterion( + ListCompletedPeer::DEL_DELEGATE_DATE, + $dateTo, + Criteria::LESS_EQUAL + ) + ) + ); } else { $dateFrom = $dateFrom . " 00:00:00"; - $criteria->add( ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL ); + $criteria->add(ListCompletedPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL); } } elseif ($dateTo != "") { $dateTo = $dateTo . " 23:59:59"; - $criteria->add( ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); + $criteria->add(ListCompletedPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL); } } @@ -272,7 +291,7 @@ class ListCompleted extends BaseListCompleted $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_FIRSTNAME); $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_LASTNAME); $criteria->addSelectColumn(ListCompletedPeer::DEL_CURRENT_USR_USERNAME); - $criteria->add( ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListCompletedPeer::USR_UID, $usr_uid, Criteria::EQUAL); self::loadFilters($criteria, $filters); $sort = (!empty($filters['sort'])) ? $filters['sort'] : "APP_FINISH_DATE"; @@ -288,11 +307,11 @@ class ListCompleted extends BaseListCompleted } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListCompletedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListCompletedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); while ($dataset->next()) { @@ -325,4 +344,3 @@ class ListCompleted extends BaseListCompleted return (int)$aRow['TOTAL']; } } // ListCompleted - diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index bf6d9b1eb..f6fae9ccf 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -13,9 +13,10 @@ require_once 'classes/model/om/BaseListInbox.php'; * * @package classes.model */ - +// @codingStandardsIgnoreStart class ListInbox extends BaseListInbox { + // @codingStandardsIgnoreEnd /** * Create List Inbox Table * @@ -25,11 +26,11 @@ class ListInbox extends BaseListInbox */ public function create($data, $isSelfService = false) { - $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME); try { - if(isset($data['APP_TITLE'])) { + if (isset($data['APP_TITLE'])) { $oCase = new Cases(); - $aData = $oCase->loadCase( $data["APP_UID"] ); + $aData = $oCase->loadCase($data["APP_UID"]); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } if (!empty($data['PRO_UID'])) { @@ -47,11 +48,11 @@ class ListInbox extends BaseListInbox if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } @@ -59,7 +60,7 @@ class ListInbox extends BaseListInbox // create participated history $listParticipatedHistory = new ListParticipatedHistory(); - $listParticipatedHistory->remove($data['APP_UID'],$data['DEL_INDEX']); + $listParticipatedHistory->remove($data['APP_UID'], $data['DEL_INDEX']); $listParticipatedHistory = new ListParticipatedHistory(); $listParticipatedHistory->create($data); @@ -102,7 +103,7 @@ class ListInbox extends BaseListInbox } return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -117,9 +118,9 @@ class ListInbox extends BaseListInbox */ public function update($data, $isSelfService = false) { - if(isset($data['APP_TITLE'])) { + if (isset($data['APP_TITLE'])) { $oCase = new Cases(); - $aData = $oCase->loadCase( $data["APP_UID"] ); + $aData = $oCase->loadCase($data["APP_UID"]); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } if ($isSelfService) { @@ -141,7 +142,11 @@ class ListInbox extends BaseListInbox $listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast->refresh($data); } else { - if (isset($data["APP_UID"]) && isset($data["USER_UID"]) && isset($data["DEL_INDEX"]) && isset($data["APP_TITLE"])) { + if (isset($data["APP_UID"]) && + isset($data["USER_UID"]) && + isset($data["DEL_INDEX"]) && + isset($data["APP_TITLE"]) + ) { //Update //Update - SET $criteriaSet = new Criteria("workflow"); @@ -157,7 +162,10 @@ class ListInbox extends BaseListInbox } } - if((array_key_exists('TAS_UID', $data) && isset($data['TAS_UID'])) && (array_key_exists('TAS_UID', $data) && isset($data['PRO_UID'])) && isset($data['APP_UID'])) { + if ((array_key_exists('TAS_UID', $data) && isset($data['TAS_UID'])) && + (array_key_exists('TAS_UID', $data) && isset($data['PRO_UID'])) && + isset($data['APP_UID']) + ) { $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); } @@ -172,11 +180,11 @@ class ListInbox extends BaseListInbox if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); @@ -187,7 +195,7 @@ class ListInbox extends BaseListInbox return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -203,9 +211,9 @@ class ListInbox extends BaseListInbox * @throws type * */ - public function remove ($app_uid, $del_index) + public function remove($app_uid, $del_index) { - $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $this->setDelIndex($del_index); @@ -227,9 +235,9 @@ class ListInbox extends BaseListInbox * @throws type * */ - public function removeAll ($app_uid) + public function removeAll($app_uid) { - $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListInboxPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); @@ -242,8 +250,13 @@ class ListInbox extends BaseListInbox } } - public function newRow ($data, $delPreviusUsrUid, $isInitSubprocess = false, $dataPreviusApplication = array(), $isSelfService = false) - { + public function newRow( + $data, + $delPreviusUsrUid, + $isInitSubprocess = false, + $dataPreviusApplication = array(), + $isSelfService = false + ) { $removeList = true; if (isset($data['REMOVED_LIST'])) { $removeList = $data['REMOVED_LIST']; @@ -254,19 +267,19 @@ class ListInbox extends BaseListInbox $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; } - if(!isset($data['DEL_DUE_DATE'])) { + if (!isset($data['DEL_DUE_DATE'])) { $filters = array("APP_UID" => $data["APP_UID"], "DEL_INDEX" => $data['DEL_INDEX']); - $data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters,'DEL_TASK_DUE_DATE'); + $data['DEL_DUE_DATE'] = $this->getAppDelegationInfo($filters, 'DEL_TASK_DUE_DATE'); } - if(isset($data['APP_INIT_DATE'])){ + if (isset($data['APP_INIT_DATE'])) { $data['DEL_INIT_DATE'] = $data['APP_INIT_DATE']; } $criteria = new Criteria(); - $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); - $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); + $criteria->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -277,7 +290,7 @@ class ListInbox extends BaseListInbox $criteria = new Criteria(); $criteria->addSelectColumn(TaskPeer::TAS_TITLE); $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE); - $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL); $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -285,7 +298,7 @@ class ListInbox extends BaseListInbox if ($aRow['TAS_DEF_TITLE'] == '') { $criteria = new Criteria(); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -298,7 +311,7 @@ class ListInbox extends BaseListInbox $criteria = new Criteria(); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); - $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL); $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -308,9 +321,9 @@ class ListInbox extends BaseListInbox $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); $data['APP_PREVIOUS_USER'] = ''; - if($data['DEL_PREVIOUS_USR_UID'] === ''){ + if ($data['DEL_PREVIOUS_USR_UID'] === '') { global $RBAC; - if(isset($RBAC->aUserInfo['USER_INFO'])){ + if (isset($RBAC->aUserInfo['USER_INFO'])) { $aUser = $RBAC->aUserInfo['USER_INFO']; $data['DEL_PREVIOUS_USR_UID'] = $aUser['USR_UID']; } @@ -320,7 +333,7 @@ class ListInbox extends BaseListInbox $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -332,7 +345,7 @@ class ListInbox extends BaseListInbox $criteria = new Criteria(); $criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT); - $criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL); $dataset = SubApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); if ($dataset->next()) { @@ -348,7 +361,7 @@ class ListInbox extends BaseListInbox $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -360,7 +373,7 @@ class ListInbox extends BaseListInbox self::create($data, $isSelfService); } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $action = isset($filters['action']) ? $filters['action'] : ""; $usrUid = isset($filters['usr_uid']) ? $filters['usr_uid'] : ""; @@ -371,71 +384,94 @@ class ListInbox extends BaseListInbox $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; - $newestthan = isset($filters['newestthan'] ) ? $filters['newestthan'] : ''; - $oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : ''; + $newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : ''; + $oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : ''; //Check the inbox to call switch ($action) { case 'draft': - $criteria->add( ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL ); - $criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL ); - break; + $criteria->add(ListInboxPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL); + $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL); + break; case 'to_revise': - $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL ); + $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL); $oAppCache = new AppCacheView(); $aProcesses = $oAppCache->getProUidSupervisor($usrUid); $criteria->add(ListInboxPeer::PRO_UID, $aProcesses, Criteria::IN); - break; + break; case 'to_reassign': - $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL ); + $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL); if ($usrUid !== '') { - $criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL ); + $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL); } - break; + break; default://todo - $criteria->add( ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL ); - $criteria->add( ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL ); - break; + $criteria->add(ListInboxPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL); + $criteria->add(ListInboxPeer::USR_UID, $usrUid, Criteria::EQUAL); } //Filter Read Unread All switch ($filter) { case 'read': - $criteria->add( ListInboxPeer::DEL_INIT_DATE, NULL, Criteria::ISNOTNULL ); + $criteria->add(ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add( ListInboxPeer::DEL_INIT_DATE, NULL, Criteria::ISNULL ); + $criteria->add(ListInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } //Filter Task Status switch ($filterStatus) { case 'ON_TIME': - $criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", Criteria::CUSTOM); + $criteria->add( + ListInboxPeer::DEL_RISK_DATE, + "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE." , NOW( ) ) > 0", + Criteria::CUSTOM + ); break; case 'AT_RISK': - $criteria->add( ListInboxPeer::DEL_RISK_DATE , "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", Criteria::CUSTOM); - $criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) > 0", Criteria::CUSTOM); + $criteria->add( + ListInboxPeer::DEL_RISK_DATE, + "TIMEDIFF(". ListInboxPeer::DEL_RISK_DATE .", NOW( ) ) < 0", + Criteria::CUSTOM + ); + $criteria->add( + ListInboxPeer::DEL_DUE_DATE, + "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE .", NOW( ) ) > 0", + Criteria::CUSTOM + ); break; case 'OVERDUE': - $criteria->add( ListInboxPeer::DEL_DUE_DATE , "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", Criteria::CUSTOM); + $criteria->add( + ListInboxPeer::DEL_DUE_DATE, + "TIMEDIFF(". ListInboxPeer::DEL_DUE_DATE." , NOW( ) ) < 0", + Criteria::CUSTOM + ); break; } //Filter Search if ($search != '') { $criteria->add( - $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL) - ))))); + $criteria->getNewCriterion(ListInboxPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListInboxPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListInboxPeer::APP_PRO_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListInboxPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListInboxPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ) + ); } //Filter Process Id if ($process != '') { - $criteria->add( ListInboxPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListInboxPeer::PRO_UID, $process, Criteria::EQUAL); } //Filter Category @@ -486,10 +522,12 @@ class ListInbox extends BaseListInbox $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); - $criteria->addJoin( ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN ); + $criteria->addJoin(ListInboxPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); self::loadFilters($criteria, $filters); - $sort = (!empty($filters['sort'])) ? ListInboxPeer::TABLE_NAME.'.'.$filters['sort'] : "LIST_INBOX.APP_UPDATE_DATE"; + $sort = (!empty($filters['sort'])) ? + ListInboxPeer::TABLE_NAME.'.'.$filters['sort'] : + "LIST_INBOX.APP_UPDATE_DATE"; $dir = isset($filters['dir']) ? $filters['dir'] : "ASC"; $start = isset($filters['start']) ? $filters['start'] : "0"; $limit = isset($filters['limit']) ? $filters['limit'] : "25"; @@ -502,18 +540,21 @@ class ListInbox extends BaseListInbox } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); + $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH'); while ($dataset->next()) { $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow()); - $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3; - $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); + $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && + is_numeric($aRow['DEL_PRIORITY']) && + $aRow['DEL_PRIORITY'] <= 5 && + $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3; + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); $data[] = $aRow; } return $data; @@ -523,18 +564,18 @@ class ListInbox extends BaseListInbox { $criteria = new Criteria(); $criteria->addSelectColumn(TaskPeer::TAS_PRIORITY_VARIABLE); - $criteria->add( TaskPeer::TAS_UID, $taskUid, Criteria::EQUAL ); - $criteria->add( TaskPeer::PRO_UID, $proUid, Criteria::EQUAL ); + $criteria->add(TaskPeer::TAS_UID, $taskUid, Criteria::EQUAL); + $criteria->add(TaskPeer::PRO_UID, $proUid, Criteria::EQUAL); $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); $priority = $aRow['TAS_PRIORITY_VARIABLE']; - if(strlen($priority)>2){ + if (strlen($priority)>2) { $oCase = new Cases(); - $aData = $oCase->loadCase( $appUid ); - $priorityLabel = substr($priority, 2,strlen($priority)); - if (isset( $aData['APP_DATA'][$priorityLabel] )) { + $aData = $oCase->loadCase($appUid); + $priorityLabel = substr($priority, 2, strlen($priority)); + if (isset($aData['APP_DATA'][$priorityLabel])) { $priority = $aData['APP_DATA'][$priorityLabel]; } } @@ -545,14 +586,14 @@ class ListInbox extends BaseListInbox { $criteria = new Criteria(); eval('$criteria->addSelectColumn( AppDelegationPeer::'.$fieldName.');'); - foreach($filters as $k => $v) { - eval('$criteria->add( AppDelegationPeer::'.$k.',$v, Criteria::EQUAL);'); + foreach ($filters as $k => $v) { + eval('$criteria->add( AppDelegationPeer::'.$k.',$v, Criteria::EQUAL);'); } $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - return isset($aRow[$fieldName]) ? $aRow[$fieldName] : NULL; + return isset($aRow[$fieldName]) ? $aRow[$fieldName] : null; } /** @@ -578,4 +619,3 @@ class ListInbox extends BaseListInbox return (int)$aRow['TOTAL']; } } - diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index c3a2808c7..f05920126 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListMyInbox.php'; * * @package classes.model */ +// @codingStandardsIgnoreStart class ListMyInbox extends BaseListMyInbox { + // @codingStandardsIgnoreEnd /** * Create List My Inbox Table * @@ -40,19 +42,19 @@ class ListMyInbox extends BaseListMyInbox if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -67,7 +69,7 @@ class ListMyInbox extends BaseListMyInbox */ public function update($data) { - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -78,18 +80,18 @@ class ListMyInbox extends BaseListMyInbox if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -105,9 +107,9 @@ class ListMyInbox extends BaseListMyInbox * @throws type * */ - public function remove ($app_uid, $usr_uid) + public function remove($app_uid, $usr_uid) { - $con = Propel::getConnection( ListMyInboxPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListMyInboxPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $this->setUsrUid($usr_uid); @@ -129,7 +131,7 @@ class ListMyInbox extends BaseListMyInbox * @throws type * */ - public function refresh ($data) + public function refresh($data) { $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS']; @@ -137,7 +139,7 @@ class ListMyInbox extends BaseListMyInbox $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -162,7 +164,7 @@ class ListMyInbox extends BaseListMyInbox - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -174,25 +176,31 @@ class ListMyInbox extends BaseListMyInbox if ($filter != '') { switch ($filter) { case 'read': - $criteria->add( ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL ); + $criteria->add(ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add( ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL ); + $criteria->add(ListMyInboxPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } } if ($search != '') { $criteria->add( - $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListMyInboxPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListMyInboxPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListMyInboxPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListMyInboxPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListMyInboxPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListMyInboxPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { @@ -215,17 +223,28 @@ class ListMyInbox extends BaseListMyInbox $dateTo = $dateTo . " 23:59:59"; } - $criteria->add( $criteria->getNewCriterion( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )-> - addAnd( $criteria->getNewCriterion( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); + $criteria->add( + $criteria->getNewCriterion( + ListMyInboxPeer::DEL_DELEGATE_DATE, + $dateFrom, + Criteria::GREATER_EQUAL + )->addAnd( + $criteria->getNewCriterion( + ListMyInboxPeer::DEL_DELEGATE_DATE, + $dateTo, + Criteria::LESS_EQUAL + ) + ) + ); } else { $dateFrom = $dateFrom . " 00:00:00"; - $criteria->add( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL ); + $criteria->add(ListMyInboxPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL); } } elseif ($dateTo != "") { $dateTo = $dateTo . " 23:59:59"; - $criteria->add( ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); + $criteria->add(ListMyInboxPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL); } } @@ -258,7 +277,7 @@ class ListMyInbox extends BaseListMyInbox $criteria->addSelectColumn(ListMyInboxPeer::DEL_INIT_DATE); $criteria->addSelectColumn(ListMyInboxPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListMyInboxPeer::DEL_PRIORITY); - $criteria->add( ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListMyInboxPeer::USR_UID, $usr_uid, Criteria::EQUAL); self::loadFilters($criteria, $filters); $sort = (!empty($filters['sort'])) ? $filters['sort'] : "APP_UPDATE_DATE"; @@ -274,18 +293,18 @@ class ListMyInbox extends BaseListMyInbox } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListMyInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListMyInboxPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); + $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH'); while ($dataset->next()) { $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow()); - $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); $data[] = $aRow; } @@ -313,4 +332,3 @@ class ListMyInbox extends BaseListMyInbox return (int)$aRow['TOTAL']; } } // ListMyInbox - diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index 87621c3c1..a623e5f9b 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListParticipatedHistory.php'; * * @package classes.model */ +// @codingStandardsIgnoreStart class ListParticipatedHistory extends BaseListParticipatedHistory { + // @codingStandardsIgnoreEnd /** * Create List Participated History Table * @@ -25,11 +27,11 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function create($data) { - if(!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -37,19 +39,19 @@ class ListParticipatedHistory extends BaseListParticipatedHistory $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -64,7 +66,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function update($data) { - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -72,18 +74,18 @@ class ListParticipatedHistory extends BaseListParticipatedHistory $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -99,9 +101,9 @@ class ListParticipatedHistory extends BaseListParticipatedHistory * @throws type * */ - public function remove ($app_uid, $del_index) + public function remove($app_uid, $del_index) { - $con = Propel::getConnection( ListParticipatedHistoryPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListParticipatedHistoryPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $this->setDelIndex($del_index); @@ -115,7 +117,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory } } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -127,10 +129,10 @@ class ListParticipatedHistory extends BaseListParticipatedHistory if ($filter != '') { switch ($filter) { case 'read': - $criteria->add( ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL ); + $criteria->add(ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add( ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNULL ); + $criteria->add(ListParticipatedHistoryPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } } @@ -138,14 +140,22 @@ class ListParticipatedHistory extends BaseListParticipatedHistory if ($search != '') { $criteria->add( $criteria->getNewCriterion('CON_APP.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion('CON_TAS.CON_VALUE', '%' . $search . '%', Criteria::LIKE)->addOr( + $criteria->getNewCriterion(ListParticipatedHistoryPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion( + ListParticipatedHistoryPeer::APP_NUMBER, + $search, + Criteria::EQUAL + ) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListParticipatedHistoryPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListParticipatedHistoryPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { @@ -168,17 +178,28 @@ class ListParticipatedHistory extends BaseListParticipatedHistory $dateTo = $dateTo . " 23:59:59"; } - $criteria->add( $criteria->getNewCriterion( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )-> - addAnd( $criteria->getNewCriterion( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); + $criteria->add( + $criteria->getNewCriterion( + ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, + $dateFrom, + Criteria::GREATER_EQUAL + )->addAnd( + $criteria->getNewCriterion( + ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, + $dateTo, + Criteria::LESS_EQUAL + ) + ) + ); } else { $dateFrom = $dateFrom . " 00:00:00"; - $criteria->add( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL ); + $criteria->add(ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL); } } elseif ($dateTo != "") { $dateTo = $dateTo . " 23:59:59"; - $criteria->add( ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ); + $criteria->add(ListParticipatedHistoryPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL); } } @@ -207,7 +228,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_INIT_DATE); $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListParticipatedHistoryPeer::DEL_PRIORITY); - $criteria->add( ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListParticipatedHistoryPeer::USR_UID, $usr_uid, Criteria::EQUAL); self::loadFilters($criteria, $filters); $sort = (!empty($filters['sort'])) ? $filters['sort'] : "DEL_DELEGATE_DATE"; @@ -223,18 +244,18 @@ class ListParticipatedHistory extends BaseListParticipatedHistory } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListParticipatedHistoryPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListParticipatedHistoryPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); + $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH'); while ($dataset->next()) { $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow()); - $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); $data[] = $aRow; } @@ -262,4 +283,3 @@ class ListParticipatedHistory extends BaseListParticipatedHistory return (int)$aRow['TOTAL']; } } - diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 6e6828f43..bd50f768c 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -1,8 +1,8 @@ addSelectColumn(ApplicationPeer::APP_STATUS); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_STATUS'] = $aRow['APP_STATUS']; + $data['APP_STATUS'] = $aRow['APP_STATUS']; if ($data['USR_UID'] != 'SELF_SERVICES') { - if($data['USR_UID'] != '') { + if ($data['USR_UID'] != '') { $criteria = new Criteria(); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME']; + $data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME']; $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; - $data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME']; + $data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_CURRENT_TAS_TITLE'] = $data['APP_TAS_TITLE']; } } else { @@ -57,24 +55,24 @@ class ListParticipatedLast extends BaseListParticipatedLast $row = $this->getRowFromList($getData); if (is_array($row) && sizeof($row)) { $set = array( - "DEL_CURRENT_USR_USERNAME" => "", - "DEL_CURRENT_USR_FIRSTNAME" => "", - "DEL_CURRENT_USR_LASTNAME" => "", - "APP_TAS_TITLE" => $data['APP_TAS_TITLE'], - "DEL_CURRENT_TAS_TITLE" => $data['APP_TAS_TITLE']); + 'DEL_CURRENT_USR_USERNAME' => '', + 'DEL_CURRENT_USR_FIRSTNAME' => '', + 'DEL_CURRENT_USR_LASTNAME' => '', + 'APP_TAS_TITLE' => $data['APP_TAS_TITLE'], + 'DEL_CURRENT_TAS_TITLE' => $data['APP_TAS_TITLE'], ); $this->updateCurrentUser($row, $set); } } - if($this->primaryKeysExists($data)) { + if ($this->primaryKeysExists($data)) { return; } - if(!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID'])) { $p = new Process(); - $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; + $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -85,37 +83,40 @@ class ListParticipatedLast extends BaseListParticipatedLast if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListParticipatedLastPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception('Failed Validation in class '.get_class($this).'.'); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); + return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } } /** - * Update List Participated History Table + * Update List Participated History Table. * * @param type $data + * * @return type + * * @throws type */ public function update($data) { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $data['USR_ID'] = $data['USR_UID'] === 'SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } if (!empty($data['TAS_UID'])) { $t = new Task(); @@ -124,18 +125,19 @@ class ListParticipatedLast extends BaseListParticipatedLast if (!empty($data['APP_STATUS'])) { $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } - $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListParticipatedLastPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); + return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception('Failed Validation in class '.get_class($this).'.')); } } catch (Exception $e) { $con->rollback(); @@ -143,19 +145,20 @@ class ListParticipatedLast extends BaseListParticipatedLast } } /** - * Refresh List Participated Last + * Refresh List Participated Last. * * @param type $seqName - * @return type - * @throws type * + * @return type + * + * @throws type */ - public function refresh ($data, $isSelfService = false) + public function refresh($data, $isSelfService = false) { $data['APP_STATUS'] = (empty($data['APP_STATUS'])) ? 'TO_DO' : $data['APP_STATUS']; - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); - $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; + $data['USR_ID'] = $data['USR_UID'] === 'SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } if (!empty($data['TAS_UID'])) { $t = new Task(); @@ -165,7 +168,7 @@ class ListParticipatedLast extends BaseListParticipatedLast $data['APP_STATUS_ID'] = Application::$app_status_values[$data['APP_STATUS']]; } if (!$isSelfService) { - if ($data["USR_UID"] == "") { + if ($data['USR_UID'] == '') { return; } @@ -173,17 +176,17 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); //Update - WHERE - $criteriaWhere = new Criteria("workflow"); - $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); + $criteriaWhere = new Criteria('workflow'); + $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); //Update - SET - $criteriaSet = new Criteria("workflow"); + $criteriaSet = new Criteria('workflow'); $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_USERNAME, $aRow['USR_USERNAME']); $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_FIRSTNAME, $aRow['USR_FIRSTNAME']); $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_USR_LASTNAME, $aRow['USR_LASTNAME']); @@ -192,32 +195,31 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteriaSet->add(ListParticipatedLastPeer::DEL_CURRENT_TAS_TITLE, $data['APP_TAS_TITLE']); } - BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - + BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection('workflow')); } $this->update($data); - } /** - * Remove List Participated History + * Remove List Participated History. * * @param type $seqName - * @return type - * @throws type * + * @return type + * + * @throws type */ - public function remove ($app_uid, $usr_uid, $del_index) + public function remove($app_uid, $usr_uid, $del_index) { try { if (!is_null(ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid, $del_index))) { - $criteria = new Criteria("workflow"); + $criteria = new Criteria('workflow'); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid); $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index); $result = ListParticipatedLastPeer::doDelete($criteria); } else { - $criteria = new Criteria("workflow"); + $criteria = new Criteria('workflow'); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid); $rsCriteria = ListParticipatedLastPeer::doSelectRS($criteria); @@ -232,18 +234,17 @@ class ListParticipatedLast extends BaseListParticipatedLast } } - - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { - $filter = isset($filters['filter']) ? $filters['filter'] : ""; - $search = isset($filters['search']) ? $filters['search'] : ""; - $process = isset($filters['process']) ? $filters['process'] : ""; - $category = isset($filters['category']) ? $filters['category'] : ""; - $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ""; - $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ""; - $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ""; - $newestthan = isset($filters['newestthan'] ) ? $filters['newestthan'] : ''; - $oldestthan = isset($filters['oldestthan'] ) ? $filters['oldestthan'] : ''; + $filter = isset($filters['filter']) ? $filters['filter'] : ''; + $search = isset($filters['search']) ? $filters['search'] : ''; + $process = isset($filters['process']) ? $filters['process'] : ''; + $category = isset($filters['category']) ? $filters['category'] : ''; + $dateFrom = isset($filters['dateFrom']) ? $filters['dateFrom'] : ''; + $dateTo = isset($filters['dateTo']) ? $filters['dateTo'] : ''; + $filterStatus = isset($filters['filterStatus']) ? $filters['filterStatus'] : ''; + $newestthan = isset($filters['newestthan']) ? $filters['newestthan'] : ''; + $oldestthan = isset($filters['oldestthan']) ? $filters['oldestthan'] : ''; //Filter Started by me and Completed by me switch ($filter) { @@ -251,43 +252,49 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteria->add(ListParticipatedLastPeer::DEL_INDEX, 1, Criteria::EQUAL); break; case 'completed': - $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL); + $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL); break; } //Check the inbox to call switch ($filterStatus) { case 'DRAFT': - $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL ); - break; + $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'DRAFT', Criteria::EQUAL); + break; case 'TO_DO': - $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL ); - break; + $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'TO_DO', Criteria::EQUAL); + break; case 'COMPLETED': - $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL ); - break; + $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL); + break; case 'CANCELLED': - $criteria->add( ListParticipatedLastPeer::APP_STATUS, 'CANCELLED', Criteria::EQUAL ); - break; + $criteria->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED', Criteria::EQUAL); + break; } - if ($search != '' ) { + if ($search != '') { $criteria->add( - $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TITLE, '%'.$search.'%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListParticipatedLastPeer::APP_TAS_TITLE, '%'.$search.'%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListParticipatedLastPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListParticipatedLastPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListParticipatedLastPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListParticipatedLastPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { $criteria->addSelectColumn(ProcessPeer::PRO_CATEGORY); - $aConditions = array(); + $aConditions = array(); $aConditions[] = array(ListParticipatedLastPeer::PRO_UID, ProcessPeer::PRO_UID); - $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'" . $category . "'"); + $aConditions[] = array(ProcessPeer::PRO_CATEGORY, "'".$category."'"); $criteria->addJoinMC($aConditions, Criteria::INNER_JOIN); } } @@ -320,50 +327,57 @@ class ListParticipatedLast extends BaseListParticipatedLast $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS); - $criteria->add( ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid, Criteria::EQUAL); //Check if the user was participated in a specific case - if($appUid != ''){ - $criteria->add( ListParticipatedLastPeer::APP_UID, $appUid, Criteria::EQUAL ); + if ($appUid != '') { + $criteria->add(ListParticipatedLastPeer::APP_UID, $appUid, Criteria::EQUAL); } self::loadFilters($criteria, $filters); - $sort = (!empty($filters['sort'])) ? ListParticipatedLastPeer::TABLE_NAME.'.'.$filters['sort'] : "DEL_DELEGATE_DATE"; - $dir = isset($filters['dir']) ? $filters['dir'] : "ASC"; - $start = isset($filters['start']) ? $filters['start'] : "0"; - $limit = isset($filters['limit']) ? $filters['limit'] : "25"; + $sort = (!empty($filters['sort'])) ? + ListParticipatedLastPeer::TABLE_NAME.'.'.$filters['sort'] : + 'DEL_DELEGATE_DATE'; + $dir = isset($filters['dir']) ? $filters['dir'] : 'ASC'; + $start = isset($filters['start']) ? $filters['start'] : '0'; + $limit = isset($filters['limit']) ? $filters['limit'] : '25'; $paged = isset($filters['paged']) ? $filters['paged'] : 1; - if ($dir == "DESC") { + if ($dir == 'DESC') { $criteria->addDescendingOrderByColumn($sort); } else { $criteria->addAscendingOrderByColumn($sort); } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $criteria->addJoin(ListParticipatedLastPeer::APP_UID,ApplicationPeer::APP_UID,Criteria::LEFT_JOIN); + $criteria->addJoin(ListParticipatedLastPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); - $dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListParticipatedLastPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); + $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH'); while ($dataset->next()) { - $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow()); - $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3; - $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); + $aRow = (is_null($callbackRecord)) ? $dataset->getRow() : $callbackRecord($dataset->getRow()); + $aRow['DEL_PRIORITY'] = ( + isset($aRow['DEL_PRIORITY']) && + is_numeric($aRow['DEL_PRIORITY']) && + $aRow['DEL_PRIORITY'] <= 5 && + $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3; + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); $data[] = $aRow; } return $data; } - public function primaryKeysExists($data) { - $criteria = new Criteria("workflow"); + public function primaryKeysExists($data) + { + $criteria = new Criteria('workflow'); $criteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']); $criteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']); $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $data['DEL_INDEX']); @@ -371,27 +385,30 @@ class ListParticipatedLast extends BaseListParticipatedLast $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - if(is_array($aRow)) { - if(sizeof($aRow)) { + if (is_array($aRow)) { + if (sizeof($aRow)) { return true; } } + return false; } - public function getRowFromList($data) { - $criteria = new Criteria("workflow"); + public function getRowFromList($data) + { + $criteria = new Criteria('workflow'); $criteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']); $criteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']); $dataset = ListParticipatedLastPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - if(is_array($aRow)) { - if(sizeof($aRow)) { + if (is_array($aRow)) { + if (sizeof($aRow)) { return $aRow; } } + return false; } @@ -399,22 +416,24 @@ class ListParticipatedLast extends BaseListParticipatedLast { $con = Propel::getConnection('workflow'); //Update - WHERE - $criteriaWhere = new Criteria("workflow"); - $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $where["APP_UID"], Criteria::EQUAL); - $criteriaWhere->add(ListParticipatedLastPeer::USR_UID, $where["USR_UID"], Criteria::EQUAL); - $criteriaWhere->add(ListParticipatedLastPeer::DEL_INDEX, $where["DEL_INDEX"], Criteria::EQUAL); + $criteriaWhere = new Criteria('workflow'); + $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $where['APP_UID'], Criteria::EQUAL); + $criteriaWhere->add(ListParticipatedLastPeer::USR_UID, $where['USR_UID'], Criteria::EQUAL); + $criteriaWhere->add(ListParticipatedLastPeer::DEL_INDEX, $where['DEL_INDEX'], Criteria::EQUAL); //Update - SET - $criteriaSet = new Criteria("workflow"); - foreach($set as $k => $v) { - eval('$criteriaSet->add( ListParticipatedLastPeer::'.$k.',$v, Criteria::EQUAL);'); + $criteriaSet = new Criteria('workflow'); + foreach ($set as $k => $v) { + eval('$criteriaSet->add( ListParticipatedLastPeer::'.$k.',$v, Criteria::EQUAL);'); } BasePeer::doUpdate($criteriaWhere, $criteriaSet, $con); } /** - * Returns the number of cases of a user + * Returns the number of cases of a user. + * * @param string $usrUid * @param array $filters + * * @return int */ public function getCountList($usrUid, $filters = array()) @@ -429,7 +448,7 @@ class ListParticipatedLast extends BaseListParticipatedLast $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - return (int)$aRow['TOTAL']; + + return (int) $aRow['TOTAL']; } } - diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 1bb91afc9..08899ad07 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -14,7 +14,10 @@ require_once 'classes/model/om/BaseListPaused.php'; * * @package classes.model */ -class ListPaused extends BaseListPaused { +// @codingStandardsIgnoreStart +class ListPaused extends BaseListPaused +{ + // @codingStandardsIgnoreEnd /** * Create List Paused Table * @@ -37,7 +40,7 @@ class ListPaused extends BaseListPaused { $criteria = new Criteria(); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); - $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL); $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -51,8 +54,8 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE); $criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE); $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); - $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); + $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); + $criteria->add(AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL); $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -66,8 +69,8 @@ class ListPaused extends BaseListPaused { $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::USR_UID); - $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); + $criteria->add(AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); + $criteria->add(AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL); $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -78,7 +81,7 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -89,7 +92,7 @@ class ListPaused extends BaseListPaused { $criteria = new Criteria(); $criteria->addSelectColumn(TaskPeer::TAS_TITLE); - $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL); $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -100,7 +103,7 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -114,11 +117,11 @@ class ListPaused extends BaseListPaused { $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); - if(!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -126,19 +129,19 @@ class ListPaused extends BaseListPaused { $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -153,7 +156,7 @@ class ListPaused extends BaseListPaused { */ public function update($data) { - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } @@ -161,18 +164,18 @@ class ListPaused extends BaseListPaused { $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -188,15 +191,15 @@ class ListPaused extends BaseListPaused { * @throws type * */ - public function remove ($app_uid, $del_index, $data_inbox) + public function remove($app_uid, $del_index, $data_inbox) { $oRow = ApplicationPeer::retrieveByPK($app_uid); - $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); + $aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME); $data_inbox['APP_STATUS'] = $aFields['APP_STATUS']; $listInbox = new ListInbox(); $listInbox->newRow($data_inbox, $data_inbox['USR_UID']); - $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListPausedPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $this->setDelIndex($del_index); @@ -209,7 +212,7 @@ class ListPaused extends BaseListPaused { } } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -220,20 +223,26 @@ class ListPaused extends BaseListPaused { //Filter Read Unread All switch ($filter) { case 'read': - $criteria->add(ListPausedPeer::DEL_INIT_DATE, NULL, Criteria::ISNOTNULL); + $criteria->add(ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL); break; case 'unread': - $criteria->add(ListPausedPeer::DEL_INIT_DATE, NULL, Criteria::ISNULL); + $criteria->add(ListPausedPeer::DEL_INIT_DATE, null, Criteria::ISNULL); break; } if ($search != '') { $criteria->add( - $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion(ListPausedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListPausedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListPausedPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListPausedPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { @@ -277,7 +286,7 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(ListPausedPeer::DEL_INIT_DATE); $criteria->addSelectColumn(ListPausedPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListPausedPeer::DEL_PRIORITY); - $criteria->add( ListPausedPeer::USR_UID, $usr_uid, Criteria::EQUAL ); + $criteria->add(ListPausedPeer::USR_UID, $usr_uid, Criteria::EQUAL); self::loadFilters($criteria, $filters); $sort = (!empty($filters['sort'])) ? ListPausedPeer::TABLE_NAME.'.'.$filters['sort'] : "APP_PAUSED_DATE"; @@ -293,11 +302,11 @@ class ListPaused extends BaseListPaused { } if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } - $dataset = ListPausedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro') ); + $dataset = ListPausedPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = array(); while ($dataset->next()) { @@ -330,4 +339,3 @@ class ListPaused extends BaseListPaused { return (int)$aRow['TOTAL']; } } // ListPaused - diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index fdb97b149..fa8d7777a 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -14,8 +14,10 @@ require_once 'classes/model/om/BaseListUnassigned.php'; * * @package classes.model */ +// @codingStandardsIgnoreStart class ListUnassigned extends BaseListUnassigned { + // @codingStandardsIgnoreEnd private $total = 0; /** * Create List Unassigned Table @@ -26,7 +28,7 @@ class ListUnassigned extends BaseListUnassigned */ public function create($data) { - if(!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } @@ -34,19 +36,19 @@ class ListUnassigned extends BaseListUnassigned $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -65,18 +67,18 @@ class ListUnassigned extends BaseListUnassigned $t = new Task(); $data['TAS_ID'] = $t->load($data['TAS_UID'])['TAS_ID']; } - $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -92,9 +94,9 @@ class ListUnassigned extends BaseListUnassigned * @throws type * */ - public function remove ($appUid, $delIndex) + public function remove($appUid, $delIndex) { - $con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedPeer::DATABASE_NAME); try { $this->setAppUid($appUid); $this->setDelIndex($delIndex); @@ -108,15 +110,15 @@ class ListUnassigned extends BaseListUnassigned } } - public function newRow ($data, $delPreviusUsrUid) + public function newRow($data, $delPreviusUsrUid) { $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid; $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; $criteria = new Criteria(); - $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); - $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); + $criteria->addSelectColumn(ApplicationPeer::APP_UPDATE_DATE); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -125,7 +127,7 @@ class ListUnassigned extends BaseListUnassigned $criteria = new Criteria(); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); - $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL); $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -135,7 +137,7 @@ class ListUnassigned extends BaseListUnassigned $criteria = new Criteria(); $criteria->addSelectColumn(TaskPeer::TAS_TITLE); - $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL); $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -149,7 +151,7 @@ class ListUnassigned extends BaseListUnassigned $criteria->addSelectColumn(UsersPeer::USR_USERNAME); $criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(UsersPeer::USR_LASTNAME); - $criteria->add( UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL ); + $criteria->add(UsersPeer::USR_UID, $data['DEL_PREVIOUS_USR_UID'], Criteria::EQUAL); $dataset = UsersPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); @@ -163,7 +165,7 @@ class ListUnassigned extends BaseListUnassigned return true; } - public function loadFilters (&$criteria, $filters) + public function loadFilters(&$criteria, $filters) { $filter = isset($filters['filter']) ? $filters['filter'] : ""; $search = isset($filters['search']) ? $filters['search'] : ""; @@ -174,15 +176,21 @@ class ListUnassigned extends BaseListUnassigned if ($search != '') { $criteria->add( - $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr( - $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL)->addOr( - $criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL) - )))); + $criteria->getNewCriterion(ListUnassignedPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListUnassignedPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE) + ->addOr( + $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $search, Criteria::EQUAL) + ->addOr( + $criteria->getNewCriterion(ListUnassignedPeer::APP_NUMBER, $search, Criteria::EQUAL) + ) + ) + ) + ); } if ($process != '') { - $criteria->add( ListUnassignedPeer::PRO_UID, $process, Criteria::EQUAL); + $criteria->add(ListUnassignedPeer::PRO_UID, $process, Criteria::EQUAL); } if ($category != '') { @@ -198,7 +206,7 @@ class ListUnassigned extends BaseListUnassigned { $resp = array(); $pmTable = new PmTable(); - $tasks = $this->getSelfServiceTasks( $usr_uid ); + $tasks = $this->getSelfServiceTasks($usr_uid); $criteria = $pmTable->addPMFieldsToList('unassigned'); $criteria->addSelectColumn(ListUnassignedPeer::APP_UID); @@ -249,11 +257,15 @@ class ListUnassigned extends BaseListUnassigned Criteria::EQUAL )->addAnd( $criteria->getNewCriterion( - ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL + ListUnassignedPeer::DEL_INDEX, + $value["DEL_INDEX"], + Criteria::EQUAL ) )->addAnd( $criteria->getNewCriterion( - ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL + ListUnassignedPeer::TAS_UID, + $value["TAS_UID"], + Criteria::EQUAL ) )->addOr( $criterionAux @@ -264,14 +276,16 @@ class ListUnassigned extends BaseListUnassigned $criteria->add( $criterionAux->addOr($criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN)) ); - }else{ + } else { //Load Selfservice $criteria->add(ListUnassignedPeer::TAS_UID, $tasks, Criteria::IN); } //Apply some filters self::loadFilters($criteria, $filters); - $sort = (!empty($filters['sort'])) ? ListUnassignedPeer::TABLE_NAME.'.'.$filters['sort'] : "LIST_UNASSIGNED.DEL_DELEGATE_DATE"; + $sort = (!empty($filters['sort'])) ? + ListUnassignedPeer::TABLE_NAME.'.'.$filters['sort'] : + "LIST_UNASSIGNED.DEL_DELEGATE_DATE"; $dir = isset($filters['dir']) ? $filters['dir'] : "ASC"; $start = isset($filters['start']) ? $filters['start'] : "0"; $limit = isset($filters['limit']) ? $filters['limit'] : "25"; @@ -284,18 +298,21 @@ class ListUnassigned extends BaseListUnassigned } $this->total = ListUnassignedPeer::doCount($criteria); if ($paged == 1) { - $criteria->setLimit( $limit ); - $criteria->setOffset( $start ); + $criteria->setLimit($limit); + $criteria->setOffset($start); } $dataset = ListUnassignedPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH'); + $aPriorities = array('1' => 'VL', '2' => 'L', '3' => 'N', '4' => 'H', '5' => 'VH'); $data = array(); while ($dataset->next()) { $aRow = (is_null($callbackRecord))? $dataset->getRow() : $callbackRecord($dataset->getRow()); - $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && is_numeric($aRow['DEL_PRIORITY']) && $aRow['DEL_PRIORITY'] <= 5 && $aRow['DEL_PRIORITY'] > 0 ) ? $aRow['DEL_PRIORITY'] : 3; - $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" ); + $aRow['DEL_PRIORITY'] = (isset($aRow['DEL_PRIORITY']) && + is_numeric($aRow['DEL_PRIORITY']) && + $aRow['DEL_PRIORITY'] <= 5 && + $aRow['DEL_PRIORITY'] > 0) ? $aRow['DEL_PRIORITY'] : 3; + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); $data[] = $aRow; } return $data; @@ -326,9 +343,15 @@ class ListUnassigned extends BaseListUnassigned $criteria->addSelectColumn(AppAssignSelfServiceValuePeer::DEL_INDEX); $criteria->addSelectColumn(AppAssignSelfServiceValuePeer::TAS_UID); - $criteria->add(AppAssignSelfServiceValuePeer::ID, AppAssignSelfServiceValuePeer::ID . - " IN (SELECT " . AppAssignSelfServiceValueGroupPeer::ID . " FROM " . AppAssignSelfServiceValueGroupPeer::TABLE_NAME . - " WHERE " . AppAssignSelfServiceValueGroupPeer::GRP_UID . " IN ('" . implode("','", $arrayUid) . "'))", Criteria::CUSTOM); + $criteria->add( + AppAssignSelfServiceValuePeer::ID, + AppAssignSelfServiceValuePeer::ID. + " IN (SELECT ".AppAssignSelfServiceValueGroupPeer::ID. + " FROM ".AppAssignSelfServiceValueGroupPeer::TABLE_NAME. + " WHERE ".AppAssignSelfServiceValueGroupPeer::GRP_UID." IN ('". + implode("','", $arrayUid)."'))", + Criteria::CUSTOM + ); $rsCriteria = AppAssignSelfServiceValuePeer::doSelectRS($criteria); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -431,13 +454,33 @@ class ListUnassigned extends BaseListUnassigned foreach ($arrayAppAssignSelfServiceValueData as $value) { if (is_null($criterionAux)) { - $criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd( - $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd( - $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL)); + $criterionAux = $criteria->getNewCriterion( + ListUnassignedPeer::APP_UID, + $value["APP_UID"], + Criteria::EQUAL + )->addAnd( + $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL) + )->addAnd( + $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL) + ); } else { - $criterionAux = $criteria->getNewCriterion(ListUnassignedPeer::APP_UID, $value["APP_UID"], Criteria::EQUAL)->addAnd( - $criteria->getNewCriterion(ListUnassignedPeer::DEL_INDEX, $value["DEL_INDEX"], Criteria::EQUAL))->addAnd( - $criteria->getNewCriterion(ListUnassignedPeer::TAS_UID, $value["TAS_UID"], Criteria::EQUAL))->addOr( + $criterionAux = $criteria->getNewCriterion( + ListUnassignedPeer::APP_UID, + $value["APP_UID"], + Criteria::EQUAL + )->addAnd( + $criteria->getNewCriterion( + ListUnassignedPeer::DEL_INDEX, + $value["DEL_INDEX"], + Criteria::EQUAL + ) + )->addAnd( + $criteria->getNewCriterion( + ListUnassignedPeer::TAS_UID, + $value["TAS_UID"], + Criteria::EQUAL + ) + )->addOr( $criterionAux ); } @@ -454,4 +497,3 @@ class ListUnassigned extends BaseListUnassigned return (int)$total; } } - diff --git a/workflow/engine/classes/model/ListUnassignedGroup.php b/workflow/engine/classes/model/ListUnassignedGroup.php index 66684fda0..ec3e0b2d2 100644 --- a/workflow/engine/classes/model/ListUnassignedGroup.php +++ b/workflow/engine/classes/model/ListUnassignedGroup.php @@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php'; /** * Skeleton subclass for representing a row from the 'LIST_UNASSIGNED_GROUP' table. * - * + * * * You should add additional methods to this class to meet the * application requirements. This class will only be generated as @@ -14,7 +14,10 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php'; * * @package classes.model */ -class ListUnassignedGroup extends BaseListUnassignedGroup { +// @codingStandardsIgnoreStart +class ListUnassignedGroup extends BaseListUnassignedGroup +{ + // @codingStandardsIgnoreEnd /** * Create List Unassigned Group Table * @@ -23,24 +26,24 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { * */ public function create($data) - { - if(!empty($data['USR_UID'])) { + { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME); try { - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); } else { - $e = new Exception( "Failed Validation in class " . get_class( $this ) . "." ); + $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); throw ($e); } $con->commit(); return $result; - } catch(Exception $e) { + } catch (Exception $e) { $con->rollback(); throw ($e); } @@ -54,22 +57,22 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { */ public function update($data) { - if(!empty($data['USR_UID'])) { + if (!empty($data['USR_UID'])) { $u = new Users(); $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; } - $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME); try { $con->begin(); - $this->setNew( false ); - $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); + $this->setNew(false); + $this->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($this->validate()) { $result = $this->save(); $con->commit(); return $result; } else { $con->rollback(); - throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." )); + throw (new Exception("Failed Validation in class " . get_class($this) . ".")); } } catch (Exception $e) { $con->rollback(); @@ -85,9 +88,9 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { * @throws type * */ - public function remove ($app_uid,$una_uid) + public function remove($app_uid, $una_uid) { - $con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME ); + $con = Propel::getConnection(ListUnassignedGroupPeer::DATABASE_NAME); try { $this->setAppUid($app_uid); $this->setUnaUid($una_uid); @@ -107,7 +110,8 @@ class ListUnassignedGroup extends BaseListUnassignedGroup { * @throws type * */ - public function newRow($unaUid, $usrUid, $type, $typeUid=''){ + public function newRow($unaUid, $usrUid, $type, $typeUid = '') + { $data['UNA_UID'] = $unaUid; $data['USR_UID'] = $usrUid; $data['TYPE'] = $type; From ef8ad7f843d8d7bad5b8d45bf08d76b78854cd2c Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 23 Feb 2017 10:51:09 -0400 Subject: [PATCH 12/13] Fix self service delegation --- workflow/engine/classes/model/ListParticipatedLast.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index bd50f768c..a96a209bd 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -74,7 +74,7 @@ class ListParticipatedLast extends BaseListParticipatedLast } if (!empty($data['USR_UID'])) { $u = new Users(); - $data['USR_ID'] = $u->load($data['USR_UID'])['USR_ID']; + $data['USR_ID'] = $data['USR_UID']==='SELF_SERVICES' ? null : $u->load($data['USR_UID'])['USR_ID']; } if (!empty($data['TAS_UID'])) { $t = new Task(); From e12b3b1f24736c500a8b60a237afc74e6b3081ca Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 23 Feb 2017 14:47:39 -0400 Subject: [PATCH 13/13] + Add PRO_ID verification to avoid reload the process when not needed. --- workflow/engine/classes/model/ListCanceled.php | 2 +- workflow/engine/classes/model/ListCompleted.php | 2 +- workflow/engine/classes/model/ListInbox.php | 2 +- workflow/engine/classes/model/ListMyInbox.php | 2 +- workflow/engine/classes/model/ListParticipatedHistory.php | 2 +- workflow/engine/classes/model/ListParticipatedLast.php | 2 +- workflow/engine/classes/model/ListPaused.php | 2 +- workflow/engine/classes/model/ListUnassigned.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index e5ace9f78..e9e521340 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -108,7 +108,7 @@ class ListCanceled extends BaseListCanceled $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'CANCELLED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 940fd67e9..1b31f63ac 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -99,7 +99,7 @@ class ListCompleted extends BaseListCompleted $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index f6fae9ccf..5af573a86 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -33,7 +33,7 @@ class ListInbox extends BaseListInbox $aData = $oCase->loadCase($data["APP_UID"]); $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListMyInbox.php b/workflow/engine/classes/model/ListMyInbox.php index f05920126..6a29e6c48 100644 --- a/workflow/engine/classes/model/ListMyInbox.php +++ b/workflow/engine/classes/model/ListMyInbox.php @@ -27,7 +27,7 @@ class ListMyInbox extends BaseListMyInbox */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListParticipatedHistory.php b/workflow/engine/classes/model/ListParticipatedHistory.php index a623e5f9b..804ee66d5 100644 --- a/workflow/engine/classes/model/ListParticipatedHistory.php +++ b/workflow/engine/classes/model/ListParticipatedHistory.php @@ -27,7 +27,7 @@ class ListParticipatedHistory extends BaseListParticipatedHistory */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index a96a209bd..63dc369b2 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -68,7 +68,7 @@ class ListParticipatedLast extends BaseListParticipatedLast return; } - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 08899ad07..939ae1c2e 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -117,7 +117,7 @@ class ListPaused extends BaseListPaused $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; } diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index fa8d7777a..1661c3838 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -28,7 +28,7 @@ class ListUnassigned extends BaseListUnassigned */ public function create($data) { - if (!empty($data['PRO_UID'])) { + if (!empty($data['PRO_UID']) && empty($data['PRO_ID'])) { $p = new Process(); $data['PRO_ID'] = $p->load($data['PRO_UID'])['PRO_ID']; }