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

Merged in mcuiza/processmaker/PM-3705 (pull request #2884)

Browse Source 
PM-3705
This commit is contained in:
Julio Cesar Laura Avendaño
2015-10-05 14:55:17 -04:00
parent 5f2d05e596 804cd8fcad
commit a7795ce535
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,10 @@ class Department extends BaseDepartment
$selectCriteria = new Criteria( 'workflow' );
$selectCriteria->add( UsersPeer::DEP_UID, $depId );
$selectCriteria->add( UsersPeer::USR_UID, $managerId, Criteria::NOT_EQUAL );
if(empty($depParent)) {
$depParent = $depId;
}
// Create a Criteria object includes the value you want to set
$updateCriteria = new Criteria( 'workflow' );
@@ -389,7 +393,41 @@ class Department extends BaseDepartment
}
$oDataset->next();
}
$this->updateUserReportsTo($depId);
}
public function updateUserReportsTo($depId)
{
$departments = $this->getChildDepartments($depId);
$departments = explode("_",$departments);
$departments = array_filter(array_unique($departments));
foreach($departments as $depUid) {
$mgrParentId = $this->getDepartmentParentManager($depUid);
$conn = Propel::getConnection( UsersPeer::DATABASE_NAME );
$selectCriteria = new Criteria( 'workflow' );
$selectCriteria->add( UsersPeer::DEP_UID, $depUid );
$updateCriteria = new Criteria( 'workflow' );
$updateCriteria->add( UsersPeer::USR_REPORTS_TO, $mgrParentId );
BasePeer::doUpdate( $selectCriteria, $updateCriteria, $conn );
}
}
public function getChildDepartments($depId)
{
$depIds = "";
$depIds .= $depId."_";
$childrenCriteria = new Criteria( 'workflow' );
$childrenCriteria->add( DepartmentPeer::DEP_PARENT, $depId );
$oDataset = DepartmentPeer::doSelectRS( $childrenCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
$depId = $aRow['DEP_UID'];
$depIds .= $this->getChildDepartments($depId);
$oDataset->next();
}
return $depIds;
}
//add an user to a department and sync all about manager info
@@ -700,5 +738,19 @@ class Department extends BaseDepartment
}
return $departments;
}
public function getDepartmentParentManager($depId)
{
$managerUid = "";
$depInfo = $this->Load($depId);
if(empty($depInfo['DEP_MANAGER'])) {
if(!empty($depInfo['DEP_PARENT'])) {
$managerUid = $this->getDepartmentParentManager($depInfo['DEP_PARENT']);
}
} else {
$managerUid = $depInfo['DEP_MANAGER'];
}
return $managerUid;
}
}