From ba32d7ca694dd24ebc1c0a3e7bdcf0c6d126338e Mon Sep 17 00:00:00 2001 From: Andrea Adamczyk Date: Tue, 13 Aug 2019 09:39:04 -0400 Subject: [PATCH] PMC-1054 --- .../classes/model/map/UsersMapBuilder.php | 2 + .../engine/classes/model/om/BaseProcess.php | 4 +- .../engine/classes/model/om/BaseUsers.php | 286 +++++++++++------- .../engine/classes/model/om/BaseUsersPeer.php | 23 +- workflow/engine/config/schema.xml | 86 +++++- workflow/engine/data/mysql/schema.sql | 18 +- 6 files changed, 289 insertions(+), 130 deletions(-) diff --git a/workflow/engine/classes/model/map/UsersMapBuilder.php b/workflow/engine/classes/model/map/UsersMapBuilder.php index 8850fe7ab..e1468d431 100644 --- a/workflow/engine/classes/model/map/UsersMapBuilder.php +++ b/workflow/engine/classes/model/map/UsersMapBuilder.php @@ -87,6 +87,8 @@ class UsersMapBuilder $tMap->addColumn('USR_STATUS', 'UsrStatus', 'string', CreoleTypes::VARCHAR, true, 32); + $tMap->addColumn('USR_STATUS_ID', 'UsrStatusId', 'int', CreoleTypes::INTEGER, false, null); + $tMap->addColumn('USR_COUNTRY', 'UsrCountry', 'string', CreoleTypes::VARCHAR, true, 3); $tMap->addColumn('USR_CITY', 'UsrCity', 'string', CreoleTypes::VARCHAR, true, 3); diff --git a/workflow/engine/classes/model/om/BaseProcess.php b/workflow/engine/classes/model/om/BaseProcess.php index 3a7a38c6c..ad47dc240 100644 --- a/workflow/engine/classes/model/om/BaseProcess.php +++ b/workflow/engine/classes/model/om/BaseProcess.php @@ -79,7 +79,7 @@ abstract class BaseProcess extends BaseObject implements Persistent * The value for the pro_status_id field. * @var int */ - protected $pro_status_id = 0; + protected $pro_status_id = 1; /** * The value for the pro_type_day field. @@ -999,7 +999,7 @@ abstract class BaseProcess extends BaseObject implements Persistent $v = (int) $v; } - if ($this->pro_status_id !== $v || $v === 0) { + if ($this->pro_status_id !== $v || $v === 1) { $this->pro_status_id = $v; $this->modifiedColumns[] = ProcessPeer::PRO_STATUS_ID; } diff --git a/workflow/engine/classes/model/om/BaseUsers.php b/workflow/engine/classes/model/om/BaseUsers.php index 3485298f4..ec147754e 100644 --- a/workflow/engine/classes/model/om/BaseUsers.php +++ b/workflow/engine/classes/model/om/BaseUsers.php @@ -93,6 +93,12 @@ abstract class BaseUsers extends BaseObject implements Persistent */ protected $usr_status = 'ACTIVE'; + /** + * The value for the usr_status_id field. + * @var int + */ + protected $usr_status_id = 1; + /** * The value for the usr_country field. * @var string @@ -429,6 +435,17 @@ abstract class BaseUsers extends BaseObject implements Persistent return $this->usr_status; } + /** + * Get the [usr_status_id] column value. + * + * @return int + */ + public function getUsrStatusId() + { + + return $this->usr_status_id; + } + /** * Get the [usr_country] column value. * @@ -987,6 +1004,28 @@ abstract class BaseUsers extends BaseObject implements Persistent } // setUsrStatus() + /** + * Set the value of [usr_status_id] column. + * + * @param int $v new value + * @return void + */ + public function setUsrStatusId($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_status_id !== $v || $v === 1) { + $this->usr_status_id = $v; + $this->modifiedColumns[] = UsersPeer::USR_STATUS_ID; + } + + } // setUsrStatusId() + /** * Set the value of [usr_country] column. * @@ -1540,58 +1579,60 @@ abstract class BaseUsers extends BaseObject implements Persistent $this->usr_status = $rs->getString($startcol + 10); - $this->usr_country = $rs->getString($startcol + 11); + $this->usr_status_id = $rs->getInt($startcol + 11); - $this->usr_city = $rs->getString($startcol + 12); + $this->usr_country = $rs->getString($startcol + 12); - $this->usr_location = $rs->getString($startcol + 13); + $this->usr_city = $rs->getString($startcol + 13); - $this->usr_address = $rs->getString($startcol + 14); + $this->usr_location = $rs->getString($startcol + 14); - $this->usr_phone = $rs->getString($startcol + 15); + $this->usr_address = $rs->getString($startcol + 15); - $this->usr_fax = $rs->getString($startcol + 16); + $this->usr_phone = $rs->getString($startcol + 16); - $this->usr_cellular = $rs->getString($startcol + 17); + $this->usr_fax = $rs->getString($startcol + 17); - $this->usr_zip_code = $rs->getString($startcol + 18); + $this->usr_cellular = $rs->getString($startcol + 18); - $this->dep_uid = $rs->getString($startcol + 19); + $this->usr_zip_code = $rs->getString($startcol + 19); - $this->usr_position = $rs->getString($startcol + 20); + $this->dep_uid = $rs->getString($startcol + 20); - $this->usr_resume = $rs->getString($startcol + 21); + $this->usr_position = $rs->getString($startcol + 21); - $this->usr_birthday = $rs->getDate($startcol + 22, null); + $this->usr_resume = $rs->getString($startcol + 22); - $this->usr_role = $rs->getString($startcol + 23); + $this->usr_birthday = $rs->getDate($startcol + 23, null); - $this->usr_reports_to = $rs->getString($startcol + 24); + $this->usr_role = $rs->getString($startcol + 24); - $this->usr_replaced_by = $rs->getString($startcol + 25); + $this->usr_reports_to = $rs->getString($startcol + 25); - $this->usr_ux = $rs->getString($startcol + 26); + $this->usr_replaced_by = $rs->getString($startcol + 26); - $this->usr_cost_by_hour = $rs->getFloat($startcol + 27); + $this->usr_ux = $rs->getString($startcol + 27); - $this->usr_unit_cost = $rs->getString($startcol + 28); + $this->usr_cost_by_hour = $rs->getFloat($startcol + 28); - $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 29); + $this->usr_unit_cost = $rs->getString($startcol + 29); - $this->usr_bookmark_start_cases = $rs->getString($startcol + 30); + $this->usr_pmdrive_folder_uid = $rs->getString($startcol + 30); - $this->usr_time_zone = $rs->getString($startcol + 31); + $this->usr_bookmark_start_cases = $rs->getString($startcol + 31); - $this->usr_default_lang = $rs->getString($startcol + 32); + $this->usr_time_zone = $rs->getString($startcol + 32); - $this->usr_last_login = $rs->getTimestamp($startcol + 33, null); + $this->usr_default_lang = $rs->getString($startcol + 33); + + $this->usr_last_login = $rs->getTimestamp($startcol + 34, null); $this->resetModified(); $this->setNew(false); // FIXME - using NUM_COLUMNS may be clearer. - return $startcol + 34; // 34 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). + return $startcol + 35; // 35 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS). } catch (Exception $e) { throw new PropelException("Error populating Users object", $e); @@ -1829,72 +1870,75 @@ abstract class BaseUsers extends BaseObject implements Persistent return $this->getUsrStatus(); break; case 11: - return $this->getUsrCountry(); + return $this->getUsrStatusId(); break; case 12: - return $this->getUsrCity(); + return $this->getUsrCountry(); break; case 13: - return $this->getUsrLocation(); + return $this->getUsrCity(); break; case 14: - return $this->getUsrAddress(); + return $this->getUsrLocation(); break; case 15: - return $this->getUsrPhone(); + return $this->getUsrAddress(); break; case 16: - return $this->getUsrFax(); + return $this->getUsrPhone(); break; case 17: - return $this->getUsrCellular(); + return $this->getUsrFax(); break; case 18: - return $this->getUsrZipCode(); + return $this->getUsrCellular(); break; case 19: - return $this->getDepUid(); + return $this->getUsrZipCode(); break; case 20: - return $this->getUsrPosition(); + return $this->getDepUid(); break; case 21: - return $this->getUsrResume(); + return $this->getUsrPosition(); break; case 22: - return $this->getUsrBirthday(); + return $this->getUsrResume(); break; case 23: - return $this->getUsrRole(); + return $this->getUsrBirthday(); break; case 24: - return $this->getUsrReportsTo(); + return $this->getUsrRole(); break; case 25: - return $this->getUsrReplacedBy(); + return $this->getUsrReportsTo(); break; case 26: - return $this->getUsrUx(); + return $this->getUsrReplacedBy(); break; case 27: - return $this->getUsrCostByHour(); + return $this->getUsrUx(); break; case 28: - return $this->getUsrUnitCost(); + return $this->getUsrCostByHour(); break; case 29: - return $this->getUsrPmdriveFolderUid(); + return $this->getUsrUnitCost(); break; case 30: - return $this->getUsrBookmarkStartCases(); + return $this->getUsrPmdriveFolderUid(); break; case 31: - return $this->getUsrTimeZone(); + return $this->getUsrBookmarkStartCases(); break; case 32: - return $this->getUsrDefaultLang(); + return $this->getUsrTimeZone(); break; case 33: + return $this->getUsrDefaultLang(); + break; + case 34: return $this->getUsrLastLogin(); break; default: @@ -1928,29 +1972,30 @@ abstract class BaseUsers extends BaseObject implements Persistent $keys[8] => $this->getUsrCreateDate(), $keys[9] => $this->getUsrUpdateDate(), $keys[10] => $this->getUsrStatus(), - $keys[11] => $this->getUsrCountry(), - $keys[12] => $this->getUsrCity(), - $keys[13] => $this->getUsrLocation(), - $keys[14] => $this->getUsrAddress(), - $keys[15] => $this->getUsrPhone(), - $keys[16] => $this->getUsrFax(), - $keys[17] => $this->getUsrCellular(), - $keys[18] => $this->getUsrZipCode(), - $keys[19] => $this->getDepUid(), - $keys[20] => $this->getUsrPosition(), - $keys[21] => $this->getUsrResume(), - $keys[22] => $this->getUsrBirthday(), - $keys[23] => $this->getUsrRole(), - $keys[24] => $this->getUsrReportsTo(), - $keys[25] => $this->getUsrReplacedBy(), - $keys[26] => $this->getUsrUx(), - $keys[27] => $this->getUsrCostByHour(), - $keys[28] => $this->getUsrUnitCost(), - $keys[29] => $this->getUsrPmdriveFolderUid(), - $keys[30] => $this->getUsrBookmarkStartCases(), - $keys[31] => $this->getUsrTimeZone(), - $keys[32] => $this->getUsrDefaultLang(), - $keys[33] => $this->getUsrLastLogin(), + $keys[11] => $this->getUsrStatusId(), + $keys[12] => $this->getUsrCountry(), + $keys[13] => $this->getUsrCity(), + $keys[14] => $this->getUsrLocation(), + $keys[15] => $this->getUsrAddress(), + $keys[16] => $this->getUsrPhone(), + $keys[17] => $this->getUsrFax(), + $keys[18] => $this->getUsrCellular(), + $keys[19] => $this->getUsrZipCode(), + $keys[20] => $this->getDepUid(), + $keys[21] => $this->getUsrPosition(), + $keys[22] => $this->getUsrResume(), + $keys[23] => $this->getUsrBirthday(), + $keys[24] => $this->getUsrRole(), + $keys[25] => $this->getUsrReportsTo(), + $keys[26] => $this->getUsrReplacedBy(), + $keys[27] => $this->getUsrUx(), + $keys[28] => $this->getUsrCostByHour(), + $keys[29] => $this->getUsrUnitCost(), + $keys[30] => $this->getUsrPmdriveFolderUid(), + $keys[31] => $this->getUsrBookmarkStartCases(), + $keys[32] => $this->getUsrTimeZone(), + $keys[33] => $this->getUsrDefaultLang(), + $keys[34] => $this->getUsrLastLogin(), ); return $result; } @@ -2016,72 +2061,75 @@ abstract class BaseUsers extends BaseObject implements Persistent $this->setUsrStatus($value); break; case 11: - $this->setUsrCountry($value); + $this->setUsrStatusId($value); break; case 12: - $this->setUsrCity($value); + $this->setUsrCountry($value); break; case 13: - $this->setUsrLocation($value); + $this->setUsrCity($value); break; case 14: - $this->setUsrAddress($value); + $this->setUsrLocation($value); break; case 15: - $this->setUsrPhone($value); + $this->setUsrAddress($value); break; case 16: - $this->setUsrFax($value); + $this->setUsrPhone($value); break; case 17: - $this->setUsrCellular($value); + $this->setUsrFax($value); break; case 18: - $this->setUsrZipCode($value); + $this->setUsrCellular($value); break; case 19: - $this->setDepUid($value); + $this->setUsrZipCode($value); break; case 20: - $this->setUsrPosition($value); + $this->setDepUid($value); break; case 21: - $this->setUsrResume($value); + $this->setUsrPosition($value); break; case 22: - $this->setUsrBirthday($value); + $this->setUsrResume($value); break; case 23: - $this->setUsrRole($value); + $this->setUsrBirthday($value); break; case 24: - $this->setUsrReportsTo($value); + $this->setUsrRole($value); break; case 25: - $this->setUsrReplacedBy($value); + $this->setUsrReportsTo($value); break; case 26: - $this->setUsrUx($value); + $this->setUsrReplacedBy($value); break; case 27: - $this->setUsrCostByHour($value); + $this->setUsrUx($value); break; case 28: - $this->setUsrUnitCost($value); + $this->setUsrCostByHour($value); break; case 29: - $this->setUsrPmdriveFolderUid($value); + $this->setUsrUnitCost($value); break; case 30: - $this->setUsrBookmarkStartCases($value); + $this->setUsrPmdriveFolderUid($value); break; case 31: - $this->setUsrTimeZone($value); + $this->setUsrBookmarkStartCases($value); break; case 32: - $this->setUsrDefaultLang($value); + $this->setUsrTimeZone($value); break; case 33: + $this->setUsrDefaultLang($value); + break; + case 34: $this->setUsrLastLogin($value); break; } // switch() @@ -2152,95 +2200,99 @@ abstract class BaseUsers extends BaseObject implements Persistent } if (array_key_exists($keys[11], $arr)) { - $this->setUsrCountry($arr[$keys[11]]); + $this->setUsrStatusId($arr[$keys[11]]); } if (array_key_exists($keys[12], $arr)) { - $this->setUsrCity($arr[$keys[12]]); + $this->setUsrCountry($arr[$keys[12]]); } if (array_key_exists($keys[13], $arr)) { - $this->setUsrLocation($arr[$keys[13]]); + $this->setUsrCity($arr[$keys[13]]); } if (array_key_exists($keys[14], $arr)) { - $this->setUsrAddress($arr[$keys[14]]); + $this->setUsrLocation($arr[$keys[14]]); } if (array_key_exists($keys[15], $arr)) { - $this->setUsrPhone($arr[$keys[15]]); + $this->setUsrAddress($arr[$keys[15]]); } if (array_key_exists($keys[16], $arr)) { - $this->setUsrFax($arr[$keys[16]]); + $this->setUsrPhone($arr[$keys[16]]); } if (array_key_exists($keys[17], $arr)) { - $this->setUsrCellular($arr[$keys[17]]); + $this->setUsrFax($arr[$keys[17]]); } if (array_key_exists($keys[18], $arr)) { - $this->setUsrZipCode($arr[$keys[18]]); + $this->setUsrCellular($arr[$keys[18]]); } if (array_key_exists($keys[19], $arr)) { - $this->setDepUid($arr[$keys[19]]); + $this->setUsrZipCode($arr[$keys[19]]); } if (array_key_exists($keys[20], $arr)) { - $this->setUsrPosition($arr[$keys[20]]); + $this->setDepUid($arr[$keys[20]]); } if (array_key_exists($keys[21], $arr)) { - $this->setUsrResume($arr[$keys[21]]); + $this->setUsrPosition($arr[$keys[21]]); } if (array_key_exists($keys[22], $arr)) { - $this->setUsrBirthday($arr[$keys[22]]); + $this->setUsrResume($arr[$keys[22]]); } if (array_key_exists($keys[23], $arr)) { - $this->setUsrRole($arr[$keys[23]]); + $this->setUsrBirthday($arr[$keys[23]]); } if (array_key_exists($keys[24], $arr)) { - $this->setUsrReportsTo($arr[$keys[24]]); + $this->setUsrRole($arr[$keys[24]]); } if (array_key_exists($keys[25], $arr)) { - $this->setUsrReplacedBy($arr[$keys[25]]); + $this->setUsrReportsTo($arr[$keys[25]]); } if (array_key_exists($keys[26], $arr)) { - $this->setUsrUx($arr[$keys[26]]); + $this->setUsrReplacedBy($arr[$keys[26]]); } if (array_key_exists($keys[27], $arr)) { - $this->setUsrCostByHour($arr[$keys[27]]); + $this->setUsrUx($arr[$keys[27]]); } if (array_key_exists($keys[28], $arr)) { - $this->setUsrUnitCost($arr[$keys[28]]); + $this->setUsrCostByHour($arr[$keys[28]]); } if (array_key_exists($keys[29], $arr)) { - $this->setUsrPmdriveFolderUid($arr[$keys[29]]); + $this->setUsrUnitCost($arr[$keys[29]]); } if (array_key_exists($keys[30], $arr)) { - $this->setUsrBookmarkStartCases($arr[$keys[30]]); + $this->setUsrPmdriveFolderUid($arr[$keys[30]]); } if (array_key_exists($keys[31], $arr)) { - $this->setUsrTimeZone($arr[$keys[31]]); + $this->setUsrBookmarkStartCases($arr[$keys[31]]); } if (array_key_exists($keys[32], $arr)) { - $this->setUsrDefaultLang($arr[$keys[32]]); + $this->setUsrTimeZone($arr[$keys[32]]); } if (array_key_exists($keys[33], $arr)) { - $this->setUsrLastLogin($arr[$keys[33]]); + $this->setUsrDefaultLang($arr[$keys[33]]); + } + + if (array_key_exists($keys[34], $arr)) { + $this->setUsrLastLogin($arr[$keys[34]]); } } @@ -2298,6 +2350,10 @@ abstract class BaseUsers extends BaseObject implements Persistent $criteria->add(UsersPeer::USR_STATUS, $this->usr_status); } + if ($this->isColumnModified(UsersPeer::USR_STATUS_ID)) { + $criteria->add(UsersPeer::USR_STATUS_ID, $this->usr_status_id); + } + if ($this->isColumnModified(UsersPeer::USR_COUNTRY)) { $criteria->add(UsersPeer::USR_COUNTRY, $this->usr_country); } @@ -2464,6 +2520,8 @@ abstract class BaseUsers extends BaseObject implements Persistent $copyObj->setUsrStatus($this->usr_status); + $copyObj->setUsrStatusId($this->usr_status_id); + $copyObj->setUsrCountry($this->usr_country); $copyObj->setUsrCity($this->usr_city); diff --git a/workflow/engine/classes/model/om/BaseUsersPeer.php b/workflow/engine/classes/model/om/BaseUsersPeer.php index cd549cec6..7dcc5a1fa 100644 --- 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 = 34; + const NUM_COLUMNS = 35; /** The number of lazy-loaded columns. */ const NUM_LAZY_LOAD_COLUMNS = 0; @@ -64,6 +64,9 @@ abstract class BaseUsersPeer /** the column name for the USR_STATUS field */ const USR_STATUS = 'USERS.USR_STATUS'; + /** the column name for the USR_STATUS_ID field */ + const USR_STATUS_ID = 'USERS.USR_STATUS_ID'; + /** the column name for the USR_COUNTRY field */ const USR_COUNTRY = 'USERS.USR_COUNTRY'; @@ -144,10 +147,10 @@ abstract class BaseUsersPeer * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' */ private static $fieldNames = array ( - BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrId', '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', 'UsrLastLogin', ), - BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_ID, 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, UsersPeer::USR_LAST_LOGIN, ), - BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_ID', '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', 'USR_LAST_LOGIN', ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('UsrUid', 'UsrId', 'UsrUsername', 'UsrPassword', 'UsrFirstname', 'UsrLastname', 'UsrEmail', 'UsrDueDate', 'UsrCreateDate', 'UsrUpdateDate', 'UsrStatus', 'UsrStatusId', 'UsrCountry', 'UsrCity', 'UsrLocation', 'UsrAddress', 'UsrPhone', 'UsrFax', 'UsrCellular', 'UsrZipCode', 'DepUid', 'UsrPosition', 'UsrResume', 'UsrBirthday', 'UsrRole', 'UsrReportsTo', 'UsrReplacedBy', 'UsrUx', 'UsrCostByHour', 'UsrUnitCost', 'UsrPmdriveFolderUid', 'UsrBookmarkStartCases', 'UsrTimeZone', 'UsrDefaultLang', 'UsrLastLogin', ), + BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID, UsersPeer::USR_ID, 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_STATUS_ID, 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, UsersPeer::USR_LAST_LOGIN, ), + BasePeer::TYPE_FIELDNAME => array ('USR_UID', 'USR_ID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_FIRSTNAME', 'USR_LASTNAME', 'USR_EMAIL', 'USR_DUE_DATE', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_STATUS_ID', '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', 'USR_LAST_LOGIN', ), + 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, ) ); /** @@ -157,10 +160,10 @@ abstract class BaseUsersPeer * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 */ private static $fieldKeys = array ( - BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrId' => 1, 'UsrUsername' => 2, 'UsrPassword' => 3, 'UsrFirstname' => 4, 'UsrLastname' => 5, 'UsrEmail' => 6, 'UsrDueDate' => 7, 'UsrCreateDate' => 8, 'UsrUpdateDate' => 9, 'UsrStatus' => 10, 'UsrCountry' => 11, 'UsrCity' => 12, 'UsrLocation' => 13, 'UsrAddress' => 14, 'UsrPhone' => 15, 'UsrFax' => 16, 'UsrCellular' => 17, 'UsrZipCode' => 18, 'DepUid' => 19, 'UsrPosition' => 20, 'UsrResume' => 21, 'UsrBirthday' => 22, 'UsrRole' => 23, 'UsrReportsTo' => 24, 'UsrReplacedBy' => 25, 'UsrUx' => 26, 'UsrCostByHour' => 27, 'UsrUnitCost' => 28, 'UsrPmdriveFolderUid' => 29, 'UsrBookmarkStartCases' => 30, 'UsrTimeZone' => 31, 'UsrDefaultLang' => 32, 'UsrLastLogin' => 33, ), - BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_ID => 1, UsersPeer::USR_USERNAME => 2, UsersPeer::USR_PASSWORD => 3, UsersPeer::USR_FIRSTNAME => 4, UsersPeer::USR_LASTNAME => 5, UsersPeer::USR_EMAIL => 6, UsersPeer::USR_DUE_DATE => 7, UsersPeer::USR_CREATE_DATE => 8, UsersPeer::USR_UPDATE_DATE => 9, UsersPeer::USR_STATUS => 10, UsersPeer::USR_COUNTRY => 11, UsersPeer::USR_CITY => 12, UsersPeer::USR_LOCATION => 13, UsersPeer::USR_ADDRESS => 14, UsersPeer::USR_PHONE => 15, UsersPeer::USR_FAX => 16, UsersPeer::USR_CELLULAR => 17, UsersPeer::USR_ZIP_CODE => 18, UsersPeer::DEP_UID => 19, UsersPeer::USR_POSITION => 20, UsersPeer::USR_RESUME => 21, UsersPeer::USR_BIRTHDAY => 22, UsersPeer::USR_ROLE => 23, UsersPeer::USR_REPORTS_TO => 24, UsersPeer::USR_REPLACED_BY => 25, UsersPeer::USR_UX => 26, UsersPeer::USR_COST_BY_HOUR => 27, UsersPeer::USR_UNIT_COST => 28, UsersPeer::USR_PMDRIVE_FOLDER_UID => 29, UsersPeer::USR_BOOKMARK_START_CASES => 30, UsersPeer::USR_TIME_ZONE => 31, UsersPeer::USR_DEFAULT_LANG => 32, UsersPeer::USR_LAST_LOGIN => 33, ), - BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_ID' => 1, 'USR_USERNAME' => 2, 'USR_PASSWORD' => 3, 'USR_FIRSTNAME' => 4, 'USR_LASTNAME' => 5, 'USR_EMAIL' => 6, 'USR_DUE_DATE' => 7, 'USR_CREATE_DATE' => 8, 'USR_UPDATE_DATE' => 9, 'USR_STATUS' => 10, 'USR_COUNTRY' => 11, 'USR_CITY' => 12, 'USR_LOCATION' => 13, 'USR_ADDRESS' => 14, 'USR_PHONE' => 15, 'USR_FAX' => 16, 'USR_CELLULAR' => 17, 'USR_ZIP_CODE' => 18, 'DEP_UID' => 19, 'USR_POSITION' => 20, 'USR_RESUME' => 21, 'USR_BIRTHDAY' => 22, 'USR_ROLE' => 23, 'USR_REPORTS_TO' => 24, 'USR_REPLACED_BY' => 25, 'USR_UX' => 26, 'USR_COST_BY_HOUR' => 27, 'USR_UNIT_COST' => 28, 'USR_PMDRIVE_FOLDER_UID' => 29, 'USR_BOOKMARK_START_CASES' => 30, 'USR_TIME_ZONE' => 31, 'USR_DEFAULT_LANG' => 32, 'USR_LAST_LOGIN' => 33, ), - 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, ) + BasePeer::TYPE_PHPNAME => array ('UsrUid' => 0, 'UsrId' => 1, 'UsrUsername' => 2, 'UsrPassword' => 3, 'UsrFirstname' => 4, 'UsrLastname' => 5, 'UsrEmail' => 6, 'UsrDueDate' => 7, 'UsrCreateDate' => 8, 'UsrUpdateDate' => 9, 'UsrStatus' => 10, 'UsrStatusId' => 11, 'UsrCountry' => 12, 'UsrCity' => 13, 'UsrLocation' => 14, 'UsrAddress' => 15, 'UsrPhone' => 16, 'UsrFax' => 17, 'UsrCellular' => 18, 'UsrZipCode' => 19, 'DepUid' => 20, 'UsrPosition' => 21, 'UsrResume' => 22, 'UsrBirthday' => 23, 'UsrRole' => 24, 'UsrReportsTo' => 25, 'UsrReplacedBy' => 26, 'UsrUx' => 27, 'UsrCostByHour' => 28, 'UsrUnitCost' => 29, 'UsrPmdriveFolderUid' => 30, 'UsrBookmarkStartCases' => 31, 'UsrTimeZone' => 32, 'UsrDefaultLang' => 33, 'UsrLastLogin' => 34, ), + BasePeer::TYPE_COLNAME => array (UsersPeer::USR_UID => 0, UsersPeer::USR_ID => 1, UsersPeer::USR_USERNAME => 2, UsersPeer::USR_PASSWORD => 3, UsersPeer::USR_FIRSTNAME => 4, UsersPeer::USR_LASTNAME => 5, UsersPeer::USR_EMAIL => 6, UsersPeer::USR_DUE_DATE => 7, UsersPeer::USR_CREATE_DATE => 8, UsersPeer::USR_UPDATE_DATE => 9, UsersPeer::USR_STATUS => 10, UsersPeer::USR_STATUS_ID => 11, UsersPeer::USR_COUNTRY => 12, UsersPeer::USR_CITY => 13, UsersPeer::USR_LOCATION => 14, UsersPeer::USR_ADDRESS => 15, UsersPeer::USR_PHONE => 16, UsersPeer::USR_FAX => 17, UsersPeer::USR_CELLULAR => 18, UsersPeer::USR_ZIP_CODE => 19, UsersPeer::DEP_UID => 20, UsersPeer::USR_POSITION => 21, UsersPeer::USR_RESUME => 22, UsersPeer::USR_BIRTHDAY => 23, UsersPeer::USR_ROLE => 24, UsersPeer::USR_REPORTS_TO => 25, UsersPeer::USR_REPLACED_BY => 26, UsersPeer::USR_UX => 27, UsersPeer::USR_COST_BY_HOUR => 28, UsersPeer::USR_UNIT_COST => 29, UsersPeer::USR_PMDRIVE_FOLDER_UID => 30, UsersPeer::USR_BOOKMARK_START_CASES => 31, UsersPeer::USR_TIME_ZONE => 32, UsersPeer::USR_DEFAULT_LANG => 33, UsersPeer::USR_LAST_LOGIN => 34, ), + BasePeer::TYPE_FIELDNAME => array ('USR_UID' => 0, 'USR_ID' => 1, 'USR_USERNAME' => 2, 'USR_PASSWORD' => 3, 'USR_FIRSTNAME' => 4, 'USR_LASTNAME' => 5, 'USR_EMAIL' => 6, 'USR_DUE_DATE' => 7, 'USR_CREATE_DATE' => 8, 'USR_UPDATE_DATE' => 9, 'USR_STATUS' => 10, 'USR_STATUS_ID' => 11, 'USR_COUNTRY' => 12, 'USR_CITY' => 13, 'USR_LOCATION' => 14, 'USR_ADDRESS' => 15, 'USR_PHONE' => 16, 'USR_FAX' => 17, 'USR_CELLULAR' => 18, 'USR_ZIP_CODE' => 19, 'DEP_UID' => 20, 'USR_POSITION' => 21, 'USR_RESUME' => 22, 'USR_BIRTHDAY' => 23, 'USR_ROLE' => 24, 'USR_REPORTS_TO' => 25, 'USR_REPLACED_BY' => 26, 'USR_UX' => 27, 'USR_COST_BY_HOUR' => 28, 'USR_UNIT_COST' => 29, 'USR_PMDRIVE_FOLDER_UID' => 30, 'USR_BOOKMARK_START_CASES' => 31, 'USR_TIME_ZONE' => 32, 'USR_DEFAULT_LANG' => 33, 'USR_LAST_LOGIN' => 34, ), + 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, ) ); /** @@ -283,6 +286,8 @@ abstract class BaseUsersPeer $criteria->addSelectColumn(UsersPeer::USR_STATUS); + $criteria->addSelectColumn(UsersPeer::USR_STATUS_ID); + $criteria->addSelectColumn(UsersPeer::USR_COUNTRY); $criteria->addSelectColumn(UsersPeer::USR_CITY); diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 5dcfcdb81..5e1d5981e 100644 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -94,6 +94,15 @@ + + + + + + + + + @@ -1002,7 +1011,7 @@ - + @@ -1040,6 +1049,24 @@ + + + + + + + + + + + + + + + + + + @@ -1685,6 +1712,7 @@ + @@ -1720,6 +1748,24 @@ + + + + + + + + + + + + + + + + + + @@ -4186,6 +4232,16 @@ + + + + + + + + + + @@ -4260,6 +4316,15 @@ + + + + + + + + +
@@ -4362,6 +4427,15 @@ + + + + + + + + + @@ -4505,6 +4579,16 @@ + + + + + + + + + + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index d815725b9..75a53edcd 100644 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -41,6 +41,7 @@ CREATE TABLE `APPLICATION` KEY `indexAppNumber`(`APP_NUMBER`), KEY `indexAppStatus`(`APP_STATUS`), KEY `indexAppCreateDate`(`APP_CREATE_DATE`), + KEY `indexAppStatusId`(`APP_STATUS_ID`), FULLTEXT `indexAppTitle`(`APP_TITLE`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application'; #----------------------------------------------------------------------------- @@ -482,7 +483,7 @@ CREATE TABLE `PROCESS` `PRO_TIME` DOUBLE default 1 NOT NULL, `PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL, `PRO_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL, - `PRO_STATUS_ID` INTEGER default 0, + `PRO_STATUS_ID` INTEGER default 1, `PRO_TYPE_DAY` CHAR(1) default '0' NOT NULL, `PRO_TYPE` VARCHAR(256) default 'NORMAL' NOT NULL, `PRO_ASSIGNMENT` VARCHAR(20) default 'FALSE' NOT NULL, @@ -518,7 +519,9 @@ CREATE TABLE `PROCESS` `PRO_ACTION_DONE` MEDIUMTEXT, `CATEGORY_ID` INTEGER default 0, PRIMARY KEY (`PRO_UID`), - UNIQUE KEY `INDEX_PRO_ID` (`PRO_ID`) + UNIQUE KEY `INDEX_PRO_ID` (`PRO_ID`), + KEY `indexProStatus`(`PRO_STATUS`), + KEY `indexProStatusId`(`PRO_STATUS_ID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Store process Information'; #----------------------------------------------------------------------------- #-- PROCESS_OWNER @@ -805,6 +808,7 @@ CREATE TABLE `USERS` `USR_CREATE_DATE` DATETIME NOT NULL, `USR_UPDATE_DATE` DATETIME NOT NULL, `USR_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL, + `USR_STATUS_ID` INTEGER default 1, `USR_COUNTRY` VARCHAR(3) default '' NOT NULL, `USR_CITY` VARCHAR(3) default '' NOT NULL, `USR_LOCATION` VARCHAR(3) default '' NOT NULL, @@ -830,6 +834,8 @@ CREATE TABLE `USERS` `USR_LAST_LOGIN` DATETIME, PRIMARY KEY (`USR_UID`), UNIQUE KEY `INDEX_USR_ID` (`USR_ID`), + KEY `indexUsrStatus`(`USR_STATUS`), + KEY `indexUsrStatusId`(`USR_STATUS_ID`), KEY `indexUsrUid`(`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users'; #----------------------------------------------------------------------------- @@ -2272,7 +2278,8 @@ CREATE TABLE `PROCESS_VARIABLES` `VAR_DEFAULT` VARCHAR(32) default '', `VAR_ACCEPTED_VALUES` MEDIUMTEXT, `INP_DOC_UID` VARCHAR(32) default '', - PRIMARY KEY (`VAR_UID`) + PRIMARY KEY (`VAR_UID`), + KEY `indexPrjUidVarName`(`PRJ_UID`, `VAR_NAME`) )ENGINE=InnoDB ; #----------------------------------------------------------------------------- #-- APP_TIMEOUT_ACTION_EXECUTED @@ -2372,7 +2379,8 @@ CREATE TABLE `APP_ASSIGN_SELF_SERVICE_VALUE` `TAS_UID` VARCHAR(32) NOT NULL, `TAS_ID` INTEGER default 0, `GRP_UID` MEDIUMTEXT NOT NULL, - PRIMARY KEY (`ID`) + PRIMARY KEY (`ID`), + KEY `indexAppUid`(`APP_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8'; #----------------------------------------------------------------------------- #-- APP_ASSIGN_SELF_SERVICE_VALUE_GROUP @@ -2427,6 +2435,7 @@ CREATE TABLE `LIST_INBOX` KEY `indexUser`(`USR_UID`), KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`), KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`), + KEY `indexAppNumber`(`APP_NUMBER`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_USR_ID`(`USR_ID`), KEY `INDEX_TAS_ID`(`TAS_ID`), @@ -2509,6 +2518,7 @@ CREATE TABLE `LIST_PARTICIPATED_LAST` PRIMARY KEY (`APP_UID`,`USR_UID`,`DEL_INDEX`), KEY `usrIndex`(`USR_UID`), KEY `delDelegateDate`(`DEL_DELEGATE_DATE`), + KEY `indexDelegateDateUsrUid`(`DEL_DELEGATE_DATE`, `USR_UID`), KEY `INDEX_PRO_ID`(`PRO_ID`), KEY `INDEX_USR_ID`(`USR_ID`), KEY `INDEX_TAS_ID`(`TAS_ID`)