fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 0000 BUG 0000 User Inbox Simplified (second commit)

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2012-01-26 09:33:01 -04:00
parent f5f4b527f5
commit 5599ca8b96
22 changed files with 900 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/classes/model/GroupUser.php
View File

@@ -27,6 +27,7 @@
require_once 'classes/model/om/BaseGroupUser.php';
require_once 'classes/model/Content.php';
require_once 'classes/model/Users.php';
require_once 'classes/model/Groupwf.php';
/**
* Skeleton subclass for representing a row from the 'GROUP_USER' table.
@@ -45,7 +46,7 @@ class GroupUser extends BaseGroupUser {
* Create the application document registry
* @param array $aData
* @return string
**/
*/
public function create($aData)
{
$oConnection = Propel::getConnection(GroupUserPeer::DATABASE_NAME);
@@ -78,7 +79,7 @@ class GroupUser extends BaseGroupUser {
* @param string $sGrpUid
* @param string $sUserUid
* @return string
**/
*/
public function remove($sGrpUid, $sUserUid)
{
$oConnection = Propel::getConnection(GroupUserPeer::DATABASE_NAME);
@@ -101,7 +102,8 @@ class GroupUser extends BaseGroupUser {
}
}
function getCountAllUsersByGroup(){
function getCountAllUsersByGroup()
{
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupUserPeer::GRP_UID);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
@@ -118,4 +120,28 @@ class GroupUser extends BaseGroupUser {
return $aRows;
}
function getAllUserGroups($usrUid)
{
$oCriteria = new Criteria('workflow');
// $oCriteria->addSelectColumn(GroupUserPeer::GRP_UID);
// $oCriteria->addSelectColumn('COUNT(*) AS CNT');
// $oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::INNER_JOIN);
$oCriteria->add(GroupUserPeer::USR_UID, $usrUid);
//$oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
//$oCriteria->addGroupByColumn(GroupUserPeer::GRP_UID);
$oDataset = GroupUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$g = new Groupwf();
$rows = Array();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$grpRow = $g->load($row['GRP_UID']);
$row = array_merge($row, $grpRow);
$rows[] = $row;
}
return $rows;
}
} // GroupUser

35
workflow/engine/classes/model/UsersProperties.php
View File

@@ -188,8 +188,11 @@ class UsersProperties extends BaseUsersProperties {
}
return $aErrors;
}
public function redirectTo($sUserUID, $sLanguage = 'en') {
public function redirectTo($sUserUID, $sLanguage = 'en')
{
global $RBAC;
//get the plugins, and check if there is redirectLogins
//if yes, then redirect goes according his Role
if ( class_exists('redirectDetail')) {
@@ -209,6 +212,36 @@ class UsersProperties extends BaseUsersProperties {
}
//end plugin
/**
* New feature - User Experience Redirector
* @author Erik Amaru Ortiz <erik@colosa.com>
*/
require_once 'classes/model/Users.php';
$u = UsersPeer::retrieveByPK($sUserUID);
$uxType = $u->getUsrUx();
// find a group setting
if ($uxType == '' || $uxType == 'NORMAL') {
require_once 'classes/model/GroupUser.php';
$gu = new GroupUser();
$ugList = $gu->getAllUserGroups($sUserUID);
foreach ($ugList as $row) {
if ($row['GRP_UX'] != 'NORMAL' && $row['GRP_UX'] != '') {
$uxType = $row['GRP_UX'];
break;
}
}
}
switch ($uxType) {
case 'SIMPLIFIED':
return '/sys' . SYS_SYS . '/' . $sLanguage . '/' . SYS_SKIN . '/' . 'home';
break;
}
#New feature by Erik erik@colosa.com>
#get user preferences for default redirect
#verifying if it has any preferences on the configurations table

2
workflow/engine/classes/model/map/GroupwfMapBuilder.php
View File

@@ -70,6 +70,8 @@ class GroupwfMapBuilder {
$tMap->addColumn('GRP_LDAP_DN', 'GrpLdapDn', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('GRP_UX', 'GrpUx', 'string', CreoleTypes::VARCHAR, false, 128);
$tMap->addValidator('GRP_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE', 'Please select a valid status.');
$tMap->addValidator('GRP_STATUS', 'required', 'propel.validator.RequiredValidator', '', 'Application Document UID is required.');

2
workflow/engine/classes/model/map/UsersMapBuilder.php
View File

@@ -114,6 +114,8 @@ class UsersMapBuilder {
$tMap->addColumn('USR_REPLACED_BY', 'UsrReplacedBy', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('USR_UX', 'UsrUx', 'string', CreoleTypes::VARCHAR, false, 128);
$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.');

55
workflow/engine/classes/model/om/BaseGroupwf.php
View File

@@ -48,6 +48,13 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
*/
protected $grp_ldap_dn = '';
/**
* The value for the grp_ux field.
* @var string
*/
protected $grp_ux = 'NORMAL';
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -95,6 +102,17 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
return $this->grp_ldap_dn;
}
/**
* Get the [grp_ux] column value.
*
* @return string
*/
public function getGrpUx()
{
return $this->grp_ux;
}
/**
* Set the value of [grp_uid] column.
*
@@ -161,6 +179,28 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
} // setGrpLdapDn()
/**
* Set the value of [grp_ux] column.
*
* @param string $v new value
* @return void
*/
public function setGrpUx($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->grp_ux !== $v || $v === 'NORMAL') {
$this->grp_ux = $v;
$this->modifiedColumns[] = GroupwfPeer::GRP_UX;
}
} // setGrpUx()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -184,12 +224,14 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
$this->grp_ldap_dn = $rs->getString($startcol + 2);
$this->grp_ux = $rs->getString($startcol + 3);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 3; // 3 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 4; // 4 = GroupwfPeer::NUM_COLUMNS - GroupwfPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Groupwf object", $e);
@@ -401,6 +443,9 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
case 2:
return $this->getGrpLdapDn();
break;
case 3:
return $this->getGrpUx();
break;
default:
return null;
break;
@@ -424,6 +469,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
$keys[0] => $this->getGrpUid(),
$keys[1] => $this->getGrpStatus(),
$keys[2] => $this->getGrpLdapDn(),
$keys[3] => $this->getGrpUx(),
);
return $result;
}
@@ -464,6 +510,9 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
case 2:
$this->setGrpLdapDn($value);
break;
case 3:
$this->setGrpUx($value);
break;
} // switch()
}
@@ -490,6 +539,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
if (array_key_exists($keys[0], $arr)) $this->setGrpUid($arr[$keys[0]]);
if (array_key_exists($keys[1], $arr)) $this->setGrpStatus($arr[$keys[1]]);
if (array_key_exists($keys[2], $arr)) $this->setGrpLdapDn($arr[$keys[2]]);
if (array_key_exists($keys[3], $arr)) $this->setGrpUx($arr[$keys[3]]);
}
/**
@@ -504,6 +554,7 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
if ($this->isColumnModified(GroupwfPeer::GRP_UID)) $criteria->add(GroupwfPeer::GRP_UID, $this->grp_uid);
if ($this->isColumnModified(GroupwfPeer::GRP_STATUS)) $criteria->add(GroupwfPeer::GRP_STATUS, $this->grp_status);
if ($this->isColumnModified(GroupwfPeer::GRP_LDAP_DN)) $criteria->add(GroupwfPeer::GRP_LDAP_DN, $this->grp_ldap_dn);
if ($this->isColumnModified(GroupwfPeer::GRP_UX)) $criteria->add(GroupwfPeer::GRP_UX, $this->grp_ux);
return $criteria;
}
@@ -562,6 +613,8 @@ abstract class BaseGroupwf extends BaseObject implements Persistent {
$copyObj->setGrpLdapDn($this->grp_ldap_dn);
$copyObj->setGrpUx($this->grp_ux);
$copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseGroupwfPeer.php
View File

@@ -24,7 +24,7 @@ abstract class BaseGroupwfPeer {
const CLASS_DEFAULT = 'classes.model.Groupwf';
/** The total number of columns. */
const NUM_COLUMNS = 3;
const NUM_COLUMNS = 4;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -39,6 +39,9 @@ abstract class BaseGroupwfPeer {
/** the column name for the GRP_LDAP_DN field */
const GRP_LDAP_DN = 'GROUPWF.GRP_LDAP_DN';
/** the column name for the GRP_UX field */
const GRP_UX = 'GROUPWF.GRP_UX';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -50,10 +53,10 @@ abstract class BaseGroupwfPeer {
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpStatus', 'GrpLdapDn', ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_STATUS', 'GRP_LDAP_DN', ),
BasePeer::TYPE_NUM => array (0, 1, 2, )
BasePeer::TYPE_PHPNAME => array ('GrpUid', 'GrpStatus', 'GrpLdapDn', 'GrpUx', ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID, GroupwfPeer::GRP_STATUS, GroupwfPeer::GRP_LDAP_DN, GroupwfPeer::GRP_UX, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID', 'GRP_STATUS', 'GRP_LDAP_DN', 'GRP_UX', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
);
/**
@@ -63,10 +66,10 @@ abstract class BaseGroupwfPeer {
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpStatus' => 1, 'GrpLdapDn' => 2, ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_STATUS => 1, GroupwfPeer::GRP_LDAP_DN => 2, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_STATUS' => 1, 'GRP_LDAP_DN' => 2, ),
BasePeer::TYPE_NUM => array (0, 1, 2, )
BasePeer::TYPE_PHPNAME => array ('GrpUid' => 0, 'GrpStatus' => 1, 'GrpLdapDn' => 2, 'GrpUx' => 3, ),
BasePeer::TYPE_COLNAME => array (GroupwfPeer::GRP_UID => 0, GroupwfPeer::GRP_STATUS => 1, GroupwfPeer::GRP_LDAP_DN => 2, GroupwfPeer::GRP_UX => 3, ),
BasePeer::TYPE_FIELDNAME => array ('GRP_UID' => 0, 'GRP_STATUS' => 1, 'GRP_LDAP_DN' => 2, 'GRP_UX' => 3, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
);
/**
@@ -173,6 +176,8 @@ abstract class BaseGroupwfPeer {
$criteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX);
}
const COUNT = 'COUNT(GROUPWF.GRP_UID)';

55
workflow/engine/classes/model/om/BaseUsers.php
View File

@@ -202,6 +202,13 @@ abstract class BaseUsers extends BaseObject implements Persistent {
*/
protected $usr_replaced_by = '';
/**
* The value for the usr_ux field.
* @var string
*/
protected $usr_ux = 'NORMAL';
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -571,6 +578,17 @@ abstract class BaseUsers extends BaseObject implements Persistent {
return $this->usr_replaced_by;
}
/**
* Get the [usr_ux] column value.
*
* @return string
*/
public function getUsrUx()
{
return $this->usr_ux;
}
/**
* Set the value of [usr_uid] column.
*
@@ -1129,6 +1147,28 @@ abstract class BaseUsers extends BaseObject implements Persistent {
} // setUsrReplacedBy()
/**
* Set the value of [usr_ux] column.
*
* @param string $v new value
* @return void
*/
public function setUsrUx($v)
{
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
$v = (string) $v;
}
if ($this->usr_ux !== $v || $v === 'NORMAL') {
$this->usr_ux = $v;
$this->modifiedColumns[] = UsersPeer::USR_UX;
}
} // setUsrUx()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -1196,12 +1236,14 @@ abstract class BaseUsers extends BaseObject implements Persistent {
$this->usr_replaced_by = $rs->getString($startcol + 24);
$this->usr_ux = $rs->getString($startcol + 25);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 25; // 25 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 26; // 26 = UsersPeer::NUM_COLUMNS - UsersPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating Users object", $e);
@@ -1479,6 +1521,9 @@ abstract class BaseUsers extends BaseObject implements Persistent {
case 24:
return $this->getUsrReplacedBy();
break;
case 25:
return $this->getUsrUx();
break;
default:
return null;
break;
@@ -1524,6 +1569,7 @@ abstract class BaseUsers extends BaseObject implements Persistent {
$keys[22] => $this->getUsrRole(),
$keys[23] => $this->getUsrReportsTo(),
$keys[24] => $this->getUsrReplacedBy(),
$keys[25] => $this->getUsrUx(),
);
return $result;
}
@@ -1630,6 +1676,9 @@ abstract class BaseUsers extends BaseObject implements Persistent {
case 24:
$this->setUsrReplacedBy($value);
break;
case 25:
$this->setUsrUx($value);
break;
} // switch()
}
@@ -1678,6 +1727,7 @@ abstract class BaseUsers extends BaseObject implements Persistent {
if (array_key_exists($keys[22], $arr)) $this->setUsrRole($arr[$keys[22]]);
if (array_key_exists($keys[23], $arr)) $this->setUsrReportsTo($arr[$keys[23]]);
if (array_key_exists($keys[24], $arr)) $this->setUsrReplacedBy($arr[$keys[24]]);
if (array_key_exists($keys[25], $arr)) $this->setUsrUx($arr[$keys[25]]);
}
/**
@@ -1714,6 +1764,7 @@ abstract class BaseUsers extends BaseObject implements Persistent {
if ($this->isColumnModified(UsersPeer::USR_ROLE)) $criteria->add(UsersPeer::USR_ROLE, $this->usr_role);
if ($this->isColumnModified(UsersPeer::USR_REPORTS_TO)) $criteria->add(UsersPeer::USR_REPORTS_TO, $this->usr_reports_to);
if ($this->isColumnModified(UsersPeer::USR_REPLACED_BY)) $criteria->add(UsersPeer::USR_REPLACED_BY, $this->usr_replaced_by);
if ($this->isColumnModified(UsersPeer::USR_UX)) $criteria->add(UsersPeer::USR_UX, $this->usr_ux);
return $criteria;
}
@@ -1816,6 +1867,8 @@ abstract class BaseUsers extends BaseObject implements Persistent {
$copyObj->setUsrReplacedBy($this->usr_replaced_by);
$copyObj->setUsrUx($this->usr_ux);
$copyObj->setNew(true);

23
workflow/engine/classes/model/om/BaseUsersPeer.php
View File

@@ -24,7 +24,7 @@ abstract class BaseUsersPeer {
const CLASS_DEFAULT = 'classes.model.Users';
/** The total number of columns. */
const NUM_COLUMNS = 25;
const NUM_COLUMNS = 26;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -105,6 +105,9 @@ abstract class BaseUsersPeer {
/** the column name for the USR_REPLACED_BY field */
const USR_REPLACED_BY = 'USERS.USR_REPLACED_BY';
/** the column name for the USR_UX field */
const USR_UX = 'USERS.USR_UX';
/** The PHP to DB Name Mapping */
private static $phpNameMap = null;
@@ -116,10 +119,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', ),
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, ),
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', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, )
BasePeer::TYPE_PHPNAME => array ('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, )
);
/**
@@ -129,10 +132,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, ),
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, ),
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, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, )
BasePeer::TYPE_PHPNAME => array ('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, )
);
/**
@@ -283,6 +286,8 @@ abstract class BaseUsersPeer {
$criteria->addSelectColumn(UsersPeer::USR_REPLACED_BY);
$criteria->addSelectColumn(UsersPeer::USR_UX);
}
const COUNT = 'COUNT(USERS.USR_UID)';