diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 3e9f932f2..6e6b035a6 100755 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -58,6 +58,8 @@ class Home extends Controller $this->setVar('usr', $data['u']); $this->setVar('pwd', $data['p']); $this->setVar('skin', $skin); + echo "

Este es el template

"; + echo $template; $this->setView("home/$template"); @@ -193,6 +195,7 @@ class Home extends Controller switch ($httpData->t) { case 'todo' : $title = 'My Inbox'; break; case 'draft' : $title = 'My Drafts'; break; + case 'unassigned' : $title = 'Unassigned Inbox'; break; default: $title = ucwords($httpData->t); } @@ -209,7 +212,7 @@ class Home extends Controller $this->setVar('appListStart', $this->appListLimit); $this->setVar('appListLimit', 10); $this->setVar('listType', $httpData->t); - +//print_r($this->render()); $this->render(); } diff --git a/workflow/engine/menus/simplified.php b/workflow/engine/menus/simplified.php index 6b7e47297..3b2b64a91 100644 --- a/workflow/engine/menus/simplified.php +++ b/workflow/engine/menus/simplified.php @@ -2,9 +2,15 @@ global $G_TMP_MENU; global $RBAC; -$G_TMP_MENU->AddIdRawOption("S_HOME", "home/appList?t=todo", G::LoadTranslation("ID_HOME"), "/images/simplified/in-set-grey.png", null, null, null); +$G_TMP_MENU->AddIdRawOption("S_HOME", "home/appList?t=todo", G::LoadTranslation("ID_HOME"), + "/images/simplified/in-set-grey.png", null, null, null); if ($RBAC->userCanAccess("PM_CASES") == 1) { - $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=draft", G::LoadTranslation("ID_DRAFT"), "/images/simplified/folder-grey.png", null, null, null); - $G_TMP_MENU->AddIdRawOption("S_NEW_CASE", "#", G::LoadTranslation("ID_NEW_CASE"), "/images/simplified/plus-set-grey.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=draft", G::LoadTranslation("ID_DRAFT"), + "/images/simplified/folder-grey.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_DRAFT", "home/appList?t=unassigned", G::LoadTranslation("ID_UNASSIGNED"), + "/images/simplified/folder-grey3.png", null, null, null); + $G_TMP_MENU->AddIdRawOption("S_NEW_CASE", "#", G::LoadTranslation("ID_NEW_CASE"), + "/images/simplified/plus-set-grey.png", null, null, null); } + diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php index 2553c59f7..142ab5e73 100755 --- a/workflow/engine/methods/cases/cases_CatchExecute.php +++ b/workflow/engine/methods/cases/cases_CatchExecute.php @@ -27,47 +27,57 @@ /* 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; } - if ( isset ( $_POST['form']['BTN_CANCEL'] ) ) { +if (isset($_POST['form']['BTN_CANCEL'])) { header ( "Location: ../cases/main"); die; - } +} - /* Includes */ - G::LoadClass('case'); +/* Includes */ +G::LoadClass('case'); - $oCase = new Cases(); - $sAppUid = $_SESSION['APPLICATION']; - $iDelIndex = $_SESSION['INDEX']; +$oCase = new Cases(); +$sAppUid = $_SESSION['APPLICATION']; +$iDelIndex = $_SESSION['INDEX']; - $oAppDelegation = new AppDelegation(); - $aDelegation = $oAppDelegation->load($sAppUid, $iDelIndex); - - //if there are no user in the delegation row, this case is still in selfservice - if ( $aDelegation['USR_UID'] == "" ) { +$oAppDelegation = new AppDelegation(); +$aDelegation = $oAppDelegation->load($sAppUid, $iDelIndex); + +//if there are no user in the delegation row, this case is still in selfservice +if ( $aDelegation['USR_UID'] == "" ) { $oCase->setCatchUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'] ); - } - else { +} else { G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error'); - } +} - die(''); + } else { + window.location = "../cases/cases_Open?APP_UID=' . $_SESSION['APPLICATION'] . '&DEL_INDEX=' . + $_SESSION['INDEX'] . '&action=unassigned"; + } + ' +); + diff --git a/workflow/public_html/images/simplified/folder-grey3.png b/workflow/public_html/images/simplified/folder-grey3.png new file mode 100644 index 000000000..185f70c42 Binary files /dev/null and b/workflow/public_html/images/simplified/folder-grey3.png differ