From 984385f94105630ff08d52b041f72333eea3b43a Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Thu, 4 Aug 2016 16:38:54 -0400 Subject: [PATCH] HOR-1554 Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo --- workflow/engine/classes/class.case.php | 18 +++++++++++++----- workflow/engine/classes/model/ListPaused.php | 6 ++++-- .../engine/classes/model/ListUnassigned.php | 1 - workflow/engine/methods/cases/cases_Ajax.php | 3 ++- workflow/engine/templates/cases/casesList.js | 3 ++- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 3acc34f46..dce453733 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -739,6 +739,9 @@ class Cases $cri->addSelectColumn(AppDelegationPeer::TAS_UID); $cri->add(AppDelegationPeer::APP_UID, $sAppUid); $cri->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN"); + if(isset($fields['DEL_INDEX'])){ + $cri->add(AppDelegationPeer::DEL_INDEX, $fields['DEL_INDEX']); + } $rsCri = AppDelegationPeer::doSelectRS($cri); $rsCri->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCri->next(); @@ -908,6 +911,9 @@ class Cases if (isset($Fields['APP_DESCRIPTION'])) { $appFields['APP_DESCRIPTION'] = $Fields['APP_DESCRIPTION']; } + if(isset($Fields['DEL_INDEX'])){ + $appFields['DEL_INDEX'] = $Fields['DEL_INDEX']; + } $arrayNewCaseTitleAndDescription = $this->newRefreshCaseTitleAndDescription($sAppUid, $appFields, $aApplicationFields); @@ -2106,6 +2112,7 @@ class Cases //DONE: Al ya existir un delegation, se puede "calcular" el caseTitle. $Fields = $Application->toArray(BasePeer::TYPE_FIELDNAME); $aApplicationFields = $Fields['APP_DATA']; + $Fields['DEL_INDEX'] = $iDelIndex; $newValues = $this->newRefreshCaseTitleAndDescription($sAppUid, $Fields, $aApplicationFields); if (!isset($newValues['APP_TITLE'])) { $newValues['APP_TITLE'] = ''; @@ -3943,7 +3950,7 @@ class Cases * @return object */ - public function pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate = null) + public function pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate = null, $appTitle = null) { // Check if the case is unassigned if($this->isUnassignedPauseCase($sApplicationUID, $iDelegation)){ @@ -3992,11 +3999,12 @@ class Cases $this->getExecuteTriggerProcess($sApplicationUID, 'PAUSED'); /*----------------------------------********---------------------------------*/ - $data = array ( - 'APP_UID' => $sApplicationUID, + $data = array( + 'APP_UID' => $sApplicationUID, 'DEL_INDEX' => $iDelegation, - 'USR_UID' => $sUserUID, - 'APP_RESTART_DATE' => $sUnpauseDate + 'USR_UID' => $sUserUID, + 'APP_RESTART_DATE' => $sUnpauseDate, + 'APP_TITLE' => ($appTitle != null) ? $appTitle : $aFields['APP_TITLE'] ); $data = array_merge($aFields, $data); $oListPaused = new ListPaused(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 8ae47a8a9..f1ed85a22 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -26,12 +26,14 @@ class ListPaused extends BaseListPaused { { $criteria = new Criteria(); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); - $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); + $criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL); $dataset = ApplicationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TITLE'] = $aRow['APP_TITLE']; + if (!isset($data['APP_TITLE'])) { + $data['APP_TITLE'] = $aRow['APP_TITLE']; + } $criteria = new Criteria(); $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index 912baa31c..e698240a6 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -103,7 +103,6 @@ class ListUnassigned extends BaseListUnassigned $criteria = new Criteria(); $criteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); - $criteria->addSelectColumn( ApplicationPeer::APP_TITLE ); $criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE ); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $dataset = ApplicationPeer::doSelectRS($criteria); diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 211cbbdfc..c62ad5b9c 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -405,8 +405,9 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { $APP_UID = $_SESSION['APPLICATION']; $DEL_INDEX = $_SESSION['INDEX']; } + $appTitle = $_POST['APP_TITLE']; - $oCase->pauseCase( $APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'], $unpauseDate ); + $oCase->pauseCase($APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'], $unpauseDate, $appTitle); break; case 'unpauseCase': $sApplicationUID = (isset( $_POST['sApplicationUID'] )) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION']; diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index dbf491564..474f91b7d 100755 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -344,7 +344,8 @@ function pauseCase(date){ APP_UID: rowModel.data.APP_UID, DEL_INDEX: rowModel.data.DEL_INDEX, NOTE_REASON: noteReasonTxt, - NOTIFY_PAUSE: notifyReasonVal + NOTIFY_PAUSE: notifyReasonVal, + APP_TITLE: rowModel.data.APP_TITLE } }); }