BUG 8711 Problemas con la opcion "Print Form" SOLVED
- 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
@@ -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());
|
||||
}
|
||||
?>
|
||||
|
||||
|
||||
@@ -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'];
|
||||
?>
|
||||
|
||||
<script>
|
||||
@@ -136,53 +137,53 @@
|
||||
// DEPRECATED this JS section is marked for removal
|
||||
function setSelect()
|
||||
{
|
||||
var ex=<?=$_GET['ex']?>;
|
||||
try{
|
||||
for(i=1; i<50; i++)
|
||||
{
|
||||
if(i == ex){
|
||||
document.getElementById('focus'+i).innerHTML = '<img src="/images/bulletButton.gif" />';
|
||||
}
|
||||
else{
|
||||
document.getElementById('focus'+i).innerHTML = '';
|
||||
}
|
||||
}
|
||||
} catch (e){
|
||||
return 0;
|
||||
}
|
||||
var ex=<?=$_GET['ex']?>;
|
||||
try{
|
||||
for(i=1; i<50; i++)
|
||||
{
|
||||
if(i == ex){
|
||||
document.getElementById('focus'+i).innerHTML = '<img src="/images/bulletButton.gif" />';
|
||||
}
|
||||
else{
|
||||
document.getElementById('focus'+i).innerHTML = '';
|
||||
}
|
||||
}
|
||||
} catch (e){
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
function toRevisePanel(APP_UID,DEL_INDEX)
|
||||
{
|
||||
|
||||
oPanel = new leimnud.module.panel();
|
||||
oPanel.options = {
|
||||
size :{w:250,h:450},
|
||||
position:{x:0,y:0},
|
||||
title :'',
|
||||
theme :"processmaker",
|
||||
statusBar:false,
|
||||
control :{resize:false,roll:false,close:false,drag:true},
|
||||
fx :{modal:false,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
|
||||
};
|
||||
oPanel.events = {
|
||||
remove: function() { delete(oPanel); }.extend(this)
|
||||
};
|
||||
oPanel.make();
|
||||
oPanel.loader.show();
|
||||
oPanel = new leimnud.module.panel();
|
||||
oPanel.options = {
|
||||
size :{w:250,h:450},
|
||||
position:{x:0,y:0},
|
||||
title :'',
|
||||
theme :"processmaker",
|
||||
statusBar:false,
|
||||
control :{resize:false,roll:false,close:false,drag:true},
|
||||
fx :{modal:false,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
|
||||
};
|
||||
oPanel.events = {
|
||||
remove: function() { delete(oPanel); }.extend(this)
|
||||
};
|
||||
oPanel.make();
|
||||
oPanel.loader.show();
|
||||
|
||||
var oRPC = new leimnud.module.rpc.xmlhttp({
|
||||
url : 'cases_Ajax',
|
||||
method:'post',
|
||||
args: 'action=toRevisePanel&APP_UID='+APP_UID+'&DEL_INDEX='+DEL_INDEX
|
||||
});
|
||||
var oRPC = new leimnud.module.rpc.xmlhttp({
|
||||
url : 'cases_Ajax',
|
||||
method:'post',
|
||||
args: 'action=toRevisePanel&APP_UID='+APP_UID+'&DEL_INDEX='+DEL_INDEX
|
||||
});
|
||||
oRPC.callback = function(rpc) {
|
||||
oPanel.loader.hide();
|
||||
oPanel.addContent(rpc.xmlhttp.responseText);
|
||||
setSelect();
|
||||
oPanel.loader.hide();
|
||||
oPanel.addContent(rpc.xmlhttp.responseText);
|
||||
setSelect();
|
||||
|
||||
}.extend(this);
|
||||
oRPC.make();
|
||||
}.extend(this);
|
||||
oRPC.make();
|
||||
}
|
||||
//toRevisePanel('<?=$_GET['APP_UID']?>','<?=$_GET['DEL_INDEX']?>');
|
||||
// DEPRECATED this JS section is marked for removal
|
||||
|
||||
Reference in New Issue
Block a user