BUG 0000 BUG 0000 User Inbox Simplified (second commit)

2012-01-26 09:33:01 -04:00
parent f5f4b527f5
commit 5599ca8b96
22 changed files with 900 additions and 229 deletions
--- a/workflow/engine/methods/cases/cases_Derivate.php
+++ b/workflow/engine/methods/cases/cases_Derivate.php
@@ -27,16 +27,16 @@
 /* Permissions */
 switch ($RBAC->userCanAccess('PM_CASES'))
 {
-	case -2:
-		G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-		G::header('location: ../login/login');
-		die;
-		break;
-	case -1:
-		G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-		G::header('location: ../login/login');
-		die;
-		break;
+  case -2:
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+    G::header('location: ../login/login');
+    die;
+    break;
+  case -1:
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die;
+    break;
 }

 /* Includes */
@@ -53,75 +53,75 @@ foreach ($_POST['form']['TASKS'] as $aValues){
 }

 try {
-	//load data
-	$oCase = new Cases ();
-	//warning: we are not using the result value of function thisIsTheCurrentUser, so I'm commenting to optimize speed.
-	//$oCase->thisIsTheCurrentUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'cases_List');
-	$appFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
-	$appFields['APP_DATA'] = array_merge($appFields['APP_DATA'], G::getSystemConstants());
-	//cleaning debug variables
-	$_SESSION['TRIGGER_DEBUG']['DATA'] = Array();
+  //load data
+  $oCase = new Cases ();
+  //warning: we are not using the result value of function thisIsTheCurrentUser, so I'm commenting to optimize speed.
+  //$oCase->thisIsTheCurrentUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'cases_List');
+  $appFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+  $appFields['APP_DATA'] = array_merge($appFields['APP_DATA'], G::getSystemConstants());
+  //cleaning debug variables
+  $_SESSION['TRIGGER_DEBUG']['DATA'] = Array();
  $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array();
  $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array();

-	$triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'BEFORE');
+  $triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'BEFORE');

-	//if there are some triggers to execute
-	if( sizeof($triggers)  > 0) {
-		//Execute triggers before derivation
-		$appFields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'BEFORE', $appFields['APP_DATA'] );
+  //if there are some triggers to execute
+  if( sizeof($triggers)  > 0) {
+    //Execute triggers before derivation
+    $appFields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'BEFORE', $appFields['APP_DATA'] );

-		//save trigger variables for debugger
-		$_SESSION['TRIGGER_DEBUG']['info'][0]['NUM_TRIGGERS'] 		= sizeof($triggers);
-		$_SESSION['TRIGGER_DEBUG']['info'][0]['TIME'] 						= 'BEFORE';
-		$_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_NAMES'] 	= $oCase->getTriggerNames($triggers);
-		$_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_VALUES']	= $triggers;
-	}
+    //save trigger variables for debugger
+    $_SESSION['TRIGGER_DEBUG']['info'][0]['NUM_TRIGGERS']     = sizeof($triggers);
+    $_SESSION['TRIGGER_DEBUG']['info'][0]['TIME']             = 'BEFORE';
+    $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_NAMES']   = $oCase->getTriggerNames($triggers);
+    $_SESSION['TRIGGER_DEBUG']['info'][0]['TRIGGERS_VALUES']  = $triggers;
+  }

-	$appFields['DEL_INDEX'] = $_SESSION['INDEX'];
-	$appFields['TAS_UID']		= $_SESSION['TASK'];
+  $appFields['DEL_INDEX'] = $_SESSION['INDEX'];
+  $appFields['TAS_UID']    = $_SESSION['TASK'];

-	$oCase->updateCase ( $_SESSION['APPLICATION'], $appFields); //Save data 
+  $oCase->updateCase ( $_SESSION['APPLICATION'], $appFields); //Save data 

