fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CODE STYLE

Browse Source 
- workflow/engine/methods/cases/cases_StepToRevise.php
- workflow/engine/methods/cases/cases_StepToReviseInputs.php
- workflow/engine/methods/cases/cases_StepToReviseOutputs.php
This commit is contained in:
Marco Antonio Nina
2012-07-18 19:07:08 -04:00
parent 04f3f292db
commit f7a4a00a71
3 changed files with 173 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,8 @@
* *
*/ */
// 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');
G::header('location: ../login/login'); G::header('location: ../login/login');
@@ -35,43 +35,43 @@
G::header('location: ../login/login'); G::header('location: ../login/login');
die; die;
break; break;
} }
if ((int)$_SESSION['INDEX'] < 1) { if ((int)$_SESSION['INDEX'] < 1) {
G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
G::header('location: ' . $_SERVER['HTTP_REFERER']); G::header('location: ' . $_SERVER['HTTP_REFERER']);
die; die;
} }
/* Includes */ /* Includes */
G::LoadClass('case'); G::LoadClass('case');
G::LoadClass('derivation'); G::LoadClass('derivation');
/* GET , POST & $_SESSION Vars */ /* GET , POST & $_SESSION Vars */
//$_SESSION['STEP_POSITION'] = (int)$_GET['POSITION']; //$_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
/* Menues */ /* Menues */
$G_MAIN_MENU = 'processmaker'; $G_MAIN_MENU = 'processmaker';
$G_SUB_MENU = 'cases'; $G_SUB_MENU = 'cases';
$G_ID_MENU_SELECTED = 'CASES'; $G_ID_MENU_SELECTED = 'CASES';
$G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE'; $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
/* Prepare page before to show */ /* Prepare page before to show */
$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html'); $oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
$oTemplatePower->prepare(); $oTemplatePower->prepare();
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
$oCase = new Cases(); $oCase = new Cases();
$Fields = $oCase->loadCase($_SESSION['APPLICATION']); $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
$oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher =& headPublisher::getSingleton();
$oHeadPublisher->addScriptCode(" $oHeadPublisher->addScriptCode("
if (typeof parent != 'undefined') { if (typeof parent != 'undefined') {
if (parent.showCaseNavigatorPanel) { if (parent.showCaseNavigatorPanel) {
parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}'); parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
} }
}"); }");
// DEPRECATED this script call is marked for removal since almost all the interface is extJS based // DEPRECATED this script call is marked for removal since almost all the interface is extJS based
$oHeadPublisher->addScriptCode(' $oHeadPublisher->addScriptCode('
var Cse = {}; var Cse = {};
Cse.panels = {}; Cse.panels = {};
var leimnud = new maborak(); var leimnud = new maborak();
@@ -85,58 +85,69 @@
leimnud.event.add(window,"load",function(){ leimnud.event.add(window,"load",function(){
'.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').' '.(isset($_SESSION['showCasesWindow'])?'try{'.$_SESSION['showCasesWindow'].'}catch(e){}':'').'
}); });
'); ');
// DEPRECATED this script call is marked for removal // DEPRECATED this script call is marked for removal
$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
if(!isset($_GET['type'])) $_GET['type'] = 'DYNAFORM'; if (!isset($_GET['type'])) {
if(!isset($_GET['position'])) $_GET['position'] = 1; $_GET['type'] = 'DYNAFORM';
}
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'] != '') {
$_SESSION['CURRENT_DYN_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_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>
/*------------------------------ To Revise Routines ---------------------------*/ /*------------------------------ To Revise Routines ---------------------------*/
// DEPRECATED this JS section is marked for removal // DEPRECATED this JS section is marked for removal

46
workflow/engine/methods/cases/cases_StepToReviseInputs.php
View File

@@ -78,9 +78,11 @@ $oHeadPublisher->addScriptCode('
}); });
'); ');
// Check if these code needs to be removed since the interface ar now moving to ExtJS // Check if these code needs to be removed since the interface ar now moving to ExtJS
$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
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'];
$oCase = new Cases(); $oCase = new Cases();
@@ -88,31 +90,36 @@ $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
if(!isset($_GET['ex'])) $_GET['ex']=0; if (!isset($_GET['ex'])) {
$_GET['ex']=0;
}
if (!isset($_GET['INP_DOC_UID'])) { if (!isset($_GET['INP_DOC_UID'])) {
G::LoadClass('case'); G::LoadClass('case');
$oCase = new Cases(); $oCase = new Cases();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise', $oCase->getInputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), ''); $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise',
} $oCase->getInputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
else { } else {
$oInputDocument = new InputDocument(); $oInputDocument = new InputDocument();
$Fields = $oInputDocument->load($_GET['INP_DOC_UID']); $Fields = $oInputDocument->load($_GET['INP_DOC_UID']);
//Obtain previous and next step - Start //Obtain previous and next step - Start
try { try {
$aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']); $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']);
$aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']); $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'],
$_GET['type']);
if (!$aPreviousStep) { if (!$aPreviousStep) {
$Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
} } else {
else { $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] =
$Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='. $aNextStep['UID'].'&position='.
$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='. $_GET['DEL_INDEX'];
$Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP"); $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
} }
$Fields['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.$aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.$_GET['DEL_INDEX']; $Fields['__DYNAFORM_OPTIONS']['NEXT_STEP'] = 'cases_StepToReviseInputs?type=INPUT_DOCUMENT&INP_DOC_UID='.
} $aNextStep['UID'].'&position='.$aNextStep['POSITION'].'&APP_UID='.$_GET['APP_UID'].'&DEL_INDEX='.
catch (exception $e) { $_GET['DEL_INDEX'];
} catch (exception $e) {
//
} }
switch ($Fields['INP_DOC_FORM_NEEDED']) { switch ($Fields['INP_DOC_FORM_NEEDED']) {
@@ -135,9 +142,14 @@ else {
$Fields['NEXT_STEP_LABEL'] = G::loadtranslation('ID_NEXT_STEP'); $Fields['NEXT_STEP_LABEL'] = G::loadtranslation('ID_NEXT_STEP');
$Fields['PREVIOUS_STEP_LABEL'] = G::loadtranslation('ID_PREVIOUS_STEP'); $Fields['PREVIOUS_STEP_LABEL'] = G::loadtranslation('ID_PREVIOUS_STEP');
$oHeadPublisher->addScriptCode('var documentName=\'Reviewing Input Document<br>'.$docName.'\';'); $oHeadPublisher->addScriptCode('var documentName=\'Reviewing Input Document<br>'.$docName.'\';');
// $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', $Fields, 'cases_SupervisorSaveDocument?UID=' . $_GET['INP_DOC_UID'] . '&APP_UID=' . $_GET['APP_UID'] . '&position=' . $_GET['position']); // $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', $Fields, 'cases_SupervisorSaveDocument?UID=' .
$G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_ToReviseInputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID']), array_merge(array('DOC_UID'=>$_GET['INP_DOC_UID']),$Fields));//$aFields //$_GET['INP_DOC_UID'] . '&APP_UID=' . $_GET['APP_UID'] . '&position=' . $_GET['position']);
// $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION']));//$aFields $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_ToReviseInputdocsList',
$oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID']),
array_merge(array('DOC_UID'=>$_GET['INP_DOC_UID']),$Fields));
//$aFields
// $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList',
//$oCase->getInputDocumentsCriteria($_SESSION['APPLICATION']));//$aFields
} }
G::RenderPage('publish', 'blank'); G::RenderPage('publish', 'blank');

10
workflow/engine/methods/cases/cases_StepToReviseOutputs.php
View File

@@ -69,12 +69,16 @@ leimnud.event.add(window,"load",function(){
'); ');
$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
$oCase = new Cases(); $oCase = new Cases();
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise', $oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), ''); $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise',
$oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
G::RenderPage('publish', 'blank'); G::RenderPage('publish', 'blank');
if(!isset($_GET['ex'])) $_GET['ex']=0; if (!isset($_GET['ex'])) {
$_GET['ex']=0;
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">
/*------------------------------ To Revise Routines ---------------------------*/ /*------------------------------ To Revise Routines ---------------------------*/
//Deprecated Section since the interface are now movig to ExtJS //Deprecated Section since the interface are now movig to ExtJS