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

I solved the issue PM-1649 ./processmaker migrate-new-cases-lists

Browse Source
This commit is contained in:
Paula V. Quispe
2015-03-04 18:42:47 -04:00
parent f4a65aa184
commit 1f497cc6f6
10 changed files with 500 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
workflow/engine/classes/model/AppCacheView.php
View File

@@ -1752,5 +1752,45 @@ class AppCacheView extends BaseAppCacheView
}
}
}
/**
* Get all columns by APP_CACHE_VIEW
*
* @return object criteria
*/
public function getSelAllColumns(){
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_LAST_INDEX);
$criteria->addSelectColumn(AppCacheViewPeer::APP_NUMBER);
$criteria->addSelectColumn(AppCacheViewPeer::APP_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::USR_UID);
$criteria->addSelectColumn(AppCacheViewPeer::PREVIOUS_USR_UID);
$criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
$criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELEGATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_TASK_DUE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISH_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_THREAD_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::APP_THREAD_STATUS);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_PRO_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_CURRENT_USER);
$criteria->addSelectColumn(AppCacheViewPeer::APP_DEL_PREVIOUS_USER);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_PRIORITY);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_QUEUE_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELAY_DURATION);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_STARTED);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_FINISHED);
$criteria->addSelectColumn(AppCacheViewPeer::DEL_DELAYED);
$criteria->addSelectColumn(AppCacheViewPeer::APP_CREATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_FINISH_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_UPDATE_DATE);
$criteria->addSelectColumn(AppCacheViewPeer::APP_OVERDUE_PERCENTAGE);
return $criteria;
}
}

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

@@ -149,6 +149,34 @@ class GroupUser extends BaseGroupUser
}
}
return $rows;
}
/**
* Get all users assigned to Group
*
* @param string $gprUid
* @return array $rows
*/
public function getAllGroupUser ($gprUid)
{
$oCriteria = new Criteria( 'workflow' );
$oCriteria->add( GroupUserPeer::GRP_UID, $gprUid );
$oDataset = GroupUserPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rows = Array ();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$g = new Groupwf();
try {
$grpRow = $g->load( $row['GRP_UID'] );
$row = array_merge( $row, $grpRow );
$rows[] = $row;
} catch (Exception $e) {
continue;
}
}
return $rows;
}
}

1
workflow/engine/classes/model/ListCompleted.php
View File

