HOR-1713

.

workflow/engine/methods/cases/cases_OpenToRevise.php

@@ -59,6 +59,7 @@ if (isset( $_SESSION['STEP_POSITION'] )) {
 $oCase = new Cases();
 $sAppUid = $_GET['APP_UID'];
 $iDelIndex = $_GET['DEL_INDEX'];
+$tasUid = (isset($_GET['TAS_UID'])) ? $_GET['TAS_UID'] : '';
 
 $_SESSION['APPLICATION'] = $_GET['APP_UID'];
 $_SESSION['INDEX'] = $_GET['DEL_INDEX'];
@@ -66,10 +67,13 @@ $_SESSION['INDEX'] = $_GET['DEL_INDEX'];
 $aFields = $oCase->loadCase( $sAppUid, $iDelIndex );
 
 $_SESSION['PROCESS'] = $aFields['PRO_UID'];
+
 $_SESSION['TASK'] = $aFields['TAS_UID'];
 $_SESSION['STEP_POSITION'] = 0;
 $_SESSION['CURRENT_TASK'] = $aFields['TAS_UID'];
 
+$currentTask = (empty($tasUid)) ? $aFields["APP_DATA"]["TASK"]: $tasUid;
+
 /* Redirect to next step */
 
 $cases = new Cases();
@@ -83,6 +87,7 @@ while ($resultDynaForm->next()) {
     $row = $resultDynaForm->getRow();
 
     $arrayDynaFormUid[$row["STEP_UID_OBJ"]] = $row["STEP_UID_OBJ"];
+    $arrayDynaFormUid['DYN_UID'] = $row["STEP_UID_OBJ"];
 }
 
 $resultInput = $cases->getAllInputsStepsToRevise($aFields["APP_UID"]);
@@ -91,6 +96,7 @@ while ($resultInput->next()) {
     $row = $resultInput->getRow();
 
     $arrayInputUid[$row["STEP_UID_OBJ"]] = $row["STEP_UID_OBJ"];
+    $arrayInputUid['INP_DOC_UID'] = $row["STEP_UID_OBJ"];
 }
 
 $criteria = new Criteria();
@@ -99,7 +105,7 @@ $criteria->addSelectColumn(StepPeer::STEP_TYPE_OBJ);
 $criteria->addSelectColumn(StepPeer::STEP_UID_OBJ);
 
 $criteria->add(StepPeer::PRO_UID, $aFields["PRO_UID"], Criteria::EQUAL);
-$criteria->add(StepPeer::TAS_UID, $aFields["APP_DATA"]["TASK"], Criteria::EQUAL);
+$criteria->add(StepPeer::TAS_UID, $currentTask, Criteria::EQUAL);
 $criteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION);
 
 $rsCriteria = StepPeer::doSelectRS($criteria);
@@ -107,7 +113,7 @@ $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
 $url = "";
 $flag = false;
-
+//Review the object in the current task
 while ($rsCriteria->next()) {
     $row = $rsCriteria->getRow();
 
@@ -134,6 +140,17 @@ while ($rsCriteria->next()) {
     }
 }
 
+//Review the list in Assigned objects
+if(!$flag && isset($arrayDynaFormUid['DYN_UID'])){
+    $url = 'cases_StepToRevise?type=DYNAFORM&ex=0&PRO_UID='.$aFields["PRO_UID"].'&DYN_UID='.$arrayDynaFormUid['DYN_UID'].'&APP_UID='.$sAppUid.'&position=1&DEL_INDEX='.$iDelIndex;
+    $flag = true;
+}
+if(!$flag && isset($arrayInputUid['INP_DOC_UID'])){
+    $url = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&ex=0&PRO_UID='.$aFields["PRO_UID"].'&INP_DOC_UID='.$arrayInputUid['INP_DOC_UID'].'&APP_UID='.$sAppUid.'&position=1&DEL_INDEX='.$iDelIndex;
+    $flag = true;
+}
+
+
 $processUser = new ProcessUser();
 $userAccess = $processUser->validateUserAccess($aFields['PRO_UID'], $_SESSION['USER_LOGGED']);
 if(!$userAccess) {

workflow/engine/methods/cases/open.php

@@ -53,6 +53,7 @@ if (! isset( $_GET['APP_UID'] ) || ! isset( $_GET['DEL_INDEX'] )) {
     $appUid = htmlspecialchars($_GET['APP_UID']);
     $delIndex = htmlspecialchars($_GET['DEL_INDEX']);
 }
+$tasUid = (isset($_GET['TAS_UID'])) ? $tasUid = htmlspecialchars($_GET['TAS_UID']) : '';
 
 require_once ("classes/model/Step.php");
 G::LoadClass( "configuration" );
@@ -101,7 +102,7 @@ if(isset($_GET['actionFromList']) && ($_GET['actionFromList'] === 'to_revise') )
     if($oApp->getAppStatus() === 'COMPLETED') {
         $script = 'cases_Open?';
     } else {
-        $script = 'cases_OpenToRevise?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;
+        $script = 'cases_OpenToRevise?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex . '&TAS_UID=' . $tasUid;
         $oHeadPublisher->assign( 'treeToReviseTitle', G::loadtranslation( 'ID_STEP_LIST' ) );
         $casesPanelUrl = 'casesToReviseTreeContent?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;
         $oHeadPublisher->assign( 'casesPanelUrl', $casesPanelUrl ); //translations

workflow/engine/templates/cases/casesList.js

@@ -85,6 +85,7 @@ function openCase(){
     if(rowModel){
         var appUid   = rowModel.data.APP_UID;
         var delIndex = rowModel.data.DEL_INDEX;
+        var tasUid   = (typeof(rowModel.json.TAS_UID) != 'undefined') ? rowModel.json.TAS_UID : '';
         var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
         if(!isIE) {
             Ext.Msg.show({
@@ -99,6 +100,7 @@ function openCase(){
             case 'to_revise':
                 params += 'APP_UID=' + appUid;
                 params += '&DEL_INDEX=' + delIndex;
+                params += '&TAS_UID=' + tasUid;
                 params += '&to_revise=true';
                 params += '&actionFromList='+action;
                 requestFile = 'open';