From d7844fdee66da0ddad47ffeb515d96329d75a0de Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Tue, 20 Mar 2012 18:46:20 -0400 Subject: [PATCH] BUG 8711 Problemas con la opcion "Print Form" SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Envia un notice de error en la opcion Review - Ajuste en Review en la impresion previa, se adicionó la variable del dynaform en curso. --- .../engine/methods/cases/cases_PrintView.php | 80 +++++----- .../methods/cases/cases_StepToRevise.php | 139 +++++++++--------- 2 files changed, 111 insertions(+), 108 deletions(-) diff --git a/workflow/engine/methods/cases/cases_PrintView.php b/workflow/engine/methods/cases/cases_PrintView.php index d0bf7d40e..cd3a6d38a 100755 --- a/workflow/engine/methods/cases/cases_PrintView.php +++ b/workflow/engine/methods/cases/cases_PrintView.php @@ -24,26 +24,27 @@ */ try { - require_once 'classes/model/Dynaform.php'; - require_once 'classes/model/Process.php'; - // g::pr($_SESSION); die; - + require_once 'classes/model/Dynaform.php'; + require_once 'classes/model/Process.php'; - $oDynaform = new Dynaform(); - $aDyn = $oDynaform->load($_SESSION['CURRENT_DYN_UID']); - G::LoadClass('case'); - $oCase = new Cases(); - if( isset($_SESSION['APPLICATION']) ){ - $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); - $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants()); - } else { - $Fields['APP_DATA'] = Array(); - } - $G_MAIN_MENU = 'processmaker'; - $G_ID_MENU_SELECTED = 'USERS'; - $G_PUBLISH = new Publisher; + $oDynaform = new Dynaform(); + $aDyn = $oDynaform->load($_SESSION['CURRENT_DYN_UID']); + G::LoadClass('case'); + $oCase = new Cases(); + + if ( isset($_SESSION['APPLICATION']) ) { + $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); + $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants()); + } + else { + $Fields['APP_DATA'] = Array(); + } + + $G_MAIN_MENU = 'processmaker'; + $G_ID_MENU_SELECTED = 'USERS'; + $G_PUBLISH = new Publisher; $idProcess = (isset($Fields['APP_DATA']['PROCESS']))?$Fields['APP_DATA']['PROCESS']:$_SESSION['PROCESS']; $oProcess = new Process(); @@ -51,34 +52,35 @@ try { $sProcess = $oProcess->getProTitle(); //Add content content step - Start - if(isset($_SESSION['APPLICATION'])){ - $array['CASE'] = G::LoadTranslation('ID_CASE'); - $array['USER'] = G::LoadTranslation('ID_USER'); - $array['WORKSPACE'] = G::LoadTranslation('ID_WORKSPACE'); - $array['APP_NUMBER'] = $Fields['APP_NUMBER']; - $array['APP_TITLE'] = $Fields['TITLE']; - $array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME']; - $array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS']; - $array['DATEPRINT'] = date('Y-m-d H:m:s'); + if (isset($_SESSION['APPLICATION'])) { + $array['CASE'] = G::LoadTranslation('ID_CASE'); + $array['USER'] = G::LoadTranslation('ID_USER'); + $array['WORKSPACE'] = G::LoadTranslation('ID_WORKSPACE'); + $array['APP_NUMBER'] = $Fields['APP_NUMBER']; + $array['APP_TITLE'] = $Fields['TITLE']; + $array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME']; + $array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS']; + $array['DATEPRINT'] = date('Y-m-d H:m:s'); } $array['APP_PROCESS'] = $sProcess; - if(isset($Fields['TITLE'])&& strlen($Fields['TITLE'])>0) + if (isset($Fields['TITLE']) && strlen($Fields['TITLE']) > 0) { $array['TITLE'] = G::LoadTranslation('ID_TITLE'); - else - $array['TITLE'] = ''; - $array['PROCESS'] = G::LoadTranslation('ID_PROCESS'); - $array['DATELABEL'] = G::LoadTranslation('DATE_LABEL'); - - $aDyn['DYN_UID']=(isset($_SESSION['DYN_UID_PRINT']) && $_SESSION['DYN_UID_PRINT']!='')?$_SESSION['DYN_UID_PRINT']:$aDyn['DYN_UID']; + } + else { + $array['TITLE'] = ''; + } + $array['PROCESS'] = G::LoadTranslation('ID_PROCESS'); + $array['DATELABEL'] = G::LoadTranslation('DATE_LABEL'); + + $aDyn['DYN_UID'] = (isset($_SESSION['DYN_UID_PRINT']) && $_SESSION['DYN_UID_PRINT']!='')?$_SESSION['DYN_UID_PRINT']:$aDyn['DYN_UID']; $G_PUBLISH->AddContent('smarty', 'cases/cases_PrintViewTitle', '', '', $array); - - $G_PUBLISH->AddContent('dynaform', 'xmlform', $aDyn['PRO_UID']. '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); - G::RenderPage('publish', 'blank'); - - + + $G_PUBLISH->AddContent('dynaform', 'xmlform', $aDyn['PRO_UID']. '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); + G::RenderPage('publish', 'blank'); + } catch (Exception $oException) { - die($oException->getMessage()); + die($oException->getMessage()); } ?> diff --git a/workflow/engine/methods/cases/cases_StepToRevise.php b/workflow/engine/methods/cases/cases_StepToRevise.php index b31247caa..56de19fd7 100755 --- a/workflow/engine/methods/cases/cases_StepToRevise.php +++ b/workflow/engine/methods/cases/cases_StepToRevise.php @@ -23,7 +23,7 @@ * */ // die("first"); - /* Permissions */ + /* Permissions */ switch ($RBAC->userCanAccess('PM_SUPERVISOR')) { case - 2: G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); @@ -85,50 +85,51 @@ $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); if(!isset($_GET['type'])) $_GET['type'] = 'DYNAFORM'; - if(!isset($_GET['position'])) $_GET['position'] = 1; + if(!isset($_GET['position'])) $_GET['position'] = 1; - $_SESSION['STEP_POSITION'] = (int)$_GET['position']; - - //Obtain previous and next step - Start + $_SESSION['STEP_POSITION'] = (int)$_GET['position']; + + //Obtain previous and next step - Start if(isset($_GET['type'])) $sType = $_GET['type']; else $sType = ''; - try { - $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); - $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); - } - catch (exception $e) { + try { + $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); + $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); + } + catch (exception $e) { G::SendTemporalMessage($e->getMessage(), 'error', 'string'); - } + } - if (!$aPreviousStep) { - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; - } else { - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aPreviousStep['UID'].'&position='.$aPreviousStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP"); - } + if (!$aPreviousStep) { + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; + } else { + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aPreviousStep['UID'].'&position='.$aPreviousStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP"); + } - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToRevise?type=DYNAFORM&DYN_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; - /** Added By erik - * date: 16-05-08 - * Description: this was added for the additional database connections */ - G::LoadClass('dbConnections'); - $oDbConnections = new dbConnections($_SESSION['PROCESS']); - $oDbConnections->loadAdditionalConnections(); + /** Added By erik + * date: 16-05-08 + * Description: this was added for the additional database connections */ + G::LoadClass('dbConnections'); + $oDbConnections = new dbConnections($_SESSION['PROCESS']); + $oDbConnections->loadAdditionalConnections(); - $G_PUBLISH = new Publisher; - if ($_GET['DYN_UID'] != '') { - $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID='.$_GET['DYN_UID']); - } + $G_PUBLISH = new Publisher; + if ($_GET['DYN_UID'] != '') { + $_SESSION['CURRENT_DYN_UID'] = $_GET['DYN_UID']; + $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID='.$_GET['DYN_UID']); + } - G::RenderPage('publish', 'blank'); + G::RenderPage('publish', 'blank'); - if(!isset($_GET['ex'])) $_GET['ex']=$_GET['position']; + if(!isset($_GET['ex'])) $_GET['ex']=$_GET['position']; ?>