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

HOR-1316 Agregar el campo DEPO_TITLE en la tabla DEPARTMENT

Browse Source
This commit is contained in:
Ronald Q
2016-06-29 11:52:56 -04:00
parent e8caa0ae5d
commit 5c79eb30da
10 changed files with 130 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.wsBase.php
View File

@@ -287,7 +287,7 @@ class wsBase
$oDepartment = new Department(); $oDepartment = new Department();
$aDepartment = $oDepartment->Load( $aRow['DEP_UID'] ); $aDepartment = $oDepartment->Load( $aRow['DEP_UID'] );
$node['guid'] = $aRow['DEP_UID']; $node['guid'] = $aRow['DEP_UID'];
$node['name'] = $aDepartment['DEPO_TITLE']; $node['name'] = $aDepartment['DEP_TITLE'];
$node['parentUID'] = $aDepartment['DEP_PARENT']; $node['parentUID'] = $aDepartment['DEP_PARENT'];
$node['dn'] = $aDepartment['DEP_LDAP_DN']; $node['dn'] = $aDepartment['DEP_LDAP_DN'];

49
workflow/engine/classes/model/Department.php
View File

@@ -105,8 +105,10 @@ class Department extends BaseDepartment
if (isset( $aData['DEP_TITLE'] )) { if (isset( $aData['DEP_TITLE'] )) {
$this->setDepTitle( $aData['DEP_TITLE'] ); $this->setDepTitle( $aData['DEP_TITLE'] );
$this->setDepTitleContent( $aData['DEP_TITLE'] );
} else { } else {
$this->setDepTitle( '' ); $this->setDepTitle( '' );
$this->setDepTitleContent( '' );
} }
if ($this->validate()) { if ($this->validate()) {
@@ -138,7 +140,7 @@ class Department extends BaseDepartment
* *
* @return string * @return string
*/ */
public function getDepTitle () public function getDepTitleContent ()
{ {
if ($this->getDepUid() == '') { if ($this->getDepUid() == '') {
throw (new Exception( "Error in getDepTitle, the DEP_UID can't be blank" )); throw (new Exception( "Error in getDepTitle, the DEP_UID can't be blank" ));
@@ -154,7 +156,7 @@ class Department extends BaseDepartment
* @param string $v new value * @param string $v new value
* @return void * @return void
*/ */
public function setDepTitle ($v) public function setDepTitleContent ($v)
{ {
if ($this->getDepUid() == '') { if ($this->getDepUid() == '') {
throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" )); throw (new Exception( "Error in setGrpTitle, the GRP_UID can't be blank" ));
@@ -188,7 +190,7 @@ class Department extends BaseDepartment
if (is_object( $oDept ) && get_class( $oDept ) == 'Department') { if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
$aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME ); $aFields = $oDept->toArray( BasePeer::TYPE_FIELDNAME );
$this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
$aFields['DEPO_TITLE'] = $oDept->getDepTitle(); //$aFields['DEPO_TITLE'] = $oDept->getDepTitle();
return $aFields; return $aFields;
} else { } else {
throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" )); throw (new Exception( "The row '$DepUid' in table Department doesn't exist!" ));
@@ -217,6 +219,7 @@ class Department extends BaseDepartment
if ($oPro->validate()) { if ($oPro->validate()) {
if (isset( $aData['DEPO_TITLE'] )) { if (isset( $aData['DEPO_TITLE'] )) {
$oPro->setDepTitle( $aData['DEPO_TITLE'] ); $oPro->setDepTitle( $aData['DEPO_TITLE'] );
$oPro->setDepTitleContent( $aData['DEPO_TITLE'] );
} }
if (isset( $aData['DEP_STATUS'] )) { if (isset( $aData['DEP_STATUS'] )) {
$oPro->setDepStatus( $aData['DEP_STATUS'] ); $oPro->setDepStatus( $aData['DEP_STATUS'] );
@@ -371,7 +374,7 @@ class Department extends BaseDepartment
$user = $oUser->loadDetailed ($managerId); $user = $oUser->loadDetailed ($managerId);
if (is_object( $oDept ) && get_class( $oDept ) == 'Department') { if (is_object( $oDept ) && get_class( $oDept ) == 'Department') {
$dptoTitle = $oDept->Load($depId); $dptoTitle = $oDept->Load($depId);
G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEPO_TITLE']." (".$depId.") "); G::auditLog("AssignManagerToDepartament", "Assign Manager ".$user['USR_USERNAME']." (".$managerId.") to ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
} }
} }
// get children departments to update the reportsTo of these children // get children departments to update the reportsTo of these children
@@ -403,7 +406,7 @@ class Department extends BaseDepartment
if (is_object( $oUser ) && get_class( $oUser ) == 'Users') { if (is_object( $oUser ) && get_class( $oUser ) == 'Users') {
$oUser->setDepUid( $depId ); $oUser->setDepUid( $depId );
$oUser->save(); $oUser->save();
G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEPO_TITLE']." (".$depId.") "); G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEP_TITLE']." (".$depId.") ");
} }
//if the user is a manager update Department Table //if the user is a manager update Department Table
@@ -496,14 +499,10 @@ class Department extends BaseDepartment
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->clearSelectColumns(); $oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $oCriteria->add( DepartmentPeer::DEP_TITLE, $departmentName );
$oCriteria->add( ContentPeer::CON_VALUE, $departmentName );
$oCriteria->add( DepartmentPeer::DEP_UID, $departmentUID, Criteria::NOT_EQUAL ); $oCriteria->add( DepartmentPeer::DEP_UID, $departmentUID, Criteria::NOT_EQUAL );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( DepartmentPeer::DEP_PARENT, $parentUID ); $oCriteria->add( DepartmentPeer::DEP_PARENT, $parentUID );
$oDataset = DepartmentPeer::doSelectRS( $oCriteria ); $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
@@ -585,7 +584,7 @@ class Department extends BaseDepartment
$oUser->setUsrReportsTo( '' ); $oUser->setUsrReportsTo( '' );
$oUser->save(); $oUser->save();
G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEPO_TITLE']." (".$DepUid.") "); G::auditLog("RemoveUsersFromDepartament", "Remove user ".$user['USR_USERNAME']."( ".$UsrUid.") from departament ".$dptoTitle['DEP_TITLE']." (".$DepUid.") ");
} }
} catch (exception $oError) { } catch (exception $oError) {
throw ($oError); throw ($oError);
@@ -641,12 +640,8 @@ class Department extends BaseDepartment
$del = DBAdapter::getStringDelimiter(); $del = DBAdapter::getStringDelimiter();
$c->clearSelectColumns(); $c->clearSelectColumns();
$c->addSelectColumn( ContentPeer::CON_CATEGORY ); $c->addSelectColumn(DepartmentPeer::DEP_TITLE);
$c->addSelectColumn( ContentPeer::CON_VALUE ); $c->add(DepartmentPeer::DEP_TITLE, $Groupname);
$c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
$c->add( ContentPeer::CON_VALUE, $Groupname );
$c->add( ContentPeer::CON_LANG, SYS_LANG );
return $c; return $c;
} }
@@ -655,10 +650,8 @@ class Department extends BaseDepartment
{ {
$c = new Criteria( 'workflow' ); $c = new Criteria( 'workflow' );
$c->addSelectColumn( UsersPeer::USR_UID ); $c->addSelectColumn( UsersPeer::USR_UID );
$c->addAsColumn( 'DEP_TITLE', ContentPeer::CON_VALUE ); $c->addSelectColumn( DepartmentPeer::DEP_TITLE );
$c->add( ContentPeer::CON_LANG, defined( SYS_LANG ) ? SYS_LANG : 'en' ); $c->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::INNER_JOIN );
$c->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' );
$c->addJoin( UsersPeer::DEP_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN );
$Dat = UsersPeer::doSelectRS( $c ); $Dat = UsersPeer::doSelectRS( $c );
$Dat->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $Dat->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$aRows = Array (); $aRows = Array ();
@@ -673,18 +666,8 @@ class Department extends BaseDepartment
{ {
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( UsersPeer::DEP_UID ); $criteria->addSelectColumn( UsersPeer::DEP_UID );
$criteria->addAsColumn( 'DEP_TITLE', 'C.CON_VALUE' ); $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$criteria->addAlias( 'C', 'CONTENT' );
$criteria->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $criteria->addJoin( UsersPeer::DEP_UID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN );
$delimiter = DBAdapter::getStringDelimiter();
$conditions = array ();
$conditions[] = array (DepartmentPeer::DEP_UID,'C.CON_ID'
);
$conditions[] = array ('C.CON_CATEGORY',$delimiter . 'DEPO_TITLE' . $delimiter
);
$conditions[] = array ('C.CON_LANG',$delimiter . SYS_LANG . $delimiter
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
$criteria->add( UsersPeer::USR_UID, $userUid ); $criteria->add( UsersPeer::USR_UID, $userUid );
$criteria->add( UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL ); $criteria->add( UsersPeer::DEP_UID, '', Criteria::NOT_EQUAL );
$dataset = DepartmentPeer::doSelectRS( $criteria ); $dataset = DepartmentPeer::doSelectRS( $criteria );

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

@@ -67,6 +67,8 @@ class DepartmentMapBuilder
$tMap->addPrimaryKey('DEP_UID', 'DepUid', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addPrimaryKey('DEP_UID', 'DepUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEP_TITLE', 'DepTitle', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('DEP_PARENT', 'DepParent', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DEP_PARENT', 'DepParent', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('DEP_MANAGER', 'DepManager', 'string', CreoleTypes::VARCHAR, true, 32); $tMap->addColumn('DEP_MANAGER', 'DepManager', 'string', CreoleTypes::VARCHAR, true, 32);

116
workflow/engine/classes/model/om/BaseDepartment.php
View File

@@ -33,6 +33,12 @@ abstract class BaseDepartment extends BaseObject implements Persistent
*/ */
protected $dep_uid = ''; protected $dep_uid = '';
/**
* The value for the dep_title field.
* @var string
*/
protected $dep_title;
/** /**
* The value for the dep_parent field. * The value for the dep_parent field.
* @var string * @var string
@@ -94,6 +100,17 @@ abstract class BaseDepartment extends BaseObject implements Persistent
return $this->dep_uid; return $this->dep_uid;
} }
/**
* Get the [dep_title] column value.
*
* @return string
*/
public function getDepTitle()
{
return $this->dep_title;
}
/** /**
* Get the [dep_parent] column value. * Get the [dep_parent] column value.
* *
@@ -182,6 +199,28 @@ abstract class BaseDepartment extends BaseObject implements Persistent
} // setDepUid() } // setDepUid()
/**
* Set the value of [dep_title] column.
*
* @param string $v new value
* @return void
*/
public function setDepTitle($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->dep_title !== $v) {
$this->dep_title = $v;
$this->modifiedColumns[] = DepartmentPeer::DEP_TITLE;
}
} // setDepTitle()
/** /**
* Set the value of [dep_parent] column. * Set the value of [dep_parent] column.
* *
@@ -333,24 +372,26 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$this->dep_uid = $rs->getString($startcol + 0); $this->dep_uid = $rs->getString($startcol + 0);
$this->dep_parent = $rs->getString($startcol + 1); $this->dep_title = $rs->getString($startcol + 1);
$this->dep_manager = $rs->getString($startcol + 2); $this->dep_parent = $rs->getString($startcol + 2);
$this->dep_location = $rs->getInt($startcol + 3); $this->dep_manager = $rs->getString($startcol + 3);
$this->dep_status = $rs->getString($startcol + 4); $this->dep_location = $rs->getInt($startcol + 4);
$this->dep_ref_code = $rs->getString($startcol + 5); $this->dep_status = $rs->getString($startcol + 5);
$this->dep_ldap_dn = $rs->getString($startcol + 6); $this->dep_ref_code = $rs->getString($startcol + 6);
$this->dep_ldap_dn = $rs->getString($startcol + 7);
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer. // FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 7; // 7 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS). return $startcol + 8; // 8 = DepartmentPeer::NUM_COLUMNS - DepartmentPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating Department object", $e); throw new PropelException("Error populating Department object", $e);
@@ -558,21 +599,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
return $this->getDepUid(); return $this->getDepUid();
break; break;
case 1: case 1:
return $this->getDepParent(); return $this->getDepTitle();
break; break;
case 2: case 2:
return $this->getDepManager(); return $this->getDepParent();
break; break;
case 3: case 3:
return $this->getDepLocation(); return $this->getDepManager();
break; break;
case 4: case 4:
return $this->getDepStatus(); return $this->getDepLocation();
break; break;
case 5: case 5:
return $this->getDepRefCode(); return $this->getDepStatus();
break; break;
case 6: case 6:
return $this->getDepRefCode();
break;
case 7:
return $this->getDepLdapDn(); return $this->getDepLdapDn();
break; break;
default: default:
@@ -596,12 +640,13 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$keys = DepartmentPeer::getFieldNames($keyType); $keys = DepartmentPeer::getFieldNames($keyType);
$result = array( $result = array(
$keys[0] => $this->getDepUid(), $keys[0] => $this->getDepUid(),
$keys[1] => $this->getDepParent(), $keys[1] => $this->getDepTitle(),
$keys[2] => $this->getDepManager(), $keys[2] => $this->getDepParent(),
$keys[3] => $this->getDepLocation(), $keys[3] => $this->getDepManager(),
$keys[4] => $this->getDepStatus(), $keys[4] => $this->getDepLocation(),
$keys[5] => $this->getDepRefCode(), $keys[5] => $this->getDepStatus(),
$keys[6] => $this->getDepLdapDn(), $keys[6] => $this->getDepRefCode(),
$keys[7] => $this->getDepLdapDn(),
); );
return $result; return $result;
} }
@@ -637,21 +682,24 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$this->setDepUid($value); $this->setDepUid($value);
break; break;
case 1: case 1:
$this->setDepParent($value); $this->setDepTitle($value);
break; break;
case 2: case 2:
$this->setDepManager($value); $this->setDepParent($value);
break; break;
case 3: case 3:
$this->setDepLocation($value); $this->setDepManager($value);
break; break;
case 4: case 4:
$this->setDepStatus($value); $this->setDepLocation($value);
break; break;
case 5: case 5:
$this->setDepRefCode($value); $this->setDepStatus($value);
break; break;
case 6: case 6:
$this->setDepRefCode($value);
break;
case 7:
$this->setDepLdapDn($value); $this->setDepLdapDn($value);
break; break;
} // switch() } // switch()
@@ -682,27 +730,31 @@ abstract class BaseDepartment extends BaseObject implements Persistent
} }
if (array_key_exists($keys[1], $arr)) { if (array_key_exists($keys[1], $arr)) {
$this->setDepParent($arr[$keys[1]]); $this->setDepTitle($arr[$keys[1]]);
} }
if (array_key_exists($keys[2], $arr)) { if (array_key_exists($keys[2], $arr)) {
$this->setDepManager($arr[$keys[2]]); $this->setDepParent($arr[$keys[2]]);
} }
if (array_key_exists($keys[3], $arr)) { if (array_key_exists($keys[3], $arr)) {
$this->setDepLocation($arr[$keys[3]]); $this->setDepManager($arr[$keys[3]]);
} }
if (array_key_exists($keys[4], $arr)) { if (array_key_exists($keys[4], $arr)) {
$this->setDepStatus($arr[$keys[4]]); $this->setDepLocation($arr[$keys[4]]);
} }
if (array_key_exists($keys[5], $arr)) { if (array_key_exists($keys[5], $arr)) {
$this->setDepRefCode($arr[$keys[5]]); $this->setDepStatus($arr[$keys[5]]);
} }
if (array_key_exists($keys[6], $arr)) { if (array_key_exists($keys[6], $arr)) {
$this->setDepLdapDn($arr[$keys[6]]); $this->setDepRefCode($arr[$keys[6]]);
}
if (array_key_exists($keys[7], $arr)) {
$this->setDepLdapDn($arr[$keys[7]]);
} }
} }
@@ -720,6 +772,10 @@ abstract class BaseDepartment extends BaseObject implements Persistent
$criteria->add(DepartmentPeer::DEP_UID, $this->dep_uid); $criteria->add(DepartmentPeer::DEP_UID, $this->dep_uid);
} }
if ($this->isColumnModified(DepartmentPeer::DEP_TITLE)) {
$criteria->add(DepartmentPeer::DEP_TITLE, $this->dep_title);
}
if ($this->isColumnModified(DepartmentPeer::DEP_PARENT)) { if ($this->isColumnModified(DepartmentPeer::DEP_PARENT)) {
$criteria->add(DepartmentPeer::DEP_PARENT, $this->dep_parent); $criteria->add(DepartmentPeer::DEP_PARENT, $this->dep_parent);
} }
@@ -798,6 +854,8 @@ abstract class BaseDepartment extends BaseObject implements Persistent
public function copyInto($copyObj, $deepCopy = false) public function copyInto($copyObj, $deepCopy = false)
{ {
$copyObj->setDepTitle($this->dep_title);
$copyObj->setDepParent($this->dep_parent); $copyObj->setDepParent($this->dep_parent);
$copyObj->setDepManager($this->dep_manager); $copyObj->setDepManager($this->dep_manager);

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

@@ -25,7 +25,7 @@ abstract class BaseDepartmentPeer
const CLASS_DEFAULT = 'classes.model.Department'; const CLASS_DEFAULT = 'classes.model.Department';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 7; const NUM_COLUMNS = 8;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -34,6 +34,9 @@ abstract class BaseDepartmentPeer
/** the column name for the DEP_UID field */ /** the column name for the DEP_UID field */
const DEP_UID = 'DEPARTMENT.DEP_UID'; const DEP_UID = 'DEPARTMENT.DEP_UID';
/** the column name for the DEP_TITLE field */
const DEP_TITLE = 'DEPARTMENT.DEP_TITLE';
/** the column name for the DEP_PARENT field */ /** the column name for the DEP_PARENT field */
const DEP_PARENT = 'DEPARTMENT.DEP_PARENT'; const DEP_PARENT = 'DEPARTMENT.DEP_PARENT';
@@ -63,10 +66,10 @@ abstract class BaseDepartmentPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id' * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/ */
private static $fieldNames = array ( private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ), BasePeer::TYPE_PHPNAME => array ('DepUid', 'DepTitle', 'DepParent', 'DepManager', 'DepLocation', 'DepStatus', 'DepRefCode', 'DepLdapDn', ),
BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ), BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID, DepartmentPeer::DEP_TITLE, DepartmentPeer::DEP_PARENT, DepartmentPeer::DEP_MANAGER, DepartmentPeer::DEP_LOCATION, DepartmentPeer::DEP_STATUS, DepartmentPeer::DEP_REF_CODE, DepartmentPeer::DEP_LDAP_DN, ),
BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ), BasePeer::TYPE_FIELDNAME => array ('DEP_UID', 'DEP_TITLE', 'DEP_PARENT', 'DEP_MANAGER', 'DEP_LOCATION', 'DEP_STATUS', 'DEP_REF_CODE', 'DEP_LDAP_DN', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
); );
/** /**
@@ -76,10 +79,10 @@ abstract class BaseDepartmentPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
private static $fieldKeys = array ( private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepParent' => 1, 'DepManager' => 2, 'DepLocation' => 3, 'DepStatus' => 4, 'DepRefCode' => 5, 'DepLdapDn' => 6, ), BasePeer::TYPE_PHPNAME => array ('DepUid' => 0, 'DepTitle' => 1, 'DepParent' => 2, 'DepManager' => 3, 'DepLocation' => 4, 'DepStatus' => 5, 'DepRefCode' => 6, 'DepLdapDn' => 7, ),
BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_PARENT => 1, DepartmentPeer::DEP_MANAGER => 2, DepartmentPeer::DEP_LOCATION => 3, DepartmentPeer::DEP_STATUS => 4, DepartmentPeer::DEP_REF_CODE => 5, DepartmentPeer::DEP_LDAP_DN => 6, ), BasePeer::TYPE_COLNAME => array (DepartmentPeer::DEP_UID => 0, DepartmentPeer::DEP_TITLE => 1, DepartmentPeer::DEP_PARENT => 2, DepartmentPeer::DEP_MANAGER => 3, DepartmentPeer::DEP_LOCATION => 4, DepartmentPeer::DEP_STATUS => 5, DepartmentPeer::DEP_REF_CODE => 6, DepartmentPeer::DEP_LDAP_DN => 7, ),
BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_PARENT' => 1, 'DEP_MANAGER' => 2, 'DEP_LOCATION' => 3, 'DEP_STATUS' => 4, 'DEP_REF_CODE' => 5, 'DEP_LDAP_DN' => 6, ), BasePeer::TYPE_FIELDNAME => array ('DEP_UID' => 0, 'DEP_TITLE' => 1, 'DEP_PARENT' => 2, 'DEP_MANAGER' => 3, 'DEP_LOCATION' => 4, 'DEP_STATUS' => 5, 'DEP_REF_CODE' => 6, 'DEP_LDAP_DN' => 7, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
); );
/** /**
@@ -182,6 +185,8 @@ abstract class BaseDepartmentPeer
$criteria->addSelectColumn(DepartmentPeer::DEP_UID); $criteria->addSelectColumn(DepartmentPeer::DEP_UID);
$criteria->addSelectColumn(DepartmentPeer::DEP_TITLE);
$criteria->addSelectColumn(DepartmentPeer::DEP_PARENT); $criteria->addSelectColumn(DepartmentPeer::DEP_PARENT);
$criteria->addSelectColumn(DepartmentPeer::DEP_MANAGER); $criteria->addSelectColumn(DepartmentPeer::DEP_MANAGER);

1
workflow/engine/config/schema.xml
View File

@@ -436,6 +436,7 @@
<parameter name="Comment" value="Departments"/> <parameter name="Comment" value="Departments"/>
</vendor> </vendor>
<column name="DEP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/> <column name="DEP_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="DEP_TITLE" type="LONGVARCHAR" required="true"/>
<column name="DEP_PARENT" type="VARCHAR" size="32" required="true" default=""/> <column name="DEP_PARENT" type="VARCHAR" size="32" required="true" default=""/>
<column name="DEP_MANAGER" type="VARCHAR" size="32" required="true" default=""/> <column name="DEP_MANAGER" type="VARCHAR" size="32" required="true" default=""/>
<column name="DEP_LOCATION" type="INTEGER" required="true" default="0"/> <column name="DEP_LOCATION" type="INTEGER" required="true" default="0"/>

19
workflow/engine/controllers/dashboard.php
View File

@@ -354,27 +354,14 @@ class Dashboard extends Controller
$criteria = new Criteria( 'workflow' ); $criteria = new Criteria( 'workflow' );
$criteria->setDistinct(); $criteria->setDistinct();
$criteria->addSelectColumn( DepartmentPeer::DEP_UID ); $criteria->addSelectColumn( DepartmentPeer::DEP_UID );
$criteria->addSelectColumn( ContentPeer::CON_VALUE ); $criteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
//FROM
$conditions = array ();
$conditions[] = array (DepartmentPeer::DEP_UID,ContentPeer::CON_ID
);
$conditions[] = array (ContentPeer::CON_CATEGORY,DBAdapter::getStringDelimiter() . 'DEPO_TITLE' . DBAdapter::getStringDelimiter()
);
$conditions[] = array (ContentPeer::CON_LANG,DBAdapter::getStringDelimiter() . 'en' . DBAdapter::getStringDelimiter()
);
$criteria->addJoinMC( $conditions, Criteria::LEFT_JOIN );
//WHERE
$criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' ); $criteria->add( DepartmentPeer::DEP_STATUS, 'ACTIVE' );
//ORDER BY $criteria->addAscendingOrderByColumn( DepartmentPeer::DEP_TITLE );
$criteria->addAscendingOrderByColumn( ContentPeer::CON_VALUE );
$dataset = DepartmentPeer::doSelectRS( $criteria ); $dataset = DepartmentPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$dataset->next(); $dataset->next();
while ($row = $dataset->getRow()) { while ($row = $dataset->getRow()) {
$departments[] = array ('OWNER_UID' => $row['DEP_UID'],'OWNER_NAME' => $row['CON_VALUE'] $departments[] = array('OWNER_UID' => $row['DEP_UID'], 'OWNER_NAME' => $row['DEP_TITLE']);
);
$dataset->next(); $dataset->next();
} }

1
workflow/engine/data/mysql/schema.sql
View File

@@ -205,6 +205,7 @@ DROP TABLE IF EXISTS `DEPARTMENT`;
CREATE TABLE `DEPARTMENT` CREATE TABLE `DEPARTMENT`
( (
`DEP_UID` VARCHAR(32) default '' NOT NULL, `DEP_UID` VARCHAR(32) default '' NOT NULL,
`DEP_TITLE` MEDIUMTEXT NOT NULL,
`DEP_PARENT` VARCHAR(32) default '' NOT NULL, `DEP_PARENT` VARCHAR(32) default '' NOT NULL,
`DEP_MANAGER` VARCHAR(32) default '' NOT NULL, `DEP_MANAGER` VARCHAR(32) default '' NOT NULL,
`DEP_LOCATION` INTEGER default 0 NOT NULL, `DEP_LOCATION` INTEGER default 0 NOT NULL,

8
workflow/engine/methods/departments/departments_Ajax.php
View File

@@ -153,13 +153,9 @@ switch ($_POST['action']) {
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->clearSelectColumns(); $oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn( ContentPeer::CON_CATEGORY );
$oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
$oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
$oCriteria->add( ContentPeer::CON_CATEGORY, 'DEPO_TITLE' ); $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
$oCriteria->addJoin( ContentPeer::CON_ID, DepartmentPeer::DEP_UID, Criteria::LEFT_JOIN ); $oCriteria->add( DepartmentPeer::DEP_TITLE, $dep_name );
$oCriteria->add( ContentPeer::CON_VALUE, $dep_name );
$oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
$oCriteria->add( DepartmentPeer::DEP_PARENT, $parent ); $oCriteria->add( DepartmentPeer::DEP_PARENT, $parent );
$oDataset = DepartmentPeer::doSelectRS( $oCriteria ); $oDataset = DepartmentPeer::doSelectRS( $oCriteria );

15
workflow/engine/src/ProcessMaker/BusinessModel/Department.php
View File

@@ -22,25 +22,16 @@ class Department
public function existsTitle($departmentTitle, $departmentUidExclude = "") public function existsTitle($departmentTitle, $departmentUidExclude = "")
{ {
try { try {
$delimiter = \DBAdapter::getStringDelimiter();
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\DepartmentPeer::DEP_UID); $criteria->addSelectColumn(\DepartmentPeer::DEP_UID);
$criteria->addSelectColumn(\DepartmentPeer::DEP_TITLE);
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array();
$arrayCondition[] = array(\DepartmentPeer::DEP_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "DEPO_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
if ($departmentUidExclude != "") { if ($departmentUidExclude != "") {
$criteria->add(\DepartmentPeer::DEP_UID, $departmentUidExclude, \Criteria::NOT_EQUAL); $criteria->add(\DepartmentPeer::DEP_UID, $departmentUidExclude, \Criteria::NOT_EQUAL);
} }
$criteria->add("CT.CON_VALUE", $departmentTitle, \Criteria::EQUAL); $criteria->add(\DepartmentPeer::DEP_TITLE, $departmentTitle, \Criteria::EQUAL);
$rsCriteria = \DepartmentPeer::doSelectRS($criteria); $rsCriteria = \DepartmentPeer::doSelectRS($criteria);
@@ -476,7 +467,7 @@ class Department
$oDept->updateDepartmentManager( $dep_uid ); $oDept->updateDepartmentManager( $dep_uid );
$oDept = new \Department(); $oDept = new \Department();
$oDept->load($dep_uid); $oDept->Load($dep_uid);
$oDept->addUserToDepartment($dep_uid, $usr_uid, ($oDept->getDepManager() == "")? true : false, false); $oDept->addUserToDepartment($dep_uid, $usr_uid, ($oDept->getDepManager() == "")? true : false, false);
$oDept->updateDepartmentManager($dep_uid); $oDept->updateDepartmentManager($dep_uid);
} }