-	//derivate case
-	$oDerivation = new Derivation();
-	$aCurrentDerivation = array(
-	    'APP_UID'    => $_SESSION['APPLICATION'],
-	    'DEL_INDEX'  => $_SESSION['INDEX'],
-	    'APP_STATUS' => $sStatus,
-	    'TAS_UID'    => $_SESSION['TASK'],
-	    'ROU_TYPE'   => $_POST['form']['ROU_TYPE']
-	);
+  //derivate case
+  $oDerivation = new Derivation();
+  $aCurrentDerivation = array(
+      'APP_UID'    => $_SESSION['APPLICATION'],
+      'DEL_INDEX'  => $_SESSION['INDEX'],
+      'APP_STATUS' => $sStatus,
+      'TAS_UID'    => $_SESSION['TASK'],
+      'ROU_TYPE'   => $_POST['form']['ROU_TYPE']
+  );

-	$oDerivation->derivate( $aCurrentDerivation, $_POST['form']['TASKS'] );
-	
-	$appFields = $oCase->loadCase( $_SESSION['APPLICATION'] ); //refresh appFields, because in derivations should change some values
-	$triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'AFTER'); //load the triggers after derivation
-	if( sizeof($triggers) > 0 ) {
-		$appFields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'AFTER', $appFields['APP_DATA'] ); //Execute triggers after derivation
-		
-		$_SESSION['TRIGGER_DEBUG']['info'][1]['NUM_TRIGGERS']	= sizeof($triggers);
-		$_SESSION['TRIGGER_DEBUG']['info'][1]['TIME'] 					= 'AFTER';
-		$_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES'] 	= $oCase->getTriggerNames($triggers);
-		$_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES']	= $triggers;
-	}
-	$oCase->updateCase ( $_SESSION['APPLICATION'], $appFields);
-	
-	// Send notifications - Start
-	$oUser     = new Users();
-	$aUser     = $oUser->load($_SESSION['USER_LOGGED']);
-	$sFromName = '"' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . '"';
-	try {
-	  $oCase->sendNotifications($_SESSION['TASK'], $_POST['form']['TASKS'], $appFields['APP_DATA'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $sFromName);
-	} catch(Exception $e){
-	  G::SendTemporalMessage(G::loadTranslation('ID_NOTIFICATION_ERROR').' - '. $e->getMessage(), 'warning', 'string', null, '100%');
-	}
-	// Send notifications - End
-	
-	// Events - Start
-	$oEvent = new Event();
+  $oDerivation->derivate( $aCurrentDerivation, $_POST['form']['TASKS'] );
+  
+  $appFields = $oCase->loadCase( $_SESSION['APPLICATION'] ); //refresh appFields, because in derivations should change some values
+  $triggers = $oCase->loadTriggers( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'AFTER'); //load the triggers after derivation
+  if( sizeof($triggers) > 0 ) {
+    $appFields['APP_DATA'] = $oCase->ExecuteTriggers ( $_SESSION['TASK'], 'ASSIGN_TASK', -2, 'AFTER', $appFields['APP_DATA'] ); //Execute triggers after derivation
+    
+    $_SESSION['TRIGGER_DEBUG']['info'][1]['NUM_TRIGGERS']  = sizeof($triggers);
+    $_SESSION['TRIGGER_DEBUG']['info'][1]['TIME']           = 'AFTER';
+    $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_NAMES']   = $oCase->getTriggerNames($triggers);
+    $_SESSION['TRIGGER_DEBUG']['info'][1]['TRIGGERS_VALUES']  = $triggers;
+  }
+  $oCase->updateCase ( $_SESSION['APPLICATION'], $appFields);
+  
+  // Send notifications - Start
+  $oUser     = new Users();
+  $aUser     = $oUser->load($_SESSION['USER_LOGGED']);
+  $sFromName = '"' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . '"';
+  try {
+    $oCase->sendNotifications($_SESSION['TASK'], $_POST['form']['TASKS'], $appFields['APP_DATA'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $sFromName);
+  } catch(Exception $e){
+    G::SendTemporalMessage(G::loadTranslation('ID_NOTIFICATION_ERROR').' - '. $e->getMessage(), 'warning', 'string', null, '100%');
+  }
+  // Send notifications - End
+  
+  // Events - Start
+  $oEvent = new Event();

-	$oEvent->closeAppEvents($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK']);
+  $oEvent->closeAppEvents($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['TASK']);
  $oCurrentAppDel = AppDelegationPeer::retrieveByPk($_SESSION['APPLICATION'], $_SESSION['INDEX']+1 );
  $multipleDelegation = false;
  // check if there are multiple derivations
@@ -143,20 +143,31 @@ try {
      }
    }
  }
-	//Events - End
+  //Events - End
+  $debuggerAvailable = true;

-	$aNextStep['PAGE'] = 'casesListExtJsRedirector';
-	if( isset($_SESSION['PMDEBUGGER']) && $_SESSION['PMDEBUGGER'] ){
-		$_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
-		G::header('location: ' . 'cases_Step?' .'breakpoint=triggerdebug');
-	} else {
-		G::header('location: casesListExtJsRedirector');
-	}
+  if (isset($_SESSION['user_experience']) && $_SESSION['user_experience'] == 'simplified') {
+    $aNextStep['PAGE'] = '../home/appList';
+    $debuggerAvailable = false;
+  }
+  else {
+    $aNextStep['PAGE'] = 'casesListExtJsRedirector';
+  }
+
+  if (isset($_SESSION['PMDEBUGGER']) && $_SESSION['PMDEBUGGER'] && $debuggerAvailable) {
+    $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
+    $loc = 'cases_Step?' .'breakpoint=triggerdebug';
+  } 
+  else {
+    $loc = $aNextStep['PAGE'];
+  }
+
+  G::header("location: $loc");
 }
