fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 8711 Problemas con la opcion "Print Form" SOLVED

Browse Source 
- Envia un notice de error en la opcion Review
- Ajuste en Review en la impresion previa, se adicionó la variable del dynaform en curso.
This commit is contained in:
Hector Cortez
2012-03-20 18:46:20 -04:00
parent ff6dc5fd9b
commit d7844fdee6
2 changed files with 111 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
workflow/engine/methods/cases/cases_PrintView.php
View File

@@ -24,26 +24,27 @@
*/ */
try { try {
require_once 'classes/model/Dynaform.php'; require_once 'classes/model/Dynaform.php';
require_once 'classes/model/Process.php'; require_once 'classes/model/Process.php';
// g::pr($_SESSION); die;
$oDynaform = new Dynaform();
$aDyn = $oDynaform->load($_SESSION['CURRENT_DYN_UID']);
G::LoadClass('case');
$oCase = new Cases();
if( isset($_SESSION['APPLICATION']) ){ $oDynaform = new Dynaform();
$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); $aDyn = $oDynaform->load($_SESSION['CURRENT_DYN_UID']);
$Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants()); G::LoadClass('case');
} else { $oCase = new Cases();
$Fields['APP_DATA'] = Array();
}
$G_MAIN_MENU = 'processmaker'; if ( isset($_SESSION['APPLICATION']) ) {
$G_ID_MENU_SELECTED = 'USERS'; $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
$G_PUBLISH = new Publisher; $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']; $idProcess = (isset($Fields['APP_DATA']['PROCESS']))?$Fields['APP_DATA']['PROCESS']:$_SESSION['PROCESS'];
$oProcess = new Process(); $oProcess = new Process();
@@ -51,34 +52,35 @@ try {
$sProcess = $oProcess->getProTitle(); $sProcess = $oProcess->getProTitle();
//Add content content step - Start //Add content content step - Start
if(isset($_SESSION['APPLICATION'])){ if (isset($_SESSION['APPLICATION'])) {
$array['CASE'] = G::LoadTranslation('ID_CASE'); $array['CASE'] = G::LoadTranslation('ID_CASE');
$array['USER'] = G::LoadTranslation('ID_USER'); $array['USER'] = G::LoadTranslation('ID_USER');
$array['WORKSPACE'] = G::LoadTranslation('ID_WORKSPACE'); $array['WORKSPACE'] = G::LoadTranslation('ID_WORKSPACE');
$array['APP_NUMBER'] = $Fields['APP_NUMBER']; $array['APP_NUMBER'] = $Fields['APP_NUMBER'];
$array['APP_TITLE'] = $Fields['TITLE']; $array['APP_TITLE'] = $Fields['TITLE'];
$array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME']; $array['USR_USERNAME'] = $Fields['APP_DATA']['USR_USERNAME'];
$array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS']; $array['USER_ENV'] = $Fields['APP_DATA']['SYS_SYS'];
$array['DATEPRINT'] = date('Y-m-d H:m:s'); $array['DATEPRINT'] = date('Y-m-d H:m:s');
} }
$array['APP_PROCESS'] = $sProcess; $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'); $array['TITLE'] = G::LoadTranslation('ID_TITLE');
else }
$array['TITLE'] = ''; else {
$array['PROCESS'] = G::LoadTranslation('ID_PROCESS'); $array['TITLE'] = '';
$array['DATELABEL'] = G::LoadTranslation('DATE_LABEL'); }
$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']; $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('smarty', 'cases/cases_PrintViewTitle', '', '', $array);
$G_PUBLISH->AddContent('dynaform', 'xmlform', $aDyn['PRO_UID']. '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view'); $G_PUBLISH->AddContent('dynaform', 'xmlform', $aDyn['PRO_UID']. '/' . $aDyn['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
G::RenderPage('publish', 'blank'); G::RenderPage('publish', 'blank');
} catch (Exception $oException) { } catch (Exception $oException) {
die($oException->getMessage()); die($oException->getMessage());
} }
?> ?>

137
workflow/engine/methods/cases/cases_StepToRevise.php
View File

@@ -23,7 +23,7 @@
* *
*/ */
// die("first"); // die("first");
/* Permissions */ /* Permissions */
switch ($RBAC->userCanAccess('PM_SUPERVISOR')) { switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
case - 2: case - 2:
G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
@@ -85,50 +85,51 @@
$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
if(!isset($_GET['type'])) $_GET['type'] = 'DYNAFORM'; 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']; $_SESSION['STEP_POSITION'] = (int)$_GET['position'];
//Obtain previous and next step - Start //Obtain previous and next step - Start
if(isset($_GET['type'])) if(isset($_GET['type']))
$sType = $_GET['type']; $sType = $_GET['type'];
else else
$sType = ''; $sType = '';
try { try {
$aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
$aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType); $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $sType);
} }
catch (exception $e) { catch (exception $e) {
G::SendTemporalMessage($e->getMessage(), 'error', 'string'); G::SendTemporalMessage($e->getMessage(), 'error', 'string');
} }
if (!$aPreviousStep) { if (!$aPreviousStep) {
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
} else { } 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'] = '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']['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 /** Added By erik
* date: 16-05-08 * date: 16-05-08
* Description: this was added for the additional database connections */ * Description: this was added for the additional database connections */
G::LoadClass('dbConnections'); G::LoadClass('dbConnections');
$oDbConnections = new dbConnections($_SESSION['PROCESS']); $oDbConnections = new dbConnections($_SESSION['PROCESS']);
$oDbConnections->loadAdditionalConnections(); $oDbConnections->loadAdditionalConnections();
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
if ($_GET['DYN_UID'] != '') { if ($_GET['DYN_UID'] != '') {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID='.$_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'];
?> ?>
<script> <script>
@@ -136,53 +137,53 @@
// DEPRECATED this JS section is marked for removal // DEPRECATED this JS section is marked for removal
function setSelect() function setSelect()
{ {
var ex=<?=$_GET['ex']?>; var ex=<?=$_GET['ex']?>;
try{ try{
for(i=1; i<50; i++) for(i=1; i<50; i++)
{ {
if(i == ex){ if(i == ex){
document.getElementById('focus'+i).innerHTML = '<img src="/images/bulletButton.gif" />'; document.getElementById('focus'+i).innerHTML = '<img src="/images/bulletButton.gif" />';
} }
else{ else{
document.getElementById('focus'+i).innerHTML = ''; document.getElementById('focus'+i).innerHTML = '';
} }
} }
} catch (e){ } catch (e){
return 0; return 0;
} }
} }
function toRevisePanel(APP_UID,DEL_INDEX) function toRevisePanel(APP_UID,DEL_INDEX)
{ {
oPanel = new leimnud.module.panel(); oPanel = new leimnud.module.panel();
oPanel.options = { oPanel.options = {
size :{w:250,h:450}, size :{w:250,h:450},
position:{x:0,y:0}, position:{x:0,y:0},
title :'', title :'',
theme :"processmaker", theme :"processmaker",
statusBar:false, statusBar:false,
control :{resize:false,roll:false,close:false,drag:true}, control :{resize:false,roll:false,close:false,drag:true},
fx :{modal:false,opacity:true,blinkToFront:false,fadeIn:false,drag:true} fx :{modal:false,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
}; };
oPanel.events = { oPanel.events = {
remove: function() { delete(oPanel); }.extend(this) remove: function() { delete(oPanel); }.extend(this)
}; };
oPanel.make(); oPanel.make();
oPanel.loader.show(); oPanel.loader.show();
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : 'cases_Ajax', url : 'cases_Ajax',
method:'post', method:'post',
args: 'action=toRevisePanel&APP_UID='+APP_UID+'&DEL_INDEX='+DEL_INDEX args: 'action=toRevisePanel&APP_UID='+APP_UID+'&DEL_INDEX='+DEL_INDEX
}); });
oRPC.callback = function(rpc) { oRPC.callback = function(rpc) {
oPanel.loader.hide(); oPanel.loader.hide();
oPanel.addContent(rpc.xmlhttp.responseText); oPanel.addContent(rpc.xmlhttp.responseText);
setSelect(); setSelect();
}.extend(this); }.extend(this);
oRPC.make(); oRPC.make();
} }
//toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>'); //toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>');
// DEPRECATED this JS section is marked for removal // DEPRECATED this JS section is marked for removal