@@ -73,6 +73,7 @@ class ListCompleted extends BaseListCompleted
$data['DEL_CURRENT_USR_USERNAME'] = $aRow['USR_USERNAME'];
$data['DEL_CURRENT_USR_FIRSTNAME'] = $aRow['USR_FIRSTNAME'];
$data['DEL_CURRENT_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
$data['DEL_PREVIOUS'] = isset($data['DEL_PREVIOUS']) ? $data['DEL_PREVIOUS'] : "";
if ($data['DEL_PREVIOUS'] != 0) {
$criteria = new Criteria();

2
workflow/engine/classes/model/ListInbox.php
View File

@@ -39,6 +39,8 @@ class ListInbox extends BaseListInbox
// create participated history
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->remove($data['APP_UID'],$data['DEL_INDEX']);
$listParticipatedHistory = new ListParticipatedHistory();
$listParticipatedHistory->create($data);
// create participated history

2
workflow/engine/classes/model/ListPaused.php
View File

@@ -47,6 +47,7 @@ class ListPaused extends BaseListPaused {
$data['APP_PRO_TITLE'] = $aRow['CON_VALUE'];
$criteria = new Criteria();
$criteria->addSelectColumn(AppDelegationPeer::USR_UID);
$criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$criteria->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -58,6 +59,7 @@ class ListPaused extends BaseListPaused {
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
$data['USR_UID'] = isset($data['USR_UID']) ? $data['USR_UID'] : $aRow['USR_UID'];
$data['TAS_UID'] = $aRow['TAS_UID'];
$data['DEL_INIT_DATE'] = $aRow['DEL_INIT_DATE'];
$data['DEL_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE'];

75
workflow/engine/classes/model/ListUnassigned.php
View File

@@ -17,7 +17,7 @@ require_once 'classes/model/om/BaseListUnassigned.php';
class ListUnassigned extends BaseListUnassigned
{
/**
* Create List Inbox Table
* Create List Unassigned Table
*
* @param type $data
* @return type
@@ -44,7 +44,7 @@ class ListUnassigned extends BaseListUnassigned
}
/**
* Update List Inbox Table
* Update List Unassigned Table
*
* @param type $data
* @return type
@@ -72,19 +72,18 @@ class ListUnassigned extends BaseListUnassigned
}
/**
* Remove List Inbox
* Remove List Unassigned
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function remove ($app_uid, $del_index)
public function remove ($app_uid)
{
$con = Propel::getConnection( ListUnassignedPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
$this->setDelIndex($del_index);
$con->begin();
$this->delete();
@@ -96,6 +95,7 @@ class ListUnassigned extends BaseListUnassigned
}
public function newRow ($data, $delPreviusUsrUid) {
$data['UNA_UID'] = (isset($data['UNA_UID'])) ? $data['UNA_UID']: G::GenerateUniqueId() ;
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -163,6 +163,7 @@ class ListUnassigned extends BaseListUnassigned
}
self::create($data);
return $data['UNA_UID'];
}
public function loadFilters (&$criteria, $filters)
@@ -315,5 +316,69 @@ class ListUnassigned extends BaseListUnassigned
}
return $resp;
}
/**
* Generate Data
*
* @return object criteria
*/
public function generateData($appUid,$delPreviusUsrUid){
try {
G::LoadClass("case");
//Generate data
$case = new Cases();
$criteria = new Criteria("workflow");
$criteria->addSelectColumn(AppDelegationPeer::APP_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
$criteria->addSelectColumn(ApplicationPeer::APP_DATA);
$criteria->addSelectColumn(AppDelegationPeer::PRO_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
$criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->addSelectColumn(TaskPeer::TAS_GROUP_VARIABLE);
$criteria->addJoin(AppDelegationPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
$criteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$criteria->add(TaskPeer::TAS_ASSIGN_TYPE, "SELF_SERVICE", Criteria::EQUAL);
//$criteria->add(TaskPeer::TAS_GROUP_VARIABLE, "", Criteria::NOT_EQUAL);
$criteria->add(AppDelegationPeer::USR_UID, "", Criteria::EQUAL);
$criteria->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN", Criteria::EQUAL);
$criteria->add(AppDelegationPeer::APP_UID, $appUid, Criteria::EQUAL);
$rsCriteria = AppDelegationPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$applicationData = $case->unserializeData($row["APP_DATA"]);
$taskGroupVariable = trim($row["TAS_GROUP_VARIABLE"], " @#");
$delPreviusUsrUid = '';
$unaUid = $this->newRow($row,$delPreviusUsrUid);
//Selfservice by group
if ($taskGroupVariable != "" && isset($applicationData[$taskGroupVariable]) && trim($applicationData[$taskGroupVariable]) != "") {
$gprUid = trim($applicationData[$taskGroupVariable]);
//Define Users by Group
$gpr = new GroupUser();
$arrayUsers = $gpr->getAllGroupUser($gprUid);
foreach($arrayUsers as $urow){
$newRow["USR_UID"] = $urow["USR_UID"];
$listUnassignedGpr = new ListUnassignedGroup();
$listUnassignedGpr->newRow($unaUid,$urow["USR_UID"],"GROUP",$gprUid);
}
} else {
//Define all users assigned to Task
$task = new TaskUser();
$arrayUsers = $task->getAllUsersTask($row["TAS_UID"]);
foreach($arrayUsers as $urow){
$newRow["USR_UID"] = $urow["USR_UID"];
$listUnassignedGpr = new ListUnassignedGroup();
$listUnassignedGpr->newRow($unaUid,$urow["USR_UID"],"USER","");
}
}
}
} catch (Exception $e) {
throw $e;
}
}
}

90
workflow/engine/classes/model/ListUnassignedGroup.php
View File

@@ -15,5 +15,95 @@ require_once 'classes/model/om/BaseListUnassignedGroup.php';
* @package classes.model
*/
class ListUnassignedGroup extends BaseListUnassignedGroup {
/**
* Create List Unassigned Group Table
*
* @param type $data
* @return type
*
*/
public function create($data)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) {
$result = $this->save();
} else {
$e = new Exception( "Failed Validation in class " . get_class( $this ) . "." );
$e->aValidationFailures = $this->getValidationFailures();
throw ($e);
}
$con->commit();
return $result;
} catch(Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* Update List Unassigned Group Table
*
* @param type $data
* @return type
* @throws type
*/
public function update($data)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$con->begin();
$this->setNew( false );
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
if ($this->validate()) {
$result = $this->save();
$con->commit();
return $result;
} else {
$con->rollback();
throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
}
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* Remove List Unassigned Group
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function remove ($app_uid,$una_uid)
{
$con = Propel::getConnection( ListUnassignedGroupPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
$this->setUnaUid($una_uid);
$con->begin();
$this->delete();
$con->commit();
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
}
/**
* newRow List Unassigned Group
*
* @param type $seqName
* @return type
* @throws type
*
*/
public function newRow($unaUid, $usrUid, $type, $typeUid=''){
$data['UNA_UID'] = $unaUid;
$data['USR_UID'] = $usrUid;
$data['TYPE'] = $type;
$data['TYP_UID'] = $typeUid;
self::create($data);
}
} // ListUnassignedGroup

41
workflow/engine/classes/model/TaskUser.php
View File

@@ -194,5 +194,46 @@ class TaskUser extends BaseTaskUser
return $result;
}
/**
* Get All users assigned to task
*
* @param string $TAS_UID
* @return array users info
*
*/
public function getAllUsersTask ($TAS_UID)
{
require_once 'classes/model/Users.php';
$groupsTask = array ();
$usersTask = array ();
//getting task's users
$criteria = new Criteria( 'workflow' );
$criteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
$criteria->addSelectColumn( UsersPeer::USR_LASTNAME );
$criteria->addSelectColumn( UsersPeer::USR_USERNAME );
$criteria->addSelectColumn( TaskUserPeer::TAS_UID );
$criteria->addSelectColumn( TaskUserPeer::USR_UID );
$criteria->addSelectColumn( TaskUserPeer::TU_TYPE );
$criteria->addSelectColumn( TaskUserPeer::TU_RELATION );
$criteria->addJoin( TaskUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
$criteria->add( TaskUserPeer::TAS_UID, $TAS_UID );
$dataset = TaskUserPeer::doSelectRS( $criteria );
$dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
while ($dataset->next()) {
$row = $dataset->getRow();
if($row["TU_RELATION"] == 2){
$gpr = new GroupUser();
$array = $gpr->getAllGroupUser($row["USR_UID"]);
foreach($array as $urow){
$usersTask[] = $urow;
}
}else{
$usersTask[] = $row;
}
}
return $usersTask;
}
}