-catch ( Exception $e ){
-	$aMessage = array();
-	$aMessage['MESSAGE'] = $e->getMessage() . '<br>'.$e->getTraceAsString();
-	$G_PUBLISH = new Publisher;
-	$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+catch ( Exception $e ) {
+  $aMessage = array();
+  $aMessage['MESSAGE'] = $e->getMessage() . '<br>'.$e->getTraceAsString();
+  $G_PUBLISH = new Publisher;
+  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
  G::RenderPage( 'publish', 'blank');
 }
--- a/workflow/engine/methods/cases/cases_SaveData.php
+++ b/workflow/engine/methods/cases/cases_SaveData.php
@@ -234,11 +234,16 @@ try {
    G::header ( 'location: ' . $_SERVER ['HTTP_REFERER'] );
    die ();
  }
+
  $_SESSION ['STEP_POSITION'] = $aNextStep ['POSITION'];
-
  $_SESSION['BREAKSTEP']['NEXT_STEP'] = $aNextStep ['PAGE'];
+  $debuggerAvailable = true;

-  if ($trigger_debug_session) {
+  if (isset($_SESSION['user_experience']) && $_SESSION['user_experience'] == 'simplified') {
+    $debuggerAvailable = false;
+  }
+
+  if ($trigger_debug_session && $debuggerAvailable) {
    $_SESSION ['TRIGGER_DEBUG'] ['BREAKPAGE'] = $aNextStep ['PAGE'];
    $aNextStep ['PAGE'] = $aNextStep ['PAGE'] . '&breakpoint=triggerdebug';
  }
--- a/workflow/engine/methods/cases/main_init.php
+++ b/workflow/engine/methods/cases/main_init.php
@@ -52,6 +52,8 @@
  
  $oHeadPublisher->assign( 'defaultOption', $defaultOption); // user menu permissions
  $oHeadPublisher->assign( '_nodeId', isset($confDefaultOption)?$confDefaultOption:'PM_USERS'); // user menu permissions
+
+  $_SESSION['user_experience'] = 'normal';
  
  G::RenderPage('publish', 'extJs');