fernando/luos
1
0
Fork 0
Code Releases Activity

Fix notice ASSIGNEE and ADHOC-ASSIGNEE.

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-02-10 11:16:13 -04:00
parent 4a0ccdb079
commit 7c9146e1e3
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
workflow/engine/src/BusinessModel/Task.php
View File

@@ -1025,7 +1025,34 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
$result = $groups->getAllGroup($start, $limit, $filter);
$totalCount = 0;
$criteria = new \Criteria( 'workflow' );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
$totalRows = \GroupwfPeer::doCount( $criteria );
$criteria = new \Criteria( 'workflow' );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
$criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
$oDataset = \GroupwfPeer::doSelectRS( $criteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$processes = Array ();
$uids = array ();
$groups = array ();
$aGroups = array ();
while ($oDataset->next()) {
$groups[] = $oDataset->getRow();
}
$result = array ('rows' => $groups,'totalCount' => $totalRows);
foreach ($result['rows'] as $results) {
if (in_array($results['GRP_UID'], $aUIDS1)) {
$c++;
@@ -1105,6 +1132,7 @@ class Task
throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity'));
}
$iType = 1;
$iRelation = '';
$oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
$oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID );
@@ -1574,7 +1602,34 @@ class Task
$aUIDS1[] = $aGroup['GRP_UID'];
}
$groups = new \Groupwf();
$result = $groups->getAllGroup($start, $limit, $filter);
$totalCount = 0;
$criteria = new \Criteria( 'workflow' );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
$totalRows = \GroupwfPeer::doCount( $criteria );
$criteria = new \Criteria( 'workflow' );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UID );
$criteria->addSelectColumn( \GroupwfPeer::GRP_STATUS );
$criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
$criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->add( \GroupwfPeer::GRP_UID, $sAssigneeUID);
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );
$oDataset = \GroupwfPeer::doSelectRS( $criteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$processes = Array ();
$uids = array ();
$groups = array ();
$aGroups = array ();
while ($oDataset->next()) {
$groups[] = $oDataset->getRow();
}
$result = array ('rows' => $groups,'totalCount' => $totalRows);
foreach ($result['rows'] as $results) {
if (in_array($results['GRP_UID'], $aUIDS1)) {
$c++;
@@ -1654,6 +1709,7 @@ class Task
throw (new \Exception( 'This id for `act_uid`: '. $sTaskUID .' do not correspond to a registered activity'));
}
$iType = 2;
$iRelation = '';
$oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn( \TaskUserPeer::TU_RELATION );
$oCriteria->add(\TaskUserPeer::USR_UID, $sAssigneeUID );

4
workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php
View File

@@ -103,7 +103,6 @@ class Assignee extends Api
//Response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
@@ -123,7 +122,6 @@ class Assignee extends Api
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
@@ -218,7 +216,6 @@ class Assignee extends Api
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
@@ -238,7 +235,6 @@ class Assignee extends Api
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
}