From 7c9146e1e32acb2bfbe203b623ea065f18dbff47 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Mon, 10 Feb 2014 11:16:13 -0400 Subject: [PATCH 1/4] Fix notice ASSIGNEE and ADHOC-ASSIGNEE. --- workflow/engine/src/BusinessModel/Task.php | 60 ++++++++++++++++++- .../Project/Activity/Assignee.php | 4 -- 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index d4dc313b9..4596f5ca9 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -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 ); diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php index 930a620e6..66cd81ded 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php @@ -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; } } From 4536033c3c3c16290b670a0ef90ac08e9c68100c Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Mon, 10 Feb 2014 11:19:02 -0400 Subject: [PATCH 2/4] Fix notice ASSIGNEE and ADHOC-ASSIGNEE. --- workflow/engine/src/BusinessModel/Task.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 4596f5ca9..05058b8be 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -984,9 +984,6 @@ class Task public function getTaskAssignee($sProcessUID, $sTaskUID, $sAssigneeUID) { try { - $filter = ''; - $start = null; - $limit = null; $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); @@ -1561,9 +1558,6 @@ class Task public function getTaskAdhocAssignee($sProcessUID, $sTaskUID, $sAssigneeUID) { try { - $filter = ''; - $start = null; - $limit = null; $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID ); if (is_null($oProcess)) { throw (new \Exception( 'This id for `prj_uid`: '. $sProcessUID .' do not correspond to a registered process')); From 00c2af920bfbff8c99e9441e9d0461bb97e993d0 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Mon, 10 Feb 2014 11:30:54 -0400 Subject: [PATCH 3/4] Fix notice OUTPUTDOCUMENTS. --- .../ProcessMaker/Project/OutputDocuments.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php index 9132562d6..0a35330fd 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/OutputDocuments.php @@ -24,7 +24,7 @@ class OutputDocuments extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -40,11 +40,11 @@ class OutputDocuments extends Api { try { $outputDocument = new \BusinessModel\OutputDocument(); - $arrayData = $outputDocument->getOutputDocument($prjUid, $outputDocumentUid); + $objectData = $outputDocument->getOutputDocument($prjUid, $outputDocumentUid); //Response - $response = $arrayData; + $response = $objectData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -67,7 +67,7 @@ class OutputDocuments extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -88,7 +88,7 @@ class OutputDocuments extends Api $outputDocument = new \BusinessModel\OutputDocument(); $arrayData = $outputDocument->updateOutputDocument($prjUid, $request_data, $outputDocumentUid); } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -103,12 +103,11 @@ class OutputDocuments extends Api { try { $outputDocument = new \BusinessModel\OutputDocument(); - $arrayData = $outputDocument->deleteOutputDocument($prjUid, $outputDocumentUid); + $outputDocument->deleteOutputDocument($prjUid, $outputDocumentUid); } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } - return $response; } } From 640ebc526d1aa1dc12af7f273da2aa3aa1d44948 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Mon, 10 Feb 2014 11:38:16 -0400 Subject: [PATCH 4/4] Fix notice ASSIGNEE and ADHOC-ASSIGNEE. --- workflow/engine/src/BusinessModel/Task.php | 2 ++ .../Project/Activity/Assignee.php | 36 +++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 05058b8be..23e00aebe 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -1201,6 +1201,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); @@ -1775,6 +1776,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); diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php index 66cd81ded..df8eabe51 100644 --- a/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php +++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/Activity/Assignee.php @@ -30,7 +30,7 @@ class Assignee extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -55,7 +55,7 @@ class Assignee extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -74,11 +74,11 @@ class Assignee extends Api $response = array(); try { $task = new \BusinessModel\Task(); - $arrayData = $task->getTaskAssignee($prjUid, $actUid, $aasUid); + $objectData = $task->getTaskAssignee($prjUid, $actUid, $aasUid); //Response - $response = $arrayData; + $response = $objectData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -98,7 +98,7 @@ class Assignee extends Api { try { $task = new \BusinessModel\Task(); - $arrayData = $task->addTaskAssignee($prjUid, $actUid, $aas_uid, $aas_type); + $task->addTaskAssignee($prjUid, $actUid, $aas_uid, $aas_type); } catch (\Exception $e) { //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); @@ -117,9 +117,9 @@ class Assignee extends Api { try { $task = new \BusinessModel\Task(); - $arrayData = $task->removeTaskAssignee($prjUid, $actUid, $aasUid); + $task->removeTaskAssignee($prjUid, $actUid, $aasUid); } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -143,7 +143,7 @@ class Assignee extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -168,7 +168,7 @@ class Assignee extends Api //Response $response = $arrayData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -187,11 +187,11 @@ class Assignee extends Api $response = array(); try { $task = new \BusinessModel\Task(); - $arrayData = $task->getTaskAdhocAssignee($prjUid, $actUid, $aasUid); + $objectData = $task->getTaskAdhocAssignee($prjUid, $actUid, $aasUid); //Response - $response = $arrayData; + $response = $objectData; } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; @@ -211,9 +211,9 @@ class Assignee extends Api { try { $task = new \BusinessModel\Task(); - $arrayData = $task->addTaskAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type); + $task->addTaskAdhocAssignee($prjUid, $actUid, $ada_uid, $ada_type); } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } } @@ -230,11 +230,11 @@ class Assignee extends Api { try { $task = new \BusinessModel\Task(); - $arrayData = $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid); + $task->removeTaskAdhocAssignee($prjUid, $actUid, $adaUid); } catch (\Exception $e) { - //response + //Response throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } - } + } }