From e82fb4718c438d0d127d58a83ac50a974bde0946 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Mon, 1 Aug 2016 15:30:30 -0400 Subject: [PATCH] =?UTF-8?q?HOR-1448=20Remover=20las=20llamadas=20a=20la=20?= =?UTF-8?q?funci=C3=B3n=20que=20actualiza=20los=20contadores=20para=20los?= =?UTF-8?q?=20usuarios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/bin/tasks/cliWorkspaces.php | 8 - workflow/engine/classes/class.case.php | 29 -- workflow/engine/classes/class.derivation.php | 60 +-- workflow/engine/classes/class.wsTools.php | 93 ---- .../engine/classes/model/ListCanceled.php | 3 - .../engine/classes/model/ListCompleted.php | 28 -- workflow/engine/classes/model/ListInbox.php | 46 -- .../classes/model/ListParticipatedLast.php | 13 - workflow/engine/classes/model/ListPaused.php | 6 - workflow/engine/classes/model/Users.php | 65 +-- .../classes/model/map/UsersMapBuilder.php | 14 - .../engine/classes/model/om/BaseUsers.php | 464 ++---------------- .../engine/classes/model/om/BaseUsersPeer.php | 53 +- workflow/engine/config/schema.xml | 7 - workflow/engine/data/mysql/schema.sql | 7 - 15 files changed, 62 insertions(+), 834 deletions(-) diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php index a807927af..d83afb607 100755 --- a/workflow/engine/bin/tasks/cliWorkspaces.php +++ b/workflow/engine/bin/tasks/cliWorkspaces.php @@ -221,14 +221,6 @@ EOT CLI::taskArg('workspace', true, true); CLI::taskRun("run_database_verify_migration_consistency"); -CLI::taskName('migrate-counters'); -CLI::taskDescription(<<appSolr->deleteApplicationSearchIndex($sAppUid); } /*----------------------------------********---------------------------------*/ - $criteria = new Criteria(); - $criteria->addSelectColumn( ListInboxPeer::USR_UID ); - $criteria->add( ListInboxPeer::APP_UID, $sAppUid, Criteria::EQUAL ); - $dataset = ApplicationPeer::doSelectRS($criteria); - $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - while($dataset->next()) { - $aRow = $dataset->getRow(); - $users = new Users(); - $users->refreshTotal($aRow['USR_UID'], 'remove', 'draft'); - $users->refreshTotal($aRow['USR_UID'], 'remove', 'participated'); - } - $oCriteria = new Criteria('workflow'); $oCriteria->add(ListInboxPeer::APP_UID, $sAppUid); ListInboxPeer::doDelete($oCriteria); @@ -1956,7 +1944,6 @@ class Cases public function CloseCurrentDelegation($sAppUid, $iDelIndex) { try { - $oApplication = ApplicationPeer::retrieveByPk($sAppUid); $c = new Criteria(); $c->add(AppDelegationPeer::APP_UID, $sAppUid); $c->add(AppDelegationPeer::DEL_INDEX, $iDelIndex); @@ -1975,22 +1962,6 @@ class Cases } throw (new PropelException('The row cannot be created!', new PropelException($msg))); } - $taskNext = TaskPeer::retrieveByPK($appDel->getTasUid()); - if($taskNext->getTasType() !== 'SUBPROCESS'){ - if($oApplication->getAppStatus() === 'DRAFT'){ - $sUserUid = $appDel->getUsrUid(); - /*----------------------------------********---------------------------------*/ - $users = new Users(); - $users->refreshTotal($sUserUid, "remove", "draft"); - /*----------------------------------********---------------------------------*/ - }else{ - $sUserUid = $appDel->getUsrUid(); - /*----------------------------------********---------------------------------*/ - $users = new Users(); - $users->refreshTotal($sUserUid, "remove", "inbox"); - /*----------------------------------********---------------------------------*/ - } - } } /*----------------------------------********---------------------------------*/ $inbox = new ListInbox(); diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 85c69d260..146d14474 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -752,58 +752,26 @@ class Derivation { /*----------------------------------********---------------------------------*/ try { - $user = new Users(); + if ($arrayNextDelegationData["TAS_UID"] != "-1") { + $regexpTaskTypeToExclude = "WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT"; - if ($arrayNextDelegationData["TAS_UID"] == "-2") { - $application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]); + if (!preg_match("/^(?:" . $regexpTaskTypeToExclude . ")$/", $taskNextDelegation->getTasType())) { + if (!empty($delIndexNew) && empty($aSp)) { + $appDelegation = AppDelegationPeer::retrieveByPK($arrayApplicationData["APP_UID"], $delIndexNew); + $arrayApplicationData2 = $appDelegation->toArray(BasePeer::TYPE_FIELDNAME); - if ($application->getAppStatus() == "DRAFT") { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft"); - } else { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox"); - } - } else { - if ($arrayNextDelegationData["TAS_UID"] != "-1") { - $regexpTaskTypeToExclude = "WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|INTERMEDIATE-CATCH-TIMER-EVENT"; + $arrayApplicationData2["APP_STATUS"] = $arrayCurrentDelegationData["APP_STATUS"]; - if (!preg_match("/^(?:" . $regexpTaskTypeToExclude . ")$/", $taskNextDelegation->getTasType())) { - if (!empty($delIndexNew) && empty($aSp)) { - $appDelegation = AppDelegationPeer::retrieveByPK($arrayApplicationData["APP_UID"], $delIndexNew); - $arrayApplicationData2 = $appDelegation->toArray(BasePeer::TYPE_FIELDNAME); + $taskCurrent = TaskPeer::retrieveByPK($arrayCurrentDelegationData["TAS_UID"]); - $arrayApplicationData2["APP_STATUS"] = $arrayCurrentDelegationData["APP_STATUS"]; - - $taskCurrent = TaskPeer::retrieveByPK($arrayCurrentDelegationData["TAS_UID"]); - - if ($taskCurrent->getTasType() == "INTERMEDIATE-CATCH-MESSAGE-EVENT") { - $removeList = false; - } - - $arrayApplicationData2["REMOVED_LIST"] = $removeList; - - $inbox = new ListInbox(); - $inbox->newRow($arrayApplicationData2, $arrayApplicationData["CURRENT_USER_UID"], false, array(), (($arrayNextDelegationData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE")? true : false)); - } else { - if (empty($aSp)) { - $application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]); - - if ($application->getAppStatus() == "DRAFT") { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft"); - } else { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox"); - } - } + if ($taskCurrent->getTasType() == "INTERMEDIATE-CATCH-MESSAGE-EVENT") { + $removeList = false; } - } else { - if ($removeList) { - $application = ApplicationPeer::retrieveByPK($arrayApplicationData["APP_UID"]); - if ($application->getAppStatus() == "DRAFT") { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "draft"); - } else { - //$user->refreshTotal($arrayApplicationData["CURRENT_USER_UID"], "remove", "inbox"); - } - } + $arrayApplicationData2["REMOVED_LIST"] = $removeList; + + $inbox = new ListInbox(); + $inbox->newRow($arrayApplicationData2, $arrayApplicationData["CURRENT_USER_UID"], false, array(), (($arrayNextDelegationData["TAS_ASSIGN_TYPE"] == "SELF_SERVICE")? true : false)); } } } diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index f3e321a4c..96ef90356 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -2019,7 +2019,6 @@ class workspaceTools $this->regenerateListParticipatedLast(); // this list require no translation $this->regenerateListPaused(); // this list require no translation $this->regenerateListUnassigned(); // this list require no translation - $this->migrateCounters(); } if (!$flagReinsert) { $this->listFirstExecution("insert"); @@ -2513,98 +2512,6 @@ class workspaceTools } /*----------------------------------********---------------------------------*/ - public function migrateCounters() - { - $this->initPropel(true); - // Updating the COMPLETE, DRAFT, INBOX, CANCELLED, PARTICIPATED counters - $query = ' - UPDATE '.$this->dbName.'.USERS UA - INNER JOIN - (SELECT - U.USR_UID, - IFNULL(APP_INBOX, 0) USR_TOTAL_INBOX, - IFNULL(APP_DRAFT, 0) USR_TOTAL_DRAFT, - IFNULL(NEW_USR_TOTAL_CANCELED, 0) USR_TOTAL_CANCELLED, - IFNULL(NEW_USR_TOTAL_PARTICIPATED_LAST, 0) USR_TOTAL_PARTICIPATED, - 0 USR_TOTAL_PAUSED, - IFNULL(NEW_USR_TOTAL_COMPLETED, 0) USR_TOTAL_COMPLETED, - 0 USR_TOTAL_UNASSIGNED - - FROM - '.$this->dbName.'.USERS U - LEFT JOIN - (SELECT - USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_PARTICIPATED_LAST - FROM - '.$this->dbName.'.LIST_PARTICIPATED_LAST - GROUP BY USR_UID) LPL ON U.USR_UID = LPL.USR_UID - LEFT JOIN - (SELECT - USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_COMPLETED - FROM - '.$this->dbName.'.LIST_COMPLETED - GROUP BY USR_UID) LCO ON U.USR_UID = LCO.USR_UID - LEFT JOIN - (SELECT - USR_UID, COUNT(DISTINCT APP_UID) APP_INBOX - FROM - '.$this->dbName.'.APP_CACHE_VIEW - WHERE - APP_STATUS = \'TO_DO\' - AND APP_THREAD_STATUS = \'OPEN\' - AND DEL_THREAD_STATUS = \'OPEN\' - AND DEL_FINISH_DATE IS NULL - GROUP BY USR_UID) APP_IN ON U.USR_UID = APP_IN.USR_UID - LEFT JOIN - (SELECT - USR_UID, COUNT(DISTINCT APP_UID) APP_DRAFT - FROM - '.$this->dbName.'.APP_CACHE_VIEW - WHERE - APP_STATUS = \'DRAFT\' - AND APP_THREAD_STATUS = \'OPEN\' - AND DEL_THREAD_STATUS = \'OPEN\' - GROUP BY USR_UID) APP_D ON U.USR_UID = APP_D.USR_UID - LEFT JOIN - (SELECT - USR_UID, COUNT(APP_UID) NEW_USR_TOTAL_CANCELED - FROM - '.$this->dbName.'.LIST_CANCELED - GROUP BY USR_UID) LCA ON U.USR_UID = LCA.USR_UID - ) UC - ON UA.USR_UID = UC.USR_UID - SET - UA.USR_TOTAL_INBOX = UC.USR_TOTAL_INBOX, - UA.USR_TOTAL_DRAFT = UC.USR_TOTAL_DRAFT, - UA.USR_TOTAL_CANCELLED = UC.USR_TOTAL_CANCELLED, - UA.USR_TOTAL_PARTICIPATED = UC.USR_TOTAL_PARTICIPATED, - UA.USR_TOTAL_COMPLETED = UC.USR_TOTAL_COMPLETED'; - $con = Propel::getConnection("workflow"); - $stmt = $con->createStatement(); - $stmt->executeQuery($query); - // Updating PAUSED and UNASSIGNED Cases - $aTypes = array( - 'paused', - 'selfservice' - ); - $users = new Users(); - $criteria = new Criteria(); - $criteria->addSelectColumn(UsersPeer::USR_UID); - $dataset = UsersPeer::doSelectRS($criteria); - $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - while($dataset->next()) { - $aRow = $dataset->getRow(); - $oAppCache = new AppCacheView(); - $aCount = $oAppCache->getAllCounters($aTypes, $aRow['USR_UID'], false); - $newData = array( - 'USR_UID' => $aRow['USR_UID'], - 'USR_TOTAL_PAUSED' => $aCount['paused'], - 'USR_TOTAL_UNASSIGNED' => $aCount['selfservice'] - ); - $users->update($newData); - } - } - /** * This function checks if List tables are going to migrated * diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index a581c1c1c..c869354d9 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -97,9 +97,6 @@ class ListCanceled extends BaseListCanceled { $oListInbox = new ListInbox(); $oListInbox->removeAll($data['APP_UID']); - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'canceled'); - //Update - WHERE $criteriaWhere = new Criteria("workflow"); $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 4cf8c2afc..6d918cdb7 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -97,34 +97,6 @@ class ListCompleted extends BaseListCompleted $criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED'); BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow")); - $users = new Users(); - if($data['USR_UID'] != ''){ - $users->refreshTotal($data['USR_UID'], 'add', 'completed'); - } - if ($data['DEL_PREVIOUS'] != 0) { - $criteria = new Criteria(); - $criteria->addSelectColumn(TaskPeer::TAS_TYPE); - $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); - $dataset = TaskPeer::doSelectRS($criteria); - $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $dataset->next(); - $aRow = $dataset->getRow(); - if ($aRow['TAS_TYPE'] != 'SUBPROCESS') { - //$users->refreshTotal($data['USR_UID'], 'remove', 'inbox'); - } - } else { - $criteria = new Criteria(); - $criteria->addSelectColumn(SubApplicationPeer::APP_UID); - $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); - $dataset = SubApplicationPeer::doSelectRS($criteria); - $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - if ($dataset->next()) { - //$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 f91f23c94..6ac2d14d9 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -63,8 +63,6 @@ class ListInbox extends BaseListInbox $oCriteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']); $oCriteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']); ListParticipatedLastPeer::doDelete($oCriteria); - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'removed', 'participated'); } $listParticipatedLast = new ListParticipatedLast(); @@ -110,17 +108,12 @@ class ListInbox extends BaseListInbox $data['APP_TITLE'] = G::replaceDataField($data['APP_TITLE'], $aData['APP_DATA']); } if ($isSelfService) { - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - $listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast->remove($data['APP_UID'], $data['USR_UID'], $data['DEL_INDEX']); - //Update //Update - SET $criteriaSet = new Criteria("workflow"); $criteriaSet->add(ListParticipatedLastPeer::USR_UID, $data["USR_UID"]); - //Update - WHERE $criteriaWhere = new Criteria("workflow"); $criteriaWhere->add(ListParticipatedLastPeer::APP_UID, $data["APP_UID"], Criteria::EQUAL); @@ -132,8 +125,6 @@ class ListInbox extends BaseListInbox //Update $listParticipatedLast = new ListParticipatedLast(); $listParticipatedLast->refresh($data); - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'participated'); } else { if (isset($data["APP_UID"]) && isset($data["USER_UID"]) && isset($data["DEL_INDEX"]) && isset($data["APP_TITLE"])) { //Update @@ -311,7 +302,6 @@ class ListInbox extends BaseListInbox $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; } - $users = new Users(); $criteria = new Criteria(); $criteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT); $criteria->add( SubApplicationPeer::APP_PARENT, $data['APP_UID'], Criteria::EQUAL ); @@ -320,47 +310,11 @@ class ListInbox extends BaseListInbox if ($dataset->next()) { $aSub = $dataset->getRow(); if ($aSub['DEL_INDEX_PARENT'] == $data['DEL_PREVIOUS'] && !$isSelfService) { - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); self::create($data, $isSelfService); return 1; } } - if (!$isInitSubprocess) { - if ($data['APP_STATUS'] == 'DRAFT') { - $users->refreshTotal($data['USR_UID'], 'add', 'draft'); - } else { - $oRow = ApplicationPeer::retrieveByPK($data['APP_UID']); - $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); - if ($removeList) { - if ($data['DEL_INDEX'] == 2 || $aFields['APP_STATUS'] == 'DRAFT') { - $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'); - } else { - //$users->refreshTotal($delPreviusUsrUid, 'remove', 'draft'); - } - } else { - //$users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox'); - } - } - if (!$isSelfService) { - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } - } - } else { - if($data['USR_UID'] !=''){ - $users->refreshTotal($data['USR_UID'], 'add', 'inbox'); - } - if ($dataPreviusApplication['APP_STATUS'] == 'DRAFT') { - //$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'draft'); - } else { - //$users->refreshTotal($dataPreviusApplication['CURRENT_USER_UID'], 'remove', 'inbox'); - } - } if ($data['USR_UID'] != '') { $criteria = new Criteria(); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php index 067b9c421..792147b60 100644 --- a/workflow/engine/classes/model/ListParticipatedLast.php +++ b/workflow/engine/classes/model/ListParticipatedLast.php @@ -50,9 +50,6 @@ class ListParticipatedLast extends BaseListParticipatedLast $data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME']; $data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $data['DEL_CURRENT_TAS_TITLE'] = $data['APP_TAS_TITLE']; - - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'participated'); } } else { $getData['USR_UID'] = $data['USR_UID_CURRENT']; @@ -170,17 +167,13 @@ class ListParticipatedLast extends BaseListParticipatedLast public function remove ($app_uid, $usr_uid, $del_index) { try { - $flagDelete = false; - if (!is_null(ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid, $del_index))) { $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); - $flagDelete = true; } else { $criteria = new Criteria("workflow"); $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid); @@ -190,14 +183,8 @@ class ListParticipatedLast extends BaseListParticipatedLast if ($rsCriteria->next()) { $criteria2 = clone $criteria; $result = ListParticipatedLastPeer::doDelete($criteria2); - $flagDelete = true; } } - - if ($flagDelete) { - $user = new Users(); - $user->refreshTotal($usr_uid, "removed", "participated"); - } } catch (Exception $e) { throw $e; } diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index d259d48e1..682fefba5 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -112,9 +112,6 @@ class ListPaused extends BaseListPaused { $oListInbox = new ListInbox(); $oListInbox->remove($data['APP_UID'], $data['DEL_INDEX']); - $users = new Users(); - $users->refreshTotal($data['USR_UID'], 'add', 'paused'); - $con = Propel::getConnection( ListPausedPeer::DATABASE_NAME ); try { $this->fromArray( $data, BasePeer::TYPE_FIELDNAME ); @@ -171,9 +168,6 @@ class ListPaused extends BaseListPaused { */ public function remove ($app_uid, $del_index, $data_inbox) { - $users = new Users(); - $users->refreshTotal($data_inbox['USR_UID'], 'removed', 'paused'); - $oRow = ApplicationPeer::retrieveByPK($app_uid); $aFields = $oRow->toArray( BasePeer::TYPE_FIELDNAME ); $data_inbox['APP_STATUS'] = $aFields['APP_STATUS']; diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 4dcfa7592..1be2327cc 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -445,62 +445,17 @@ class Users extends BaseUsers return $aFields; } - public function refreshTotal ($userId, $type = 'add', $list = "inbox", $total = 1) + /** + * @Deprecated + * @param $userId + * @param string $type + * @param string $list + * @param int $total + * @throws Exception + */ + public function refreshTotal($userId, $type = 'add', $list = "inbox", $total = 1) { - if ($userId == "") { - return; - } - - $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; + throw new Exception("This method (refreshTotal) is no longer in use. Please remove reference."); } public function userLanguaje ($usrUid = "") diff --git a/workflow/engine/classes/model/map/UsersMapBuilder.php b/workflow/engine/classes/model/map/UsersMapBuilder.php index 691d382bd..5a29f64c2 100755 --- a/workflow/engine/classes/model/map/UsersMapBuilder.php +++ b/workflow/engine/classes/model/map/UsersMapBuilder.php @@ -117,20 +117,6 @@ 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->addColumn('USR_COST_BY_HOUR', 'UsrCostByHour', 'double', CreoleTypes::DECIMAL, false, 7,2); $tMap->addColumn('USR_UNIT_COST', 'UsrUnitCost', 'string', CreoleTypes::VARCHAR, false, 50); diff --git a/workflow/engine/classes/model/om/BaseUsers.php b/workflow/engine/classes/model/om/BaseUsers.php index 3ea00affe..cccf314de 100755 --- a/workflow/engine/classes/model/om/BaseUsers.php +++ b/workflow/engine/classes/model/om/BaseUsers.php @@ -183,48 +183,6 @@ 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; - /** * The value for the usr_cost_by_hour field. * @var double @@ -645,83 +603,6 @@ 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; - } - /** * Get the [usr_cost_by_hour] column value. * @@ -1388,160 +1269,6 @@ 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() - /** * Set the value of [usr_cost_by_hour] column. * @@ -1737,38 +1464,24 @@ abstract class BaseUsers extends BaseObject implements Persistent $this->usr_ux = $rs->getString($startcol + 25); - $this->usr_total_inbox = $rs->getInt($startcol + 26); + $this->usr_cost_by_hour = $rs->getFloat($startcol + 26); - $this->usr_total_draft = $rs->getInt($startcol + 27); + $this->usr_unit_cost = $rs->getString($startcol + 27); - $this->usr_total_cancelled = $rs->getInt($startcol + 28); + $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 28); - $this->usr_total_participated = $rs->getInt($startcol + 29); + $this->usr_bookmark_start_cases = $rs->getString($startcol + 29); - $this->usr_total_paused = $rs->getInt($startcol + 30); + $this->usr_time_zone = $rs->getString($startcol + 30); - $this->usr_total_completed = $rs->getInt($startcol + 31); - - $this->usr_total_unassigned = $rs->getInt($startcol + 32); - - $this->usr_cost_by_hour = $rs->getFloat($startcol + 33); - - $this->usr_unit_cost = $rs->getString($startcol + 34); - - $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 35); - - $this->usr_bookmark_start_cases = $rs->getString($startcol + 36); - - $this->usr_time_zone = $rs->getString($startcol + 37); - - $this->usr_default_lang = $rs->getString($startcol + 38); + $this->usr_default_lang = $rs->getString($startcol + 31); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 39; // 39 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 32; // 32 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Users object", $e); @@ -2051,42 +1764,21 @@ abstract class BaseUsers extends BaseObject implements Persistent 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; - case 33: return $this->getUsrCostByHour(); break; - case 34: + case 27: return $this->getUsrUnitCost(); break; - case 35: + case 28: return $this->getUsrPmdriveFolderUid(); break; - case 36: + case 29: return $this->getUsrBookmarkStartCases(); break; - case 37: + case 30: return $this->getUsrTimeZone(); break; - case 38: + case 31: return $this->getUsrDefaultLang(); break; default: @@ -2135,19 +1827,12 @@ 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(), - $keys[33] => $this->getUsrCostByHour(), - $keys[34] => $this->getUsrUnitCost(), - $keys[35] => $this->getUsrPmdriveFolderUid(), - $keys[36] => $this->getUsrBookmarkStartCases(), - $keys[37] => $this->getUsrTimeZone(), - $keys[38] => $this->getUsrDefaultLang(), + $keys[26] => $this->getUsrCostByHour(), + $keys[27] => $this->getUsrUnitCost(), + $keys[28] => $this->getUsrPmdriveFolderUid(), + $keys[29] => $this->getUsrBookmarkStartCases(), + $keys[30] => $this->getUsrTimeZone(), + $keys[31] => $this->getUsrDefaultLang(), ); return $result; } @@ -2258,42 +1943,21 @@ abstract class BaseUsers extends BaseObject implements Persistent $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; - case 33: $this->setUsrCostByHour($value); break; - case 34: + case 27: $this->setUsrUnitCost($value); break; - case 35: + case 28: $this->setUsrPmdriveFolderUid($value); break; - case 36: + case 29: $this->setUsrBookmarkStartCases($value); break; - case 37: + case 30: $this->setUsrTimeZone($value); break; - case 38: + case 31: $this->setUsrDefaultLang($value); break; } // switch() @@ -2424,55 +2088,27 @@ abstract class BaseUsers extends BaseObject implements Persistent } if (array_key_exists($keys[26], $arr)) { - $this->setUsrTotalInbox($arr[$keys[26]]); + $this->setUsrCostByHour($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setUsrTotalDraft($arr[$keys[27]]); + $this->setUsrUnitCost($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setUsrTotalCancelled($arr[$keys[28]]); + $this->setUsrPmdriveFolderUid($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setUsrTotalParticipated($arr[$keys[29]]); + $this->setUsrBookmarkStartCases($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setUsrTotalPaused($arr[$keys[30]]); + $this->setUsrTimeZone($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]]); - } - - if (array_key_exists($keys[33], $arr)) { - $this->setUsrCostByHour($arr[$keys[33]]); - } - - if (array_key_exists($keys[34], $arr)) { - $this->setUsrUnitCost($arr[$keys[34]]); - } - - if (array_key_exists($keys[35], $arr)) { - $this->setUsrPmdriveFolderUid($arr[$keys[35]]); - } - - if (array_key_exists($keys[36], $arr)) { - $this->setUsrBookmarkStartCases($arr[$keys[36]]); - } - - if (array_key_exists($keys[37], $arr)) { - $this->setUsrTimeZone($arr[$keys[37]]); - } - - if (array_key_exists($keys[38], $arr)) { - $this->setUsrDefaultLang($arr[$keys[38]]); + $this->setUsrDefaultLang($arr[$keys[31]]); } } @@ -2590,34 +2226,6 @@ 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); - } - if ($this->isColumnModified(UsersPeer::USR_COST_BY_HOUR)) { $criteria->add(UsersPeer::USR_COST_BY_HOUR, $this->usr_cost_by_hour); } @@ -2746,20 +2354,6 @@ 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->setUsrCostByHour($this->usr_cost_by_hour); $copyObj->setUsrUnitCost($this->usr_unit_cost); diff --git a/workflow/engine/classes/model/om/BaseUsersPeer.php b/workflow/engine/classes/model/om/BaseUsersPeer.php index e40f43517..5ba08b14c 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 = 39; + const NUM_COLUMNS = 32; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -109,27 +109,6 @@ 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 column name for the USR_COST_BY_HOUR field */ const USR_COST_BY_HOUR = 'USERS.USR_COST_BY_HOUR'; @@ -159,10 +138,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', 'UsrTotalInbox', 'UsrTotalDraft', 'UsrTotalCancelled', 'UsrTotalParticipated', 'UsrTotalPaused', 'UsrTotalCompleted', 'UsrTotalUnassigned', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', ), - 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, UsersPeer::USR_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, ), - 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', 'USR_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ) + 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', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', ), + 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_COST_BY_HOUR, UsersPeer::USR_UNIT_COST, UsersPeer::USR_PMDRIVE_FOLDER_UID, UsersPeer::USR_BOOKMARK_START_CASES, UsersPeer::USR_TIME_ZONE, UsersPeer::USR_DEFAULT_LANG, ), + 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_COST_BY_HOUR', 'USR_UNIT_COST', 'USR_PMDRIVE_FOLDER_UID', 'USR_BOOKMARK_START_CASES', 'USR_TIME_ZONE', 'USR_DEFAULT_LANG', ), + 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, ) ); /** @@ -172,10 +151,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, 'UsrTotalInbox' => 26, 'UsrTotalDraft' => 27, 'UsrTotalCancelled' => 28, 'UsrTotalParticipated' => 29, 'UsrTotalPaused' => 30, 'UsrTotalCompleted' => 31, 'UsrTotalUnassigned' => 32, 'UsrCostByHour' => 33, 'UsrUnitCost' => 34, 'UsrPmdriveFolderUid' => 35, 'UsrBookmarkStartCases' => 36, 'UsrTimeZone' => 37, 'UsrDefaultLang' => 38, ), - 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, UsersPeer::USR_COST_BY_HOUR => 33, UsersPeer::USR_UNIT_COST => 34, UsersPeer::USR_PMDRIVE_FOLDER_UID => 35, UsersPeer::USR_BOOKMARK_START_CASES => 36, UsersPeer::USR_TIME_ZONE => 37, UsersPeer::USR_DEFAULT_LANG => 38, ), - 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, 'USR_COST_BY_HOUR' => 33, 'USR_UNIT_COST' => 34, 'USR_PMDRIVE_FOLDER_UID' => 35, 'USR_BOOKMARK_START_CASES' => 36, 'USR_TIME_ZONE' => 37, 'USR_DEFAULT_LANG' => 38, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, ) + 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, 'UsrCostByHour' => 26, 'UsrUnitCost' => 27, 'UsrPmdriveFolderUid' => 28, 'UsrBookmarkStartCases' => 29, 'UsrTimeZone' => 30, 'UsrDefaultLang' => 31, ), + 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_COST_BY_HOUR => 26, UsersPeer::USR_UNIT_COST => 27, UsersPeer::USR_PMDRIVE_FOLDER_UID => 28, UsersPeer::USR_BOOKMARK_START_CASES => 29, UsersPeer::USR_TIME_ZONE => 30, UsersPeer::USR_DEFAULT_LANG => 31, ), + 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_COST_BY_HOUR' => 26, 'USR_UNIT_COST' => 27, 'USR_PMDRIVE_FOLDER_UID' => 28, 'USR_BOOKMARK_START_CASES' => 29, 'USR_TIME_ZONE' => 30, 'USR_DEFAULT_LANG' => 31, ), + 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, ) ); /** @@ -328,20 +307,6 @@ 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); - $criteria->addSelectColumn(UsersPeer::USR_COST_BY_HOUR); $criteria->addSelectColumn(UsersPeer::USR_UNIT_COST); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 96e902bcc..02d781303 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1536,13 +1536,6 @@ - - - - - - - diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 4addde059..937b32503 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -743,13 +743,6 @@ 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, `USR_COST_BY_HOUR` DECIMAL(7,2) default 0, `USR_UNIT_COST` VARCHAR(50) default '', `USR_PMDRIVE_FOLDER_UID` VARCHAR(32) default '',