diff --git a/workflow/engine/methods/cases/casesToReviseTreeContent.php b/workflow/engine/methods/cases/casesToReviseTreeContent.php index a61b04be0..b84fc5f9d 100755 --- a/workflow/engine/methods/cases/casesToReviseTreeContent.php +++ b/workflow/engine/methods/cases/casesToReviseTreeContent.php @@ -41,7 +41,7 @@ G::LoadClass('case'); $o = new Cases(); -$PRO_UID = ''; +$PRO_UID = $_SESSION['PROCESS']; $treeArray = array(); //if (isset($_GET['action'])&&$_GET['action']=='test'){ @@ -52,7 +52,8 @@ $treeArray = array(); $APP_UID = $_GET['APP_UID']; $DEL_INDEX = $_GET['DEL_INDEX']; $steps = $o->getAllDynaformsStepsToRevise($_GET['APP_UID']); - foreach ($steps as $step) { + $steps->next(); + while ($step = $steps->getRow()) { require_once 'classes/model/Dynaform.php'; $od = new Dynaform(); $dynaformF = $od->Load($step['STEP_UID_OBJ']); @@ -60,10 +61,10 @@ $treeArray = array(); $n = $step['STEP_POSITION']; $TITLE = " - ".$dynaformF['DYN_TITLE']; $DYN_UID = $dynaformF['DYN_UID']; - $PRO_UID = $step['PRO_UID']; $href = "cases_StepToRevise?type=DYNAFORM&ex=$i&PRO_UID=$PRO_UID&DYN_UID=$DYN_UID&APP_UID=$APP_UID&position=".$step['STEP_POSITION']."&DEL_INDEX=$DEL_INDEX"; $extTreeDynaforms->add(new TreeNode($DYN_UID,$TITLE,"datasource",true,false,$href,"openCaseFrame")); $i++; + $steps->next(); } echo $extTreeDynaforms->toJson(); // end the dynaforms tree menu @@ -74,8 +75,8 @@ $treeArray = array(); $APP_UID = $_GET['APP_UID']; $DEL_INDEX = $_GET['DEL_INDEX']; $steps = $o->getAllInputsStepsToRevise($_GET['APP_UID']); - //$i=1; - foreach ($steps as $step) { + $steps->next(); + while ($step = $steps->getRow()) { require_once 'classes/model/InputDocument.php'; $od = new InputDocument(); $IDF = $od->Load($step['STEP_UID_OBJ']); @@ -83,20 +84,10 @@ $treeArray = array(); $n = $step['STEP_POSITION']; $TITLE = " - ".$IDF['INP_DOC_TITLE']; $INP_DOC_UID = $IDF['INP_DOC_UID']; - $PRO_UID = $step['PRO_UID']; $href = "cases_StepToReviseInputs?type=INPUT_DOCUMENT&ex=$i&PRO_UID=$PRO_UID&INP_DOC_UID=$INP_DOC_UID&APP_UID=$APP_UID&position=".$step['STEP_POSITION']."&DEL_INDEX=$DEL_INDEX"; $extTreeInputDocs->add(new TreeNode($INP_DOC_UID,$TITLE,"datasource",true,false,$href,"openCaseFrame")); $i++; + $steps->next(); } echo $extTreeInputDocs->toJson(); - // end of the tree assembling input documents list - echo ","; - $i=0; - $APP_UID = $_GET['APP_UID']; - $DEL_INDEX = $_GET['DEL_INDEX']; - $outputHref = "cases_StepToReviseOutputs?ex=$i&PRO_UID=$PRO_UID&DEL_INDEX=$DEL_INDEX&APP_UID=$APP_UID"; - $ouputItem = new TreeNode ("node-output-documents",G::loadtranslation('ID_OUTPUT_DOCUMENTS'),"",true,false,$outputHref,"openCaseFrame"); - echo $ouputItem->toJson(); - echo "]"; - - + echo "]"; \ No newline at end of file diff --git a/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php b/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php new file mode 100644 index 000000000..c0ca8a6eb --- /dev/null +++ b/workflow/engine/methods/cases/cases_DeleteDocumentToRevise.php @@ -0,0 +1,51 @@ +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ +/* 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; +} + +/* Includes */ +require_once ( "classes/model/AppDocumentPeer.php" ); +G::LoadClass('case'); + +/* GET , POST & $_SESSION Vars */ + +/* Process the info */ +$oAppDocument = new AppDocument(); +$oAppDocument->remove($_GET['DOC']); + +/* Redirect */ +G::header('location: ' . $_SERVER['HTTP_REFERER']); diff --git a/workflow/engine/methods/cases/cases_StepToRevise.php b/workflow/engine/methods/cases/cases_StepToRevise.php index fb2929626..894feb861 100755 --- a/workflow/engine/methods/cases/cases_StepToRevise.php +++ b/workflow/engine/methods/cases/cases_StepToRevise.php @@ -105,24 +105,8 @@ if (isset($_GET['type'])) { $sType = ''; } -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"); -} - -$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']['PREVIOUS_STEP_LABEL'] = ''; +$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; /** Added By erik @@ -147,7 +131,6 @@ if (!isset($_GET['ex'])) { } ?> - - - + \ No newline at end of file diff --git a/workflow/engine/methods/cases/cases_StepToReviseInputs.php b/workflow/engine/methods/cases/cases_StepToReviseInputs.php index d9e9160c1..1b13d480e 100755 --- a/workflow/engine/methods/cases/cases_StepToReviseInputs.php +++ b/workflow/engine/methods/cases/cases_StepToReviseInputs.php @@ -102,26 +102,6 @@ if (!isset($_GET['INP_DOC_UID'])) { } else { $oInputDocument = new InputDocument(); $Fields = $oInputDocument->load($_GET['INP_DOC_UID']); - //Obtain previous and next step - Start - try { - $aNextStep = $oCase->getNextSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], $_GET['type']); - $aPreviousStep = $oCase->getPreviousSupervisorStep($_SESSION['PROCESS'], $_SESSION['STEP_POSITION'], - $_GET['type']); - if (!$aPreviousStep) { - $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; - } else { - $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']; - $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']; - } catch (exception $e) { - // - } - switch ($Fields['INP_DOC_FORM_NEEDED']) { case 'REAL': $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_NEW'); @@ -139,12 +119,10 @@ if (!isset($_GET['INP_DOC_UID'])) { $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS'); $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE'); $docName = $Fields['INP_DOC_TITLE']; - $Fields['NEXT_STEP_LABEL'] = G::loadtranslation('ID_NEXT_STEP'); - $Fields['PREVIOUS_STEP_LABEL'] = G::loadtranslation('ID_PREVIOUS_STEP'); $oHeadPublisher->addScriptCode('var documentName=\'Reviewing Input Document
'.$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('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_ToReviseInputdocsList', + $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocumentsToRevise', 'cases/cases_ToReviseInputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID']), array_merge(array('DOC_UID'=>$_GET['INP_DOC_UID']),$Fields)); //$aFields diff --git a/workflow/engine/templates/cases/paged-table-inputDocumentsToRevise.html b/workflow/engine/templates/cases/paged-table-inputDocumentsToRevise.html new file mode 100755 index 000000000..11ef6a651 --- /dev/null +++ b/workflow/engine/templates/cases/paged-table-inputDocumentsToRevise.html @@ -0,0 +1,145 @@ + +
+
+
+ + + + +
+ + +
+ + {title} +

+ + + + + + + + +
{content}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + {value} + + + + + + + + + + + + + + + + + + + + + + +
+ {header} +
{value1}{value} 
  + {noRecordsFound}
  +
+ + + + + + + +
+ {labels:ID_ROWS} {firstRow}-{lastRow}/{totalRows}  + + {first}{prev}{next}{last} + {labels:ID_PAGE} {currentPage}/{totalPages}
+
+ +
+
+
+
+ + + + + diff --git a/workflow/engine/xmlform/cases/cases_ToReviseInputdocsList.xml b/workflow/engine/xmlform/cases/cases_ToReviseInputdocsList.xml index 3cf1849c9..1cd8648a1 100755 --- a/workflow/engine/xmlform/cases/cases_ToReviseInputdocsList.xml +++ b/workflow/engine/xmlform/cases/cases_ToReviseInputdocsList.xml @@ -37,6 +37,6 @@ - + \ No newline at end of file