HOR-2813

workflow/engine/methods/cases/cases_Open.php

@@ -52,19 +52,19 @@ Cases::clearCaseSessionData();
 
 try {
     //Loading data for a Jump request
-    if (! isset( $_GET['APP_UID'] ) && isset( $_GET['APP_NUMBER'] )) {
+    if (!isset($_GET['APP_UID']) && isset($_GET['APP_NUMBER'])) {
         $_GET['APP_UID'] = $oCase->getApplicationUIDByNumber( $_GET['APP_NUMBER'] );
         $_GET['DEL_INDEX'] = $oCase->getCurrentDelegation( $_GET['APP_UID'], $_SESSION['USER_LOGGED'] );
 
         //if the application doesn't exist
-        if (is_null( $_GET['APP_UID'] )) {
+        if (is_null($_GET['APP_UID'])) {
             G::SendMessageText( G::LoadTranslation( 'ID_CASE_DOES_NOT_EXISTS' ), 'info' );
             G::header( 'location: casesListExtJs' );
             exit();
         }
 
         //if the application exists but the
-        if (is_null( $_GET['DEL_INDEX'] )) {
+        if (is_null($_GET['DEL_INDEX'])) {
             G::SendMessageText( G::LoadTranslation( 'ID_CASE_IS_CURRENTLY_WITH_ANOTHER_USER' ), 'info' );
             G::header( 'location: casesListExtJs' );
             exit();
@@ -75,21 +75,21 @@ try {
 
     $sAppUid = $_GET['APP_UID'];
     $iDelIndex = $_GET['DEL_INDEX'];
-    $_action = isset( $_GET['action'] ) ? $_GET['action'] : '';
+    $_action = isset($_GET['action']) ? $_GET['action'] : '';
 
     //loading application data
     $aFields = $oCase->loadCase( $sAppUid, $iDelIndex );
-    //  g::pr($aFields);
+
-    //  die;
     if (!isset($_SESSION['CURRENT_TASK'])) {
         $_SESSION['CURRENT_TASK'] = $aFields['TAS_UID'];
-    } else if ($_SESSION['CURRENT_TASK'] == '') {
+    } elseif ($_SESSION['CURRENT_TASK'] == '') {
         $_SESSION['CURRENT_TASK'] = $aFields['TAS_UID'];
     }
+
     switch ($aFields['APP_STATUS']) {
         case 'DRAFT':
         case 'TO_DO':
-            //check if the case is in pause, check a valid record in table APP_DELAY
+            //Check if the case is in pause, check a valid record in table APP_DELAY
             if (AppDelay::isPaused( $sAppUid, $iDelIndex )) {
                 //the case is paused show only the resume
                 $_SESSION['APPLICATION'] = $sAppUid;
@@ -139,8 +139,7 @@ try {
             $aDelegation = $oAppDelegation->load( $sAppUid, $iDelIndex );
 
             //if there are no user in the delegation row, this case is in selfservice
-            if ($aDelegation['USR_UID'] == "" /*&& $aDelegation['DEL_THREAD_STATUS'] == 'SELFSERVICE'*/ ) {
+            if ($aDelegation['USR_UID'] == "") {
-
                 $_SESSION['APPLICATION'] = $sAppUid;
                 $_SESSION['INDEX'] = $iDelIndex;
                 $_SESSION['PROCESS'] = $aFields['PRO_UID'];
@@ -158,7 +157,7 @@ try {
                 exit();
             }
 
-            //if the current users is in the AppDelegation row, then open the case
+            //If the current users is in the AppDelegation row, then open the case
             if (($aDelegation['USR_UID'] == $_SESSION['USER_LOGGED']) && $_action != 'sent') {
                 $_SESSION['APPLICATION'] = $sAppUid;
                 $_SESSION['INDEX'] = $iDelIndex;
@@ -184,10 +183,19 @@ try {
                 G::header( 'location: ' . $sPage );
 
             } else {
-                //when the case have another user or current user doesn't have rights to this self-service,
+                $_SESSION['APPLICATION'] = $sAppUid;
-                //just view the case Resume
+                $_SESSION['PROCESS'] = $aFields['PRO_UID'];
+                $_SESSION['TASK'] = - 1;
+                $_SESSION['bNoShowSteps'] = 1;
+                $_SESSION['STEP_POSITION'] = 0;
 
-                // Get DEL_INDEX
+                //When the case have another user or current user doesn't have rights to this self-service,
+                //Just view the case Resume
+                if ($_action === 'search' || $_action === 'to_reassign') {
+                    //We need to use the index sent with the corresponding record
+                    $_SESSION['INDEX'] = $iDelIndex;
+                } else {
+                    //Get DEL_INDEX
                     $criteria = new Criteria('workflow');
                     $criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
                     $criteria->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -196,17 +204,9 @@ try {
                     $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                     $rs->next();
                     $row = $rs->getRow();
-
-                $_SESSION['APPLICATION'] = $sAppUid;
-                if($_action=='search'){
-                    $_SESSION['INDEX'] = $iDelIndex;
-                } else {
                     $_SESSION['INDEX'] = $row['DEL_INDEX'];
                 }
-                $_SESSION['PROCESS'] = $aFields['PRO_UID'];
+
-                $_SESSION['TASK'] = - 1;
-                $_SESSION['bNoShowSteps'] = 1;
-                //$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] );
                 if ($_action == 'jump') {
                     $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], 1);
                     $_SESSION['ACTION'] = 'jump';
@@ -214,13 +214,13 @@ try {
                     $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX']);
                     unset($_SESSION['ACTION']);
                 }
+
                 $_SESSION['CURRENT_TASK'] = $Fields['TAS_UID'];
-                $_SESSION['STEP_POSITION'] = 0;
                 require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php');
 
             }
             break;
-        default: //APP_STATUS <> DRAFT and TO_DO
+        default: //APP_STATUS IS COMPLETED OR CANCELLED
             $_SESSION['APPLICATION'] = $sAppUid;
             $_SESSION['INDEX'] = $oCase->getCurrentDelegationCase( $_GET['APP_UID'] );
             $_SESSION['PROCESS'] = $aFields['PRO_UID'];