diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index ba27dce97..5b67922fa 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -992,12 +992,11 @@ class Cases if (isset($Fields["APP_STATUS"]) && $Fields["APP_STATUS"] == "COMPLETED") { if (isset($Fields['CURRENT_USER_UID'])) { $Fields['USR_UID'] = $Fields['CURRENT_USER_UID']; - /*This "list" code is discussed to operate with sub-processes. It should adjust the code for operation with sub-processes. - $listCompleted = new ListCompleted(); - $listCompleted->create($Fields); - $listMyInbox = new ListMyInbox(); - $listMyInbox->refresh($Fields);*/ } + /*----------------------------------********---------------------------------*/ + $completed = new ListCompleted(); + $completed->create($Fields); + /*----------------------------------********---------------------------------*/ } $oApp->update($Fields); @@ -2040,6 +2039,18 @@ class Cases if ($this->appSolr != null) { $this->appSolr->updateApplicationSearchIndex($sAppUid); } + + /*----------------------------------********---------------------------------*/ + $Fields['TAS_UID'] = $sTasUid; + $Fields['USR_UID'] = $sUsrUid; + $Fields['DEL_INDEX'] = $iDelIndex; + $Fields['APP_STATUS'] = 'TO_DO'; + if(!$isSubprocess){ + $Fields['APP_STATUS'] = 'DRAFT'; + } + $inbox = new ListInbox(); + $inbox->newRow($Fields, $sUsrUid); + /*----------------------------------********---------------------------------*/ } catch (exception $e) { throw ($e); } diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 062b2b67a..506c48c22 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -748,8 +748,17 @@ class Derivation //SETS THE APP_PROC_CODE //if (isset($nextDel['TAS_DEF_PROC_CODE'])) //$appFields['APP_PROC_CODE'] = $nextDel['TAS_DEF_PROC_CODE']; - unset( $aSP ); + /*----------------------------------********---------------------------------*/ + if (!empty($iNewDelIndex) && empty($aSP)) { + $oAppDel = AppDelegationPeer::retrieveByPK( $appFields['APP_UID'], $iNewDelIndex ); + $aFields = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME ); + $aFields['APP_STATUS'] = $currentDelegation['APP_STATUS']; + $inbox = new ListInbox(); + $inbox->newRow($aFields, $nextDel['USR_UID']); + } + /*----------------------------------********---------------------------------*/ + unset( $aSP ); } //end foreach diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 1afeb5557..f16617cd3 100755 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -151,16 +151,6 @@ class AppDelegation extends BaseAppDelegation if ($this->validate()) { try { $res = $this->save(); - - /*----------------------------------********---------------------------------*/ - $task = TaskPeer::retrieveByPK( $this->getTasUid() ); - $taskType = $task->getTasType(); - if($taskType == 'NORMAL'){ - $inbox = new ListInbox(); - $res = $this->toArray(BasePeer::TYPE_FIELDNAME); - $inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid); - } - /*----------------------------------********---------------------------------*/ } catch (PropelException $e) { throw ($e); } diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 47dcd53f4..cfefd507a 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -86,6 +86,21 @@ class ListCompleted extends BaseListCompleted $data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID']; } + //Update - WHERE + $criteriaWhere = new Criteria("workflow"); + $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); + //Update - SET + $criteriaSet = new Criteria("workflow"); + $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); + BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); + + $users = new Users(); + $users->refreshTotal($data['USR_UID'], 'add', 'completed'); + if ($data['DEL_PREVIOUS'] != 0) { + $users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); + } else { + $users->refreshTotal($data['USR_UID'], 'remove', 'draft'); + } $con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 8be18c312..f3a40066c 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -141,8 +141,9 @@ class ListInbox extends BaseListInbox } } - public function newRow ($data, $delPreviusUsrUid) { - + public function newRow ($data, $delPreviusUsrUid) + { + $users = new Users(); $data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid; if (isset($data['DEL_TASK_DUE_DATE'])) { $data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE']; @@ -210,9 +211,35 @@ class ListInbox extends BaseListInbox $data['DEL_PREVIOUS_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; } - - if(!isset($data['APP_STATUS']) && $data['DEL_INDEX']>1){ - $data['APP_STATUS'] = 'TO_DO'; + + + if ($data['APP_STATUS'] == 'DRAFT') { + $users->refreshTotal($data['USR_UID'], 'add', 'draft'); + } else { + $criteria = new Criteria(); + $criteria->addSelectColumn(SubApplicationPeer::APP_UID); + $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $dataset = SubApplicationPeer::doSelectRS($criteria); + if ($dataset->next()) { + $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); + $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); + } else if ($data['DEL_INDEX'] == 2) { + $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); + $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); + } else { + $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); + $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); + } + /* + if ($data['DEL_INDEX'] == 1) { + $users->refreshTotal($data['USR_UID'], 'add', 'draft'); + } elseif ($data['DEL_INDEX'] == 2) { + $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); + $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); + } else { + $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); + $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); + }*/ } self::create($data); diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index ce1de459b..085921ade 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -48,6 +48,8 @@ class ListParticipatedLast extends BaseListParticipatedLast $aRow = $dataset->getRow(); $data['APP_STATUS'] = $aRow['APP_STATUS']; + $users = new Users(); + $users->refreshTotal($data['USR_UID'], 'add', 'participated'); $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -74,7 +76,7 @@ class ListParticipatedLast extends BaseListParticipatedLast * @throws type */ public function update($data) - { + { $data['DEL_THREAD_STATUS'] = (isset($data['DEL_THREAD_STATUS'])) ? $data['DEL_THREAD_STATUS'] : 'OPEN'; $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { @@ -132,6 +134,11 @@ class ListParticipatedLast extends BaseListParticipatedLast */ public function remove ($app_uid, $usr_uid) { + $existField = ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid); + if (! is_null( $existField )) { + $users = new Users(); + $users->refreshTotal($usr_uid, 'removed', 'participated'); + } $con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME ); try { $this->setAppUid($app_uid); diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index e988b508a..bc1317365 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -385,5 +385,59 @@ class Users extends BaseUsers } while ($aFields['USR_STATUS'] != 'ACTIVE'); return $aFields; } + + public function refreshTotal ($userId, $type = 'add', $list = "inbox", $total = 1) + { + $nameList = self::getNameTotal($list); + $criteria = new Criteria(); + $criteria->addSelectColumn( $nameList ); + $criteria->add( UsersPeer::USR_UID, $userId, Criteria::EQUAL ); + $dataset = ApplicationPeer::doSelectRS($criteria); + $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $dataset->next(); + $aRow = $dataset->getRow(); + + $num = $aRow[$nameList]; + if ($type == 'add') { + $num++; + } else { + $num--; + } + + $data = array( + 'USR_UID' => $userId, + $nameList => $num + ); + self::update($data); + } + + public function getNameTotal($list = "inbox") + { + switch ($list) { + case 'draft': + $return = 'USR_TOTAL_DRAFT'; + break; + case 'canceled': + $return = 'USR_TOTAL_CANCELLED'; + break; + case 'participated': + $return = 'USR_TOTAL_PARTICIPATED'; + break; + case 'paused': + $return = 'USR_TOTAL_PAUSED'; + break; + case 'completed': + $return = 'USR_TOTAL_COMPLETED'; + break; + case 'unassigned': + $return = 'USR_TOTAL_UNASSIGNED'; + break; + case 'inbox': + default: + $return = 'USR_TOTAL_INBOX'; + break; + } + return $return; + } } diff --git a/workflow/engine/classes/model/map/ListInboxMapBuilder.php b/workflow/engine/classes/model/map/ListInboxMapBuilder.php index fffac5ac3..5f6f73868 100644 --- a/workflow/engine/classes/model/map/ListInboxMapBuilder.php +++ b/workflow/engine/classes/model/map/ListInboxMapBuilder.php @@ -3,6 +3,7 @@ require_once 'propel/map/MapBuilder.php'; include_once 'creole/CreoleTypes.php'; + /** * This class adds structure of 'LIST_INBOX' table to 'workflow' DatabaseMap object. * @@ -15,7 +16,6 @@ include_once 'creole/CreoleTypes.php'; * * @package workflow.classes.model.map */ - class ListInboxMapBuilder { @@ -76,8 +76,8 @@ class ListInboxMapBuilder $tMap->addColumn('PRO_UID', 'ProUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null); - - $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, true, 32); + + $tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 32); $tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255); diff --git a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php index 2380c78e2..a67b28884 100644 --- a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php +++ b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php @@ -3,6 +3,7 @@ require_once 'propel/map/MapBuilder.php'; include_once 'creole/CreoleTypes.php'; + /** * This class adds structure of 'LIST_PARTICIPATED_LAST' table to 'workflow' DatabaseMap object. * @@ -15,7 +16,6 @@ include_once 'creole/CreoleTypes.php'; * * @package workflow.classes.model.map */ - class ListParticipatedLastMapBuilder { @@ -66,9 +66,9 @@ class ListParticipatedLastMapBuilder $tMap->setUseIdGenerator(false); $tMap->addPrimaryKey('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32); - + $tMap->addPrimaryKey('USR_UID', 'UsrUid', 'string', CreoleTypes::VARCHAR, true, 32); - + $tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null); $tMap->addColumn('TAS_UID', 'TasUid', 'string', CreoleTypes::VARCHAR, true, 32); @@ -106,8 +106,8 @@ class ListParticipatedLastMapBuilder $tMap->addColumn('DEL_DUE_DATE', 'DelDueDate', 'int', CreoleTypes::TIMESTAMP, false, null); $tMap->addColumn('DEL_PRIORITY', 'DelPriority', 'string', CreoleTypes::VARCHAR, true, 32); - - $tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, false, 32); + + $tMap->addColumn('DEL_THREAD_STATUS', 'DelThreadStatus', 'string', CreoleTypes::VARCHAR, true, 32); } // doBuild() diff --git a/workflow/engine/classes/model/map/UsersMapBuilder.php b/workflow/engine/classes/model/map/UsersMapBuilder.php index e811bf8aa..7ebac9dcb 100755 --- a/workflow/engine/classes/model/map/UsersMapBuilder.php +++ b/workflow/engine/classes/model/map/UsersMapBuilder.php @@ -117,6 +117,20 @@ class UsersMapBuilder $tMap->addColumn('USR_UX', 'UsrUx', 'string', CreoleTypes::VARCHAR, false, 128); + $tMap->addColumn('USR_TOTAL_INBOX', 'UsrTotalInbox', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_DRAFT', 'UsrTotalDraft', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_CANCELLED', 'UsrTotalCancelled', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_PARTICIPATED', 'UsrTotalParticipated', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_PAUSED', 'UsrTotalPaused', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_COMPLETED', 'UsrTotalCompleted', 'int', CreoleTypes::INTEGER, false, null); + + $tMap->addColumn('USR_TOTAL_UNASSIGNED', 'UsrTotalUnassigned', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addValidator('USR_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|VACATION|CLOSED', 'Please select a valid type.'); $tMap->addValidator('USR_STATUS', 'required', 'propel.validator.RequiredValidator', '', 'Type is required.'); diff --git a/workflow/engine/classes/model/om/BaseHolidayPeer.php b/workflow/engine/classes/model/om/BaseHolidayPeer.php index 4cc6b944b..e517622e4 100755 --- a/workflow/engine/classes/model/om/BaseHolidayPeer.php +++ b/workflow/engine/classes/model/om/BaseHolidayPeer.php @@ -8,7 +8,7 @@ include_once 'classes/model/Holiday.php'; /** * Base static class for performing query and update operations on the 'HOLIDAY' table. * - * + * * * @package workflow.classes.model.om */ @@ -348,8 +348,8 @@ abstract class BaseHolidayPeer $criteria = $values->buildCriteria(); // build Criteria from Holiday object } - $criteria->remove(HolidayPeer::HLD_UID); // remove pkey col since this table uses auto-increment - + //$criteria->remove(HolidayPeer::HLD_UID); // remove pkey col since this table uses auto-increment + // Set the correct dbName $criteria->setDbName(self::DATABASE_NAME); diff --git a/workflow/engine/classes/model/om/BaseListInbox.php b/workflow/engine/classes/model/om/BaseListInbox.php index c045167a3..7eac24aa5 100644 --- a/workflow/engine/classes/model/om/BaseListInbox.php +++ b/workflow/engine/classes/model/om/BaseListInbox.php @@ -9,15 +9,13 @@ include_once 'propel/util/Criteria.php'; include_once 'classes/model/ListInboxPeer.php'; - /** * Base class that represents a row from the 'LIST_INBOX' table. * * * * @package workflow.classes.model.om -*/ - + */ abstract class BaseListInbox extends BaseObject implements Persistent { @@ -64,12 +62,12 @@ abstract class BaseListInbox extends BaseObject implements Persistent * @var int */ protected $app_number = 0; - + /** * The value for the app_status field. * @var string */ - protected $app_status = ''; + protected $app_status = '0'; /** * The value for the app_title field. @@ -222,7 +220,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent return $this->app_number; } - + /** * Get the [app_status] column value. * @@ -581,7 +579,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent } } // setAppNumber() - + /** * Set the value of [app_status] column. * @@ -597,12 +595,13 @@ abstract class BaseListInbox extends BaseObject implements Persistent $v = (string) $v; } - if ($this->app_status !== $v || $v === '') { + if ($this->app_status !== $v || $v === '0') { $this->app_status = $v; $this->modifiedColumns[] = ListInboxPeer::APP_STATUS; } } // setAppStatus() + /** * Set the value of [app_title] column. * @@ -923,7 +922,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->pro_uid = $rs->getString($startcol + 4); $this->app_number = $rs->getInt($startcol + 5); - + $this->app_status = $rs->getString($startcol + 6); $this->app_title = $rs->getString($startcol + 7); @@ -955,7 +954,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 19; // 18 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 19; // 19 = ListInboxPeer::NUM_COLUMNS - ListInboxPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating ListInbox object", $e); @@ -1216,7 +1215,6 @@ abstract class BaseListInbox extends BaseObject implements Persistent case 18: return $this->getDelPriority(); break; - default: return null; break; @@ -1390,7 +1388,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent if (array_key_exists($keys[5], $arr)) { $this->setAppNumber($arr[$keys[5]]); } - + if (array_key_exists($keys[6], $arr)) { $this->setAppStatus($arr[$keys[6]]); } @@ -1477,7 +1475,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent if ($this->isColumnModified(ListInboxPeer::APP_NUMBER)) { $criteria->add(ListInboxPeer::APP_NUMBER, $this->app_number); } - + if ($this->isColumnModified(ListInboxPeer::APP_STATUS)) { $criteria->add(ListInboxPeer::APP_STATUS, $this->app_status); } @@ -1603,7 +1601,7 @@ abstract class BaseListInbox extends BaseObject implements Persistent $copyObj->setProUid($this->pro_uid); $copyObj->setAppNumber($this->app_number); - + $copyObj->setAppStatus($this->app_status); $copyObj->setAppTitle($this->app_title); diff --git a/workflow/engine/classes/model/om/BaseListInboxPeer.php b/workflow/engine/classes/model/om/BaseListInboxPeer.php index 5f0bae0a8..01e529d68 100644 --- a/workflow/engine/classes/model/om/BaseListInboxPeer.php +++ b/workflow/engine/classes/model/om/BaseListInboxPeer.php @@ -1,20 +1,17 @@ array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus','AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', ), + BasePeer::TYPE_PHPNAME => array ('AppUid', 'DelIndex', 'UsrUid', 'TasUid', 'ProUid', 'AppNumber', 'AppStatus', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppUpdateDate', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', '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_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_PRIORITY', ), BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) @@ -115,10 +112,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, 'AppTitle' => 6, 'AppProTitle' => 7, 'AppTasTitle' => 8, 'AppUpdateDate' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelDelegateDate' => 14, 'DelInitDate' => 15, 'DelDueDate' => 16, 'DelPriority' => 17, ), + 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, 'DelPriority' => 18, ), 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_PRIORITY => 18, ), 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_PRIORITY' => 18, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ) + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, ) ); /** @@ -230,7 +227,7 @@ abstract class BaseListInboxPeer $criteria->addSelectColumn(ListInboxPeer::PRO_UID); $criteria->addSelectColumn(ListInboxPeer::APP_NUMBER); - + $criteria->addSelectColumn(ListInboxPeer::APP_STATUS); $criteria->addSelectColumn(ListInboxPeer::APP_TITLE); diff --git a/workflow/engine/classes/model/om/BaseListParticipatedLast.php b/workflow/engine/classes/model/om/BaseListParticipatedLast.php index 0d84c6afa..4344870fb 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedLast.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedLast.php @@ -9,15 +9,13 @@ include_once 'propel/util/Criteria.php'; include_once 'classes/model/ListParticipatedLastPeer.php'; - /** * Base class that represents a row from the 'LIST_PARTICIPATED_LAST' table. * * * * @package workflow.classes.model.om -*/ - + */ abstract class BaseListParticipatedLast extends BaseObject implements Persistent { @@ -35,18 +33,18 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent */ protected $app_uid = ''; - /** - * The value for the del_index field. - * @var int - */ - protected $del_index = 0; - /** * The value for the usr_uid field. * @var string */ protected $usr_uid = ''; + /** + * The value for the del_index field. + * @var int + */ + protected $del_index = 0; + /** * The value for the tas_uid field. * @var string @@ -154,12 +152,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent * @var string */ protected $del_priority = '3'; - + /** * The value for the del_thread_status field. * @var string */ - protected $del_thread_status = ''; + protected $del_thread_status = 'OPEN'; /** * Flag to prevent endless save loop, if this object is referenced @@ -185,18 +183,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->app_uid; } - - /** - * Get the [del_index] column value. - * - * @return int - */ - public function getDelIndex() - { - return $this->del_index; - } - /** * Get the [usr_uid] column value. * @@ -208,6 +195,17 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->usr_uid; } + /** + * Get the [del_index] column value. + * + * @return int + */ + public function getDelIndex() + { + + return $this->del_index; + } + /** * Get the [tas_uid] column value. * @@ -284,7 +282,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->app_status; } - + /** * Get the [del_previous_usr_uid] column value. * @@ -468,7 +466,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent return $this->del_priority; } - + /** * Get the [del_thread_status] column value. * @@ -501,28 +499,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } } // setAppUid() - - /** - * Set the value of [del_index] column. - * - * @param int $v new value - * @return void - */ - public function setDelIndex($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->del_index !== $v || $v === 0) { - $this->del_index = $v; - $this->modifiedColumns[] = ListParticipatedLastPeer::DEL_INDEX; - } - - } // setDelIndex() /** * Set the value of [usr_uid] column. @@ -546,6 +522,28 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } // setUsrUid() + /** + * Set the value of [del_index] column. + * + * @param int $v new value + * @return void + */ + public function setDelIndex($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->del_index !== $v || $v === 0) { + $this->del_index = $v; + $this->modifiedColumns[] = ListParticipatedLastPeer::DEL_INDEX; + } + + } // setDelIndex() + /** * Set the value of [tas_uid] column. * @@ -962,7 +960,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent } } // setDelPriority() - + /** * Set the value of [del_thread_status] column. * @@ -1003,10 +1001,10 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent try { $this->app_uid = $rs->getString($startcol + 0); - - $this->del_index = $rs->getInt($startcol + 1); - $this->usr_uid = $rs->getString($startcol + 2); + $this->usr_uid = $rs->getString($startcol + 1); + + $this->del_index = $rs->getInt($startcol + 2); $this->tas_uid = $rs->getString($startcol + 3); @@ -1020,7 +1018,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->app_tas_title = $rs->getString($startcol + 8); - $this->app_status = $rs->getString($startcol + 9); + $this->app_status = $rs->getString($startcol + 9); $this->del_previous_usr_uid = $rs->getString($startcol + 10); @@ -1043,7 +1041,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $this->del_due_date = $rs->getTimestamp($startcol + 19, null); $this->del_priority = $rs->getString($startcol + 20); - + $this->del_thread_status = $rs->getString($startcol + 21); $this->resetModified(); @@ -1257,7 +1255,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent switch($pos) { case 0: return $this->getAppUid(); - break; + break; case 1: return $this->getUsrUid(); break; @@ -1284,7 +1282,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent break; case 9: return $this->getAppStatus(); - break; + break; case 10: return $this->getDelPreviousUsrUid(); break; @@ -1318,7 +1316,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent case 20: return $this->getDelPriority(); break; - case 21: + case 21: return $this->getDelThreadStatus(); break; default: @@ -1350,7 +1348,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $keys[6] => $this->getAppTitle(), $keys[7] => $this->getAppProTitle(), $keys[8] => $this->getAppTasTitle(), - $keys[9] => $this->getAppStatus(), + $keys[9] => $this->getAppStatus(), $keys[10] => $this->getDelPreviousUsrUid(), $keys[11] => $this->getDelPreviousUsrUsername(), $keys[12] => $this->getDelPreviousUsrFirstname(), @@ -1396,13 +1394,13 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent switch($pos) { case 0: $this->setAppUid($value); - break; + break; case 1: $this->setUsrUid($value); break; case 2: $this->setDelIndex($value); - break; + break; case 3: $this->setTasUid($value); break; @@ -1423,7 +1421,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent break; case 9: $this->setAppStatus($value); - break; + break; case 10: $this->setDelPreviousUsrUid($value); break; @@ -1485,12 +1483,12 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if (array_key_exists($keys[0], $arr)) { $this->setAppUid($arr[$keys[0]]); - } + } if (array_key_exists($keys[1], $arr)) { $this->setUsrUid($arr[$keys[1]]); } - + if (array_key_exists($keys[2], $arr)) { $this->setDelIndex($arr[$keys[2]]); } @@ -1521,7 +1519,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if (array_key_exists($keys[9], $arr)) { $this->setAppStatus($arr[$keys[9]]); - } + } if (array_key_exists($keys[10], $arr)) { $this->setDelPreviousUsrUid($arr[$keys[10]]); @@ -1566,7 +1564,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if (array_key_exists($keys[20], $arr)) { $this->setDelPriority($arr[$keys[20]]); } - + if (array_key_exists($keys[21], $arr)) { $this->setDelThreadStatus($arr[$keys[21]]); } @@ -1585,15 +1583,15 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if ($this->isColumnModified(ListParticipatedLastPeer::APP_UID)) { $criteria->add(ListParticipatedLastPeer::APP_UID, $this->app_uid); } - - if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) { - $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index); - } if ($this->isColumnModified(ListParticipatedLastPeer::USR_UID)) { $criteria->add(ListParticipatedLastPeer::USR_UID, $this->usr_uid); } + if ($this->isColumnModified(ListParticipatedLastPeer::DEL_INDEX)) { + $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $this->del_index); + } + if ($this->isColumnModified(ListParticipatedLastPeer::TAS_UID)) { $criteria->add(ListParticipatedLastPeer::TAS_UID, $this->tas_uid); } @@ -1620,7 +1618,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if ($this->isColumnModified(ListParticipatedLastPeer::APP_STATUS)) { $criteria->add(ListParticipatedLastPeer::APP_STATUS, $this->app_status); - } + } if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID)) { $criteria->add(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID, $this->del_previous_usr_uid); @@ -1665,7 +1663,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent if ($this->isColumnModified(ListParticipatedLastPeer::DEL_PRIORITY)) { $criteria->add(ListParticipatedLastPeer::DEL_PRIORITY, $this->del_priority); } - + if ($this->isColumnModified(ListParticipatedLastPeer::DEL_THREAD_STATUS)) { $criteria->add(ListParticipatedLastPeer::DEL_THREAD_STATUS, $this->del_thread_status); } @@ -1736,6 +1734,8 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent public function copyInto($copyObj, $deepCopy = false) { + $copyObj->setDelIndex($this->del_index); + $copyObj->setTasUid($this->tas_uid); $copyObj->setProUid($this->pro_uid); @@ -1750,8 +1750,6 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $copyObj->setAppStatus($this->app_status); -// $copyObj->setDelIndex($this->del_index); - $copyObj->setDelPreviousUsrUid($this->del_previous_usr_uid); $copyObj->setDelPreviousUsrUsername($this->del_previous_usr_username); @@ -1773,14 +1771,14 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent $copyObj->setDelDueDate($this->del_due_date); $copyObj->setDelPriority($this->del_priority); - + $copyObj->setDelThreadStatus($this->del_thread_status); $copyObj->setNew(true); $copyObj->setAppUid(''); // this is a pkey column, so set to default value - + $copyObj->setUsrUid(''); // this is a pkey column, so set to default value } diff --git a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php index efda1a1f1..777982e33 100644 --- a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php +++ b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php @@ -5,15 +5,13 @@ require_once 'propel/util/BasePeer.php'; // actual class may be a subclass -- as returned by ListParticipatedLastPeer::getOMClass() include_once 'classes/model/ListParticipatedLast.php'; - /** * Base static class for performing query and update operations on the 'LIST_PARTICIPATED_LAST' table. * * * * @package workflow.classes.model.om -*/ - + */ abstract class BaseListParticipatedLastPeer { @@ -27,7 +25,7 @@ abstract class BaseListParticipatedLastPeer const CLASS_DEFAULT = 'classes.model.ListParticipatedLast'; /** The total number of columns. */ - const NUM_COLUMNS = 21; + const NUM_COLUMNS = 22; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -35,13 +33,13 @@ abstract class BaseListParticipatedLastPeer /** the column name for the APP_UID field */ const APP_UID = 'LIST_PARTICIPATED_LAST.APP_UID'; - - /** the column name for the DEL_INDEX field */ - const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX'; /** the column name for the USR_UID field */ const USR_UID = 'LIST_PARTICIPATED_LAST.USR_UID'; + /** the column name for the DEL_INDEX field */ + const DEL_INDEX = 'LIST_PARTICIPATED_LAST.DEL_INDEX'; + /** the column name for the TAS_UID field */ const TAS_UID = 'LIST_PARTICIPATED_LAST.TAS_UID'; @@ -61,7 +59,7 @@ abstract class BaseListParticipatedLastPeer const APP_TAS_TITLE = 'LIST_PARTICIPATED_LAST.APP_TAS_TITLE'; /** the column name for the APP_STATUS field */ - const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS'; + const APP_STATUS = 'LIST_PARTICIPATED_LAST.APP_STATUS'; /** the column name for the DEL_PREVIOUS_USR_UID field */ const DEL_PREVIOUS_USR_UID = 'LIST_PARTICIPATED_LAST.DEL_PREVIOUS_USR_UID'; @@ -95,8 +93,8 @@ abstract class BaseListParticipatedLastPeer /** the column name for the DEL_PRIORITY field */ const DEL_PRIORITY = 'LIST_PARTICIPATED_LAST.DEL_PRIORITY'; - - /** the column name for the DEL_THREAD_STATUS field */ + + /** the column name for the DEL_THREAD_STATUS field */ const DEL_THREAD_STATUS = 'LIST_PARTICIPATED_LAST.DEL_THREAD_STATUS'; /** The PHP to DB Name Mapping */ @@ -110,7 +108,7 @@ 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', 'DelDelegateDate', 'DelInitDate', 'DelDueDate', 'DelPriority', 'DelPriority', 'DelThreadStatus'), + BasePeer::TYPE_PHPNAME => array ('AppUid', 'UsrUid', 'DelIndex', 'TasUid', 'ProUid', 'AppNumber', 'AppTitle', 'AppProTitle', 'AppTasTitle', 'AppStatus', 'DelPreviousUsrUid', 'DelPreviousUsrUsername', 'DelPreviousUsrFirstname', 'DelPreviousUsrLastname', 'DelCurrentUsrUsername', 'DelCurrentUsrFirstname', 'DelCurrentUsrLastname', '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_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_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, ) @@ -123,7 +121,7 @@ abstract class BaseListParticipatedLastPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('AppUid' => 0, 'UsrUid' => 2, 'DelIndex' => 3, 'TasUid' => 4, 'ProUid' => 5, 'AppNumber' => 6, 'AppTitle' => 7, 'AppProTitle' => 8, 'AppTasTitle' => 9, 'AppStatus' => 9, 'DelPreviousUsrUid' => 10, 'DelPreviousUsrUsername' => 11, 'DelPreviousUsrFirstname' => 12, 'DelPreviousUsrLastname' => 13, 'DelCurrentUsrUsername' => 14, 'DelCurrentUsrFirstname' => 15, 'DelCurrentUsrLastname' => 16, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, 'DelThreadStatus' => 21,), + 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, 'DelDelegateDate' => 17, 'DelInitDate' => 18, 'DelDueDate' => 19, 'DelPriority' => 20, 'DelThreadStatus' => 21, ), 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_DELEGATE_DATE => 17, ListParticipatedLastPeer::DEL_INIT_DATE => 18, ListParticipatedLastPeer::DEL_DUE_DATE => 19, ListParticipatedLastPeer::DEL_PRIORITY => 20, ListParticipatedLastPeer::DEL_THREAD_STATUS => 21, ), 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_DELEGATE_DATE' => 17, 'DEL_INIT_DATE' => 18, 'DEL_DUE_DATE' => 19, 'DEL_PRIORITY' => 20, 'DEL_THREAD_STATUS' => 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, ) @@ -228,9 +226,9 @@ abstract class BaseListParticipatedLastPeer { $criteria->addSelectColumn(ListParticipatedLastPeer::APP_UID); - + $criteria->addSelectColumn(ListParticipatedLastPeer::USR_UID); - + $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_INDEX); $criteria->addSelectColumn(ListParticipatedLastPeer::TAS_UID); @@ -245,7 +243,7 @@ abstract class BaseListParticipatedLastPeer $criteria->addSelectColumn(ListParticipatedLastPeer::APP_TAS_TITLE); - $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS); + $criteria->addSelectColumn(ListParticipatedLastPeer::APP_STATUS); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PREVIOUS_USR_UID); @@ -268,7 +266,7 @@ abstract class BaseListParticipatedLastPeer $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_DUE_DATE); $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_PRIORITY); - + $criteria->addSelectColumn(ListParticipatedLastPeer::DEL_THREAD_STATUS); } @@ -485,7 +483,7 @@ abstract class BaseListParticipatedLastPeer $comparison = $criteria->getComparison(ListParticipatedLastPeer::APP_UID); $selectCriteria->add(ListParticipatedLastPeer::APP_UID, $criteria->remove(ListParticipatedLastPeer::APP_UID), $comparison); - + $comparison = $criteria->getComparison(ListParticipatedLastPeer::USR_UID); $selectCriteria->add(ListParticipatedLastPeer::USR_UID, $criteria->remove(ListParticipatedLastPeer::USR_UID), $comparison); @@ -562,11 +560,10 @@ abstract class BaseListParticipatedLastPeer $vals[0][] = $value[0]; $vals[1][] = $value[1]; - $vals[2][] = $value[2]; } $criteria->add(ListParticipatedLastPeer::APP_UID, $vals[0], Criteria::IN); - $criteria->add(ListParticipatedLastPeer::USR_UID, $vals[2], Criteria::IN); + $criteria->add(ListParticipatedLastPeer::USR_UID, $vals[1], Criteria::IN); } // Set the correct dbName diff --git a/workflow/engine/classes/model/om/BaseUsers.php b/workflow/engine/classes/model/om/BaseUsers.php index a003d2d55..b9c8bc78b 100755 --- a/workflow/engine/classes/model/om/BaseUsers.php +++ b/workflow/engine/classes/model/om/BaseUsers.php @@ -183,6 +183,48 @@ abstract class BaseUsers extends BaseObject implements Persistent */ protected $usr_ux = 'NORMAL'; + /** + * The value for the usr_total_inbox field. + * @var int + */ + protected $usr_total_inbox = 0; + + /** + * The value for the usr_total_draft field. + * @var int + */ + protected $usr_total_draft = 0; + + /** + * The value for the usr_total_cancelled field. + * @var int + */ + protected $usr_total_cancelled = 0; + + /** + * The value for the usr_total_participated field. + * @var int + */ + protected $usr_total_participated = 0; + + /** + * The value for the usr_total_paused field. + * @var int + */ + protected $usr_total_paused = 0; + + /** + * The value for the usr_total_completed field. + * @var int + */ + protected $usr_total_completed = 0; + + /** + * The value for the usr_total_unassigned field. + * @var int + */ + protected $usr_total_unassigned = 0; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -567,6 +609,83 @@ abstract class BaseUsers extends BaseObject implements Persistent return $this->usr_ux; } + /** + * Get the [usr_total_inbox] column value. + * + * @return int + */ + public function getUsrTotalInbox() + { + + return $this->usr_total_inbox; + } + + /** + * Get the [usr_total_draft] column value. + * + * @return int + */ + public function getUsrTotalDraft() + { + + return $this->usr_total_draft; + } + + /** + * Get the [usr_total_cancelled] column value. + * + * @return int + */ + public function getUsrTotalCancelled() + { + + return $this->usr_total_cancelled; + } + + /** + * Get the [usr_total_participated] column value. + * + * @return int + */ + public function getUsrTotalParticipated() + { + + return $this->usr_total_participated; + } + + /** + * Get the [usr_total_paused] column value. + * + * @return int + */ + public function getUsrTotalPaused() + { + + return $this->usr_total_paused; + } + + /** + * Get the [usr_total_completed] column value. + * + * @return int + */ + public function getUsrTotalCompleted() + { + + return $this->usr_total_completed; + } + + /** + * Get the [usr_total_unassigned] column value. + * + * @return int + */ + public function getUsrTotalUnassigned() + { + + return $this->usr_total_unassigned; + } + /** * Set the value of [usr_uid] column. * @@ -1167,6 +1286,160 @@ abstract class BaseUsers extends BaseObject implements Persistent } // setUsrUx() + /** + * Set the value of [usr_total_inbox] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalInbox($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_total_inbox !== $v || $v === 0) { + $this->usr_total_inbox = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_INBOX; + } + + } // setUsrTotalInbox() + + /** + * Set the value of [usr_total_draft] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalDraft($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_total_draft !== $v || $v === 0) { + $this->usr_total_draft = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_DRAFT; + } + + } // setUsrTotalDraft() + + /** + * Set the value of [usr_total_cancelled] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalCancelled($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_total_cancelled !== $v || $v === 0) { + $this->usr_total_cancelled = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_CANCELLED; + } + + } // setUsrTotalCancelled() + + /** + * Set the value of [usr_total_participated] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalParticipated($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_total_participated !== $v || $v === 0) { + $this->usr_total_participated = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_PARTICIPATED; + } + + } // setUsrTotalParticipated() + + /** + * Set the value of [usr_total_paused] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalPaused($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_total_paused !== $v || $v === 0) { + $this->usr_total_paused = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_PAUSED; + } + + } // setUsrTotalPaused() + + /** + * Set the value of [usr_total_completed] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalCompleted($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_total_completed !== $v || $v === 0) { + $this->usr_total_completed = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_COMPLETED; + } + + } // setUsrTotalCompleted() + + /** + * Set the value of [usr_total_unassigned] column. + * + * @param int $v new value + * @return void + */ + public function setUsrTotalUnassigned($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_total_unassigned !== $v || $v === 0) { + $this->usr_total_unassigned = $v; + $this->modifiedColumns[] = UsersPeer::USR_TOTAL_UNASSIGNED; + } + + } // setUsrTotalUnassigned() + /** * Hydrates (populates) the object variables with values from the database resultset. * @@ -1236,12 +1509,26 @@ abstract class BaseUsers extends BaseObject implements Persistent $this->usr_ux = $rs->getString($startcol + 25); + $this->usr_total_inbox = $rs->getInt($startcol + 26); + + $this->usr_total_draft = $rs->getInt($startcol + 27); + + $this->usr_total_cancelled = $rs->getInt($startcol + 28); + + $this->usr_total_participated = $rs->getInt($startcol + 29); + + $this->usr_total_paused = $rs->getInt($startcol + 30); + + $this->usr_total_completed = $rs->getInt($startcol + 31); + + $this->usr_total_unassigned = $rs->getInt($startcol + 32); + $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 26; // 26 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 33; // 33 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Users object", $e); @@ -1523,6 +1810,27 @@ abstract class BaseUsers extends BaseObject implements Persistent case 25: return $this->getUsrUx(); break; + case 26: + return $this->getUsrTotalInbox(); + break; + case 27: + return $this->getUsrTotalDraft(); + break; + case 28: + return $this->getUsrTotalCancelled(); + break; + case 29: + return $this->getUsrTotalParticipated(); + break; + case 30: + return $this->getUsrTotalPaused(); + break; + case 31: + return $this->getUsrTotalCompleted(); + break; + case 32: + return $this->getUsrTotalUnassigned(); + break; default: return null; break; @@ -1569,6 +1877,13 @@ abstract class BaseUsers extends BaseObject implements Persistent $keys[23] => $this->getUsrReportsTo(), $keys[24] => $this->getUsrReplacedBy(), $keys[25] => $this->getUsrUx(), + $keys[26] => $this->getUsrTotalInbox(), + $keys[27] => $this->getUsrTotalDraft(), + $keys[28] => $this->getUsrTotalCancelled(), + $keys[29] => $this->getUsrTotalParticipated(), + $keys[30] => $this->getUsrTotalPaused(), + $keys[31] => $this->getUsrTotalCompleted(), + $keys[32] => $this->getUsrTotalUnassigned(), ); return $result; } @@ -1678,6 +1993,27 @@ abstract class BaseUsers extends BaseObject implements Persistent case 25: $this->setUsrUx($value); break; + case 26: + $this->setUsrTotalInbox($value); + break; + case 27: + $this->setUsrTotalDraft($value); + break; + case 28: + $this->setUsrTotalCancelled($value); + break; + case 29: + $this->setUsrTotalParticipated($value); + break; + case 30: + $this->setUsrTotalPaused($value); + break; + case 31: + $this->setUsrTotalCompleted($value); + break; + case 32: + $this->setUsrTotalUnassigned($value); + break; } // switch() } @@ -1805,6 +2141,34 @@ abstract class BaseUsers extends BaseObject implements Persistent $this->setUsrUx($arr[$keys[25]]); } + if (array_key_exists($keys[26], $arr)) { + $this->setUsrTotalInbox($arr[$keys[26]]); + } + + if (array_key_exists($keys[27], $arr)) { + $this->setUsrTotalDraft($arr[$keys[27]]); + } + + if (array_key_exists($keys[28], $arr)) { + $this->setUsrTotalCancelled($arr[$keys[28]]); + } + + if (array_key_exists($keys[29], $arr)) { + $this->setUsrTotalParticipated($arr[$keys[29]]); + } + + if (array_key_exists($keys[30], $arr)) { + $this->setUsrTotalPaused($arr[$keys[30]]); + } + + if (array_key_exists($keys[31], $arr)) { + $this->setUsrTotalCompleted($arr[$keys[31]]); + } + + if (array_key_exists($keys[32], $arr)) { + $this->setUsrTotalUnassigned($arr[$keys[32]]); + } + } /** @@ -1920,6 +2284,34 @@ abstract class BaseUsers extends BaseObject implements Persistent $criteria->add(UsersPeer::USR_UX, $this->usr_ux); } + if ($this->isColumnModified(UsersPeer::USR_TOTAL_INBOX)) { + $criteria->add(UsersPeer::USR_TOTAL_INBOX, $this->usr_total_inbox); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_DRAFT)) { + $criteria->add(UsersPeer::USR_TOTAL_DRAFT, $this->usr_total_draft); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_CANCELLED)) { + $criteria->add(UsersPeer::USR_TOTAL_CANCELLED, $this->usr_total_cancelled); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_PARTICIPATED)) { + $criteria->add(UsersPeer::USR_TOTAL_PARTICIPATED, $this->usr_total_participated); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_PAUSED)) { + $criteria->add(UsersPeer::USR_TOTAL_PAUSED, $this->usr_total_paused); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_COMPLETED)) { + $criteria->add(UsersPeer::USR_TOTAL_COMPLETED, $this->usr_total_completed); + } + + if ($this->isColumnModified(UsersPeer::USR_TOTAL_UNASSIGNED)) { + $criteria->add(UsersPeer::USR_TOTAL_UNASSIGNED, $this->usr_total_unassigned); + } + return $criteria; } @@ -2024,6 +2416,20 @@ abstract class BaseUsers extends BaseObject implements Persistent $copyObj->setUsrUx($this->usr_ux); + $copyObj->setUsrTotalInbox($this->usr_total_inbox); + + $copyObj->setUsrTotalDraft($this->usr_total_draft); + + $copyObj->setUsrTotalCancelled($this->usr_total_cancelled); + + $copyObj->setUsrTotalParticipated($this->usr_total_participated); + + $copyObj->setUsrTotalPaused($this->usr_total_paused); + + $copyObj->setUsrTotalCompleted($this->usr_total_completed); + + $copyObj->setUsrTotalUnassigned($this->usr_total_unassigned); + $copyObj->setNew(true); diff --git a/workflow/engine/classes/model/om/BaseUsersPeer.php b/workflow/engine/classes/model/om/BaseUsersPeer.php index d4d1062e3..98595ceba 100755 --- a/workflow/engine/classes/model/om/BaseUsersPeer.php +++ b/workflow/engine/classes/model/om/BaseUsersPeer.php @@ -25,7 +25,7 @@ abstract class BaseUsersPeer const CLASS_DEFAULT = 'classes.model.Users'; /** The total number of columns. */ - const NUM_COLUMNS = 26; + const NUM_COLUMNS = 33; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -109,6 +109,27 @@ abstract class BaseUsersPeer /** the column name for the USR_UX field */ const USR_UX = 'USERS.USR_UX'; + /** the column name for the USR_TOTAL_INBOX field */ + const USR_TOTAL_INBOX = 'USERS.USR_TOTAL_INBOX'; + + /** the column name for the USR_TOTAL_DRAFT field */ + const USR_TOTAL_DRAFT = 'USERS.USR_TOTAL_DRAFT'; + + /** the column name for the USR_TOTAL_CANCELLED field */ + const USR_TOTAL_CANCELLED = 'USERS.USR_TOTAL_CANCELLED'; + + /** the column name for the USR_TOTAL_PARTICIPATED field */ + const USR_TOTAL_PARTICIPATED = 'USERS.USR_TOTAL_PARTICIPATED'; + + /** the column name for the USR_TOTAL_PAUSED field */ + const USR_TOTAL_PAUSED = 'USERS.USR_TOTAL_PAUSED'; + + /** the column name for the USR_TOTAL_COMPLETED field */ + const USR_TOTAL_COMPLETED = 'USERS.USR_TOTAL_COMPLETED'; + + /** the column name for the USR_TOTAL_UNASSIGNED field */ + const USR_TOTAL_UNASSIGNED = 'USERS.USR_TOTAL_UNASSIGNED'; + /** The PHP to DB Name Mapping */ private static $phpNameMap = null; @@ -120,10 +141,10 @@ abstract class BaseUsersPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', ), - BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, ), - BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', ), - 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 ('UsrUid', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', 'UsrTotalInbox', 'UsrTotalDraft', 'UsrTotalCancelled', 'UsrTotalParticipated', 'UsrTotalPaused', 'UsrTotalCompleted', 'UsrTotalUnassigned', ), + BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_USERNAME, UsersPeer::USR_PASSWORD, UsersPeer::USR_FIRSTNAME, UsersPeer::USR_LASTNAME, UsersPeer::USR_EMAIL, UsersPeer::USR_DUE_DATE, UsersPeer::USR_CREATE_DATE, UsersPeer::USR_UPDATE_DATE, UsersPeer::USR_STATUS, UsersPeer::USR_COUNTRY, UsersPeer::USR_CITY, UsersPeer::USR_LOCATION, UsersPeer::USR_ADDRESS, UsersPeer::USR_PHONE, UsersPeer::USR_FAX, UsersPeer::USR_CELLULAR, UsersPeer::USR_ZIP_CODE, UsersPeer::DEP_UID, UsersPeer::USR_POSITION, UsersPeer::USR_RESUME, UsersPeer::USR_BIRTHDAY, UsersPeer::USR_ROLE, UsersPeer::USR_REPORTS_TO, UsersPeer::USR_REPLACED_BY, UsersPeer::USR_UX, UsersPeer::USR_TOTAL_INBOX, UsersPeer::USR_TOTAL_DRAFT, UsersPeer::USR_TOTAL_CANCELLED, UsersPeer::USR_TOTAL_PARTICIPATED, UsersPeer::USR_TOTAL_PAUSED, UsersPeer::USR_TOTAL_COMPLETED, UsersPeer::USR_TOTAL_UNASSIGNED, ), + BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'USR_ADDRESS', 'USR_PHONE', 'USR_FAX', 'USR_CELLULAR', 'USR_ZIP_CODE', 'DEP_UID', 'USR_POSITION', 'USR_RESUME', 'USR_BIRTHDAY', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX', 'USR_TOTAL_INBOX', 'USR_TOTAL_DRAFT', 'USR_TOTAL_CANCELLED', 'USR_TOTAL_PARTICIPATED', 'USR_TOTAL_PAUSED', 'USR_TOTAL_COMPLETED', 'USR_TOTAL_UNASSIGNED', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, ) ); /** @@ -133,10 +154,10 @@ abstract class BaseUsersPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrUsername' => 1, 'UsrPassword' => 2, 'UsrFirstname' => 3, 'UsrLastname' => 4, 'UsrEmail' => 5, 'UsrDueDate' => 6, 'UsrCreateDate' => 7, 'UsrUpdateDate' => 8, 'UsrStatus' => 9, 'UsrCountry' => 10, 'UsrCity' => 11, 'UsrLocation' => 12, 'UsrAddress' => 13, 'UsrPhone' => 14, 'UsrFax' => 15, 'UsrCellular' => 16, 'UsrZipCode' => 17, 'DepUid' => 18, 'UsrPosition' => 19, 'UsrResume' => 20, 'UsrBirthday' => 21, 'UsrRole' => 22, 'UsrReportsTo' => 23, 'UsrReplacedBy' => 24, 'UsrUx' => 25, ), - BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_USERNAME => 1, UsersPeer::USR_PASSWORD => 2, UsersPeer::USR_FIRSTNAME => 3, UsersPeer::USR_LASTNAME => 4, UsersPeer::USR_EMAIL => 5, UsersPeer::USR_DUE_DATE => 6, UsersPeer::USR_CREATE_DATE => 7, UsersPeer::USR_UPDATE_DATE => 8, UsersPeer::USR_STATUS => 9, UsersPeer::USR_COUNTRY => 10, UsersPeer::USR_CITY => 11, UsersPeer::USR_LOCATION => 12, UsersPeer::USR_ADDRESS => 13, UsersPeer::USR_PHONE => 14, UsersPeer::USR_FAX => 15, UsersPeer::USR_CELLULAR => 16, UsersPeer::USR_ZIP_CODE => 17, UsersPeer::DEP_UID => 18, UsersPeer::USR_POSITION => 19, UsersPeer::USR_RESUME => 20, UsersPeer::USR_BIRTHDAY => 21, UsersPeer::USR_ROLE => 22, UsersPeer::USR_REPORTS_TO => 23, UsersPeer::USR_REPLACED_BY => 24, UsersPeer::USR_UX => 25, ), - BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_USERNAME' => 1, 'USR_PASSWORD' => 2, 'USR_FIRSTNAME' => 3, 'USR_LASTNAME' => 4, 'USR_EMAIL' => 5, 'USR_DUE_DATE' => 6, 'USR_CREATE_DATE' => 7, 'USR_UPDATE_DATE' => 8, 'USR_STATUS' => 9, 'USR_COUNTRY' => 10, 'USR_CITY' => 11, 'USR_LOCATION' => 12, 'USR_ADDRESS' => 13, 'USR_PHONE' => 14, 'USR_FAX' => 15, 'USR_CELLULAR' => 16, 'USR_ZIP_CODE' => 17, 'DEP_UID' => 18, 'USR_POSITION' => 19, 'USR_RESUME' => 20, 'USR_BIRTHDAY' => 21, 'USR_ROLE' => 22, 'USR_REPORTS_TO' => 23, 'USR_REPLACED_BY' => 24, 'USR_UX' => 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 ('UsrUid' => 0, 'UsrUsername' => 1, 'UsrPassword' => 2, 'UsrFirstname' => 3, 'UsrLastname' => 4, 'UsrEmail' => 5, 'UsrDueDate' => 6, 'UsrCreateDate' => 7, 'UsrUpdateDate' => 8, 'UsrStatus' => 9, 'UsrCountry' => 10, 'UsrCity' => 11, 'UsrLocation' => 12, 'UsrAddress' => 13, 'UsrPhone' => 14, 'UsrFax' => 15, 'UsrCellular' => 16, 'UsrZipCode' => 17, 'DepUid' => 18, 'UsrPosition' => 19, 'UsrResume' => 20, 'UsrBirthday' => 21, 'UsrRole' => 22, 'UsrReportsTo' => 23, 'UsrReplacedBy' => 24, 'UsrUx' => 25, 'UsrTotalInbox' => 26, 'UsrTotalDraft' => 27, 'UsrTotalCancelled' => 28, 'UsrTotalParticipated' => 29, 'UsrTotalPaused' => 30, 'UsrTotalCompleted' => 31, 'UsrTotalUnassigned' => 32, ), + BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_USERNAME => 1, UsersPeer::USR_PASSWORD => 2, UsersPeer::USR_FIRSTNAME => 3, UsersPeer::USR_LASTNAME => 4, UsersPeer::USR_EMAIL => 5, UsersPeer::USR_DUE_DATE => 6, UsersPeer::USR_CREATE_DATE => 7, UsersPeer::USR_UPDATE_DATE => 8, UsersPeer::USR_STATUS => 9, UsersPeer::USR_COUNTRY => 10, UsersPeer::USR_CITY => 11, UsersPeer::USR_LOCATION => 12, UsersPeer::USR_ADDRESS => 13, UsersPeer::USR_PHONE => 14, UsersPeer::USR_FAX => 15, UsersPeer::USR_CELLULAR => 16, UsersPeer::USR_ZIP_CODE => 17, UsersPeer::DEP_UID => 18, UsersPeer::USR_POSITION => 19, UsersPeer::USR_RESUME => 20, UsersPeer::USR_BIRTHDAY => 21, UsersPeer::USR_ROLE => 22, UsersPeer::USR_REPORTS_TO => 23, UsersPeer::USR_REPLACED_BY => 24, UsersPeer::USR_UX => 25, UsersPeer::USR_TOTAL_INBOX => 26, UsersPeer::USR_TOTAL_DRAFT => 27, UsersPeer::USR_TOTAL_CANCELLED => 28, UsersPeer::USR_TOTAL_PARTICIPATED => 29, UsersPeer::USR_TOTAL_PAUSED => 30, UsersPeer::USR_TOTAL_COMPLETED => 31, UsersPeer::USR_TOTAL_UNASSIGNED => 32, ), + BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_USERNAME' => 1, 'USR_PASSWORD' => 2, 'USR_FIRSTNAME' => 3, 'USR_LASTNAME' => 4, 'USR_EMAIL' => 5, 'USR_DUE_DATE' => 6, 'USR_CREATE_DATE' => 7, 'USR_UPDATE_DATE' => 8, 'USR_STATUS' => 9, 'USR_COUNTRY' => 10, 'USR_CITY' => 11, 'USR_LOCATION' => 12, 'USR_ADDRESS' => 13, 'USR_PHONE' => 14, 'USR_FAX' => 15, 'USR_CELLULAR' => 16, 'USR_ZIP_CODE' => 17, 'DEP_UID' => 18, 'USR_POSITION' => 19, 'USR_RESUME' => 20, 'USR_BIRTHDAY' => 21, 'USR_ROLE' => 22, 'USR_REPORTS_TO' => 23, 'USR_REPLACED_BY' => 24, 'USR_UX' => 25, 'USR_TOTAL_INBOX' => 26, 'USR_TOTAL_DRAFT' => 27, 'USR_TOTAL_CANCELLED' => 28, 'USR_TOTAL_PARTICIPATED' => 29, 'USR_TOTAL_PAUSED' => 30, 'USR_TOTAL_COMPLETED' => 31, 'USR_TOTAL_UNASSIGNED' => 32, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, ) ); /** @@ -289,6 +310,20 @@ abstract class BaseUsersPeer $criteria->addSelectColumn(UsersPeer::USR_UX); + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_INBOX); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_DRAFT); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_CANCELLED); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_PARTICIPATED); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_PAUSED); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_COMPLETED); + + $criteria->addSelectColumn(UsersPeer::USR_TOTAL_UNASSIGNED); + } const COUNT = 'COUNT(USERS.USR_UID)'; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index b12d857da..73b3e8fde 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1468,6 +1468,13 @@ + + + + + + + @@ -4389,7 +4396,7 @@ - + @@ -4449,7 +4456,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 70ae00e83..221be5aaf 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -697,6 +697,13 @@ CREATE TABLE `USERS` `USR_REPORTS_TO` VARCHAR(32) default '', `USR_REPLACED_BY` VARCHAR(32) default '', `USR_UX` VARCHAR(128) default 'NORMAL', + `USR_TOTAL_INBOX` INTEGER default 0, + `USR_TOTAL_DRAFT` INTEGER default 0, + `USR_TOTAL_CANCELLED` INTEGER default 0, + `USR_TOTAL_PARTICIPATED` INTEGER default 0, + `USR_TOTAL_PAUSED` INTEGER default 0, + `USR_TOTAL_COMPLETED` INTEGER default 0, + `USR_TOTAL_UNASSIGNED` INTEGER default 0, PRIMARY KEY (`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users'; #----------------------------------------------------------------------------- @@ -2199,7 +2206,7 @@ CREATE TABLE `LIST_INBOX` `TAS_UID` VARCHAR(32) default '' NOT NULL, `PRO_UID` VARCHAR(32) default '' NOT NULL, `APP_NUMBER` INTEGER default 0 NOT NULL, - `APP_STATUS` VARCHAR(32) default '' NOT NULL, + `APP_STATUS` VARCHAR(32) default '0', `APP_TITLE` VARCHAR(255) default '' NOT NULL, `APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL, `APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL, @@ -2213,7 +2220,7 @@ CREATE TABLE `LIST_INBOX` `DEL_DUE_DATE` DATETIME, `DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), - KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) + KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list'; #----------------------------------------------------------------------------- #-- LIST_PARTICIPATED_HISTORY @@ -2278,7 +2285,7 @@ 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, - PRIMARY KEY (`APP_UID`,`DEL_INDEX`,`USR_UID`) + PRIMARY KEY (`APP_UID`,`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list'; #----------------------------------------------------------------------------- #-- LIST_COMPLETED @@ -2483,6 +2490,7 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE` DROP TABLE IF EXISTS `EMAIL_SERVER`; + CREATE TABLE `EMAIL_SERVER` ( `MESS_UID` VARCHAR(32) default '' NOT NULL, @@ -2520,79 +2528,74 @@ CREATE TABLE `WEB_ENTRY_EVENT` `WEE_WE_TAS_UID` VARCHAR(32) default '' NOT NULL, PRIMARY KEY (`WEE_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8'; -# This restores the fkey checks, after having unset them earlier -SET FOREIGN_KEY_CHECKS = 1; - #----------------------------------------------------------------------------- #-- MESSAGE_EVENT_DEFINITION #----------------------------------------------------------------------------- -DROP TABLE IF EXISTS MESSAGE_EVENT_DEFINITION; +DROP TABLE IF EXISTS `MESSAGE_EVENT_DEFINITION`; -CREATE TABLE MESSAGE_EVENT_DEFINITION + +CREATE TABLE `MESSAGE_EVENT_DEFINITION` ( - MSGED_UID VARCHAR(32) NOT NULL, - PRJ_UID VARCHAR(32) NOT NULL, - EVN_UID VARCHAR(32) NOT NULL, - MSGT_UID VARCHAR(32) NOT NULL DEFAULT '', - MSGED_USR_UID VARCHAR(32) NOT NULL DEFAULT '', - MSGED_VARIABLES MEDIUMTEXT NOT NULL DEFAULT '', - MSGED_CORRELATION VARCHAR(512) NOT NULL DEFAULT '', - - PRIMARY KEY (MSGED_UID) -) ENGINE=InnoDB DEFAULT CHARSET='utf8'; - + `MSGED_UID` VARCHAR(32) NOT NULL, + `PRJ_UID` VARCHAR(32) NOT NULL, + `EVN_UID` VARCHAR(32) NOT NULL, + `MSGT_UID` VARCHAR(32) default '' NOT NULL, + `MSGED_USR_UID` VARCHAR(32) default '' NOT NULL, + `MSGED_VARIABLES` MEDIUMTEXT NOT NULL, + `MSGED_CORRELATION` VARCHAR(512) default '' NOT NULL, + PRIMARY KEY (`MSGED_UID`) +)ENGINE=InnoDB DEFAULT CHARSET='utf8'; #----------------------------------------------------------------------------- #-- MESSAGE_EVENT_RELATION #----------------------------------------------------------------------------- -DROP TABLE IF EXISTS MESSAGE_EVENT_RELATION; +DROP TABLE IF EXISTS `MESSAGE_EVENT_RELATION`; -CREATE TABLE MESSAGE_EVENT_RELATION + +CREATE TABLE `MESSAGE_EVENT_RELATION` ( - MSGER_UID VARCHAR(32) NOT NULL, - PRJ_UID VARCHAR(32) NOT NULL, - EVN_UID_THROW VARCHAR(32) NOT NULL, - EVN_UID_CATCH VARCHAR(32) NOT NULL, - - PRIMARY KEY (MSGER_UID) -) ENGINE=InnoDB DEFAULT CHARSET='utf8'; - + `MSGER_UID` VARCHAR(32) NOT NULL, + `PRJ_UID` VARCHAR(32) NOT NULL, + `EVN_UID_THROW` VARCHAR(32) NOT NULL, + `EVN_UID_CATCH` VARCHAR(32) NOT NULL, + PRIMARY KEY (`MSGER_UID`) +)ENGINE=InnoDB DEFAULT CHARSET='utf8'; #----------------------------------------------------------------------------- #-- MESSAGE_EVENT_TASK_RELATION #----------------------------------------------------------------------------- -DROP TABLE IF EXISTS MESSAGE_EVENT_TASK_RELATION; +DROP TABLE IF EXISTS `MESSAGE_EVENT_TASK_RELATION`; -CREATE TABLE MESSAGE_EVENT_TASK_RELATION + +CREATE TABLE `MESSAGE_EVENT_TASK_RELATION` ( - MSGETR_UID VARCHAR(32) NOT NULL, - PRJ_UID VARCHAR(32) NOT NULL, - EVN_UID VARCHAR(32) NOT NULL, - TAS_UID VARCHAR(32) NOT NULL, - - PRIMARY KEY (MSGETR_UID) -) ENGINE=InnoDB DEFAULT CHARSET='utf8'; - + `MSGETR_UID` VARCHAR(32) NOT NULL, + `PRJ_UID` VARCHAR(32) NOT NULL, + `EVN_UID` VARCHAR(32) NOT NULL, + `TAS_UID` VARCHAR(32) NOT NULL, + PRIMARY KEY (`MSGETR_UID`) +)ENGINE=InnoDB DEFAULT CHARSET='utf8'; #----------------------------------------------------------------------------- #-- MESSAGE_APPLICATION #----------------------------------------------------------------------------- -DROP TABLE IF EXISTS MESSAGE_APPLICATION; +DROP TABLE IF EXISTS `MESSAGE_APPLICATION`; -CREATE TABLE MESSAGE_APPLICATION + +CREATE TABLE `MESSAGE_APPLICATION` ( - MSGAPP_UID VARCHAR(32) NOT NULL, - APP_UID VARCHAR(32) NOT NULL, - PRJ_UID VARCHAR(32) NOT NULL, - EVN_UID_THROW VARCHAR(32) NOT NULL, - EVN_UID_CATCH VARCHAR(32) NOT NULL, - MSGAPP_VARIABLES MEDIUMTEXT NOT NULL DEFAULT '', - MSGAPP_CORRELATION VARCHAR(512) NOT NULL DEFAULT '', - MSGAPP_THROW_DATE DATETIME NOT NULL, - MSGAPP_CATCH_DATE DATETIME, - MSGAPP_STATUS VARCHAR(25) NOT NULL DEFAULT 'UNREAD', - - PRIMARY KEY (MSGAPP_UID) -) ENGINE=InnoDB DEFAULT CHARSET='utf8'; - + `MSGAPP_UID` VARCHAR(32) NOT NULL, + `APP_UID` VARCHAR(32) NOT NULL, + `PRJ_UID` VARCHAR(32) NOT NULL, + `EVN_UID_THROW` VARCHAR(32) NOT NULL, + `EVN_UID_CATCH` VARCHAR(32) NOT NULL, + `MSGAPP_VARIABLES` MEDIUMTEXT NOT NULL, + `MSGAPP_CORRELATION` VARCHAR(512) default '' NOT NULL, + `MSGAPP_THROW_DATE` DATETIME NOT NULL, + `MSGAPP_CATCH_DATE` DATETIME, + `MSGAPP_STATUS` VARCHAR(25) default 'UNREAD' NOT NULL, + PRIMARY KEY (`MSGAPP_UID`) +)ENGINE=InnoDB DEFAULT CHARSET='utf8'; +# This restores the fkey checks, after having unset them earlier +SET FOREIGN_KEY_CHECKS = 1;