From a0854cf214154e87a2c8b9e04f342c749fefd140 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Tue, 10 Jul 2012 16:29:14 -0400 Subject: [PATCH] BUG 9388 Case nr. and Title configurables para que pueda o no aparecer...SOLVED - En los dynaforms, en la parte de arriba se despliega el Case # y el Title:. Esta linea o conjunto de datos deberia tener algun tipo de identificacion pues algunos proyectos o no lo utilizan o no sirve de mucha referencia. Se deberia anadir un identificador para que se pueda controlar si es pertinente que se despliegue en los formularios o no. - Adding option for active/deactive title and case number when run case. --- .../engine/js/processmap/core/processmap.js | 2 +- .../engine/methods/cases/cases_PrintView.php | 11 ++++++--- workflow/engine/methods/cases/cases_Step.php | 24 ++++++++++++------- .../methods/tracker/tracker_DynaDocs.php | 13 +++++++++- .../methods/tracker/tracker_History.php | 13 +++++++++- .../methods/tracker/tracker_Messages.php | 13 +++++++++- .../methods/tracker/tracker_ViewMap.php | 17 +++++++++++-- .../xmlform/processes/processes_Edit.html | 4 ++++ .../xmlform/processes/processes_Edit.xml | 4 ++++ 9 files changed, 84 insertions(+), 17 deletions(-) diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js index f55035db9..a377c8bdc 100755 --- a/workflow/engine/js/processmap/core/processmap.js +++ b/workflow/engine/js/processmap/core/processmap.js @@ -340,7 +340,7 @@ var processmap=function(){ this.tmp.editProcessPanel = panel =new leimnud.module.panel(); panel.options={ limit :true, - size :{w:700,h:420}, + size :{w:700,h:480}, position:{x:50,y:50,center:true}, title :G_STRINGS.ID_PROCESSMAP_EDIT_PROCESS+": "+ moldTitle(this.data.db.title.label,700),//this.data.db.title.label,s theme :this.options.theme, diff --git a/workflow/engine/methods/cases/cases_PrintView.php b/workflow/engine/methods/cases/cases_PrintView.php index cd3a6d38a..f49e6d700 100755 --- a/workflow/engine/methods/cases/cases_PrintView.php +++ b/workflow/engine/methods/cases/cases_PrintView.php @@ -48,9 +48,13 @@ try { $idProcess = (isset($Fields['APP_DATA']['PROCESS']))?$Fields['APP_DATA']['PROCESS']:$_SESSION['PROCESS']; $oProcess = new Process(); - $oProcess->load($idProcess); + $aProcessFieds = $oProcess->load($idProcess); $sProcess = $oProcess->getProTitle(); + $noShowTitle = 0; + if(isset($aProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE']; + } //Add content content step - Start if (isset($_SESSION['APPLICATION'])) { $array['CASE'] = G::LoadTranslation('ID_CASE'); @@ -74,8 +78,9 @@ try { $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); - + if($noShowTitle == 0) { + $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'); diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 804e12927..315ab3691 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -186,12 +186,17 @@ $array['CASE'] = G::LoadTranslation('ID_CASE'); $array['TITLE'] = G::LoadTranslation('ID_TITLE'); + $noShowTitle = 0; + if(isset($oProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $oProcessFieds['PRO_SHOW_MESSAGE']; + } switch ($_GET['TYPE']) { case 'DYNAFORM': - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); - + if($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); + } if (!$aPreviousStep) { $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; } @@ -225,8 +230,9 @@ break; case 'INPUT_DOCUMENT': - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); - + if($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); + } $oInputDocument = new InputDocument(); $Fields = $oInputDocument->load($_GET['UID']); if (!$aPreviousStep) { @@ -617,8 +623,9 @@ die; break; case 'VIEW': - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); - + if($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); + } require_once 'classes/model/AppDocument.php'; $oAppDocument = new AppDocument(); $lastVersion=$oAppDocument->getLastAppDocVersion($_GET['DOC'],$_SESSION['APPLICATION']); @@ -975,8 +982,9 @@ */ break; case 'EXTERNAL': - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); - + if($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); + } $oPluginRegistry = &PMPluginRegistry::getSingleton(); $externalSteps = $oPluginRegistry->getSteps(); diff --git a/workflow/engine/methods/tracker/tracker_DynaDocs.php b/workflow/engine/methods/tracker/tracker_DynaDocs.php index 1b6c1b8ac..96f1df3a7 100755 --- a/workflow/engine/methods/tracker/tracker_DynaDocs.php +++ b/workflow/engine/methods/tracker/tracker_DynaDocs.php @@ -41,6 +41,15 @@ G::LoadClass('case'); $oCase = new Cases(); + + $idProcess = $_SESSION['PROCESS']; + $oProcess = new Process(); + $aProcessFieds = $oProcess->load($idProcess); + $noShowTitle = 0; + if(isset($aProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE']; + } + $aFields = $oCase->loadCase($_SESSION['APPLICATION']); if (isset($aFields['TITLE'])) { $aFields['APP_TITLE'] = $aFields['TITLE']; @@ -52,7 +61,9 @@ $aFields['TITLE'] = G::LoadTranslation('ID_TITLE'); $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + if($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + } $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_DynaDocs', $oProcessMap->getCaseTrackerObjectsCriteria($_SESSION['PROCESS']), array('VIEW'=>G::LoadTranslation('ID_VIEW'))); diff --git a/workflow/engine/methods/tracker/tracker_History.php b/workflow/engine/methods/tracker/tracker_History.php index 170f52144..dfe4ad20b 100755 --- a/workflow/engine/methods/tracker/tracker_History.php +++ b/workflow/engine/methods/tracker/tracker_History.php @@ -40,6 +40,15 @@ G::LoadClass('case'); $oCase = new Cases(); $aFields = $oCase->loadCase($_SESSION['APPLICATION']); + + $idProcess = $_SESSION['PROCESS']; + $oProcess = new Process(); + $aProcessFieds = $oProcess->load($idProcess); + $noShowTitle = 0; + if(isset($aProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE']; + } + if (isset($aFields['TITLE'])) { $aFields['APP_TITLE'] = $aFields['TITLE']; } @@ -50,6 +59,8 @@ $aFields['TITLE'] = G::LoadTranslation('ID_TITLE'); $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + if ($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + } $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_TransferHistory', Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']), array()); G::RenderPage('publish'); \ No newline at end of file diff --git a/workflow/engine/methods/tracker/tracker_Messages.php b/workflow/engine/methods/tracker/tracker_Messages.php index 0587f3861..e959d6dfd 100755 --- a/workflow/engine/methods/tracker/tracker_Messages.php +++ b/workflow/engine/methods/tracker/tracker_Messages.php @@ -41,6 +41,15 @@ G::LoadClass('case'); $oCase = new Cases(); $aFields = $oCase->loadCase($_SESSION['APPLICATION']); + + $idProcess = $_SESSION['PROCESS']; + $oProcess = new Process(); + $aProcessFieds = $oProcess->load($idProcess); + $noShowTitle = 0; + if(isset($aProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE']; + } + if (isset($aFields['TITLE'])) { $aFields['APP_TITLE'] = $aFields['TITLE']; } @@ -51,6 +60,8 @@ $aFields['TITLE'] = G::LoadTranslation('ID_TITLE'); $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + if ($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + } $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_Messages', Cases::getHistoryMessagesTracker($_SESSION['APPLICATION']), array('VIEW'=>G::LoadTranslation('ID_VIEW'))); G::RenderPage('publish'); diff --git a/workflow/engine/methods/tracker/tracker_ViewMap.php b/workflow/engine/methods/tracker/tracker_ViewMap.php index 27f2fcb57..be99d39b5 100755 --- a/workflow/engine/methods/tracker/tracker_ViewMap.php +++ b/workflow/engine/methods/tracker/tracker_ViewMap.php @@ -29,6 +29,7 @@ * @author Everth S. Berrios Morales * */ + require_once 'classes/model/Process.php'; if (!isset($_SESSION['PROCESS'])) { G::header('location: login'); } @@ -38,6 +39,14 @@ require_once 'classes/model/CaseTracker.php'; $oCaseTracker = new CaseTracker(); $aCaseTracker = $oCaseTracker->load($_SESSION['PROCESS']); + + $idProcess = $_SESSION['PROCESS']; + $oProcess = new Process(); + $aProcessFieds = $oProcess->load($idProcess); + $noShowTitle = 0; + if(isset($aProcessFieds['PRO_SHOW_MESSAGE'])) { + $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE']; + } switch (($aCaseTracker['CT_MAP_TYPE'])) { case 'NONE': //Nothing @@ -57,7 +66,9 @@ $oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html'); $oTemplatePower->prepare(); $G_PUBLISH = new Publisher; - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + if ($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + } $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addScriptCode(' @@ -138,7 +149,9 @@ $oTemplatePower = new TemplatePower(PATH_TPL . 'tracker/stages_Map.html'); $oTemplatePower->prepare(); $G_PUBLISH = new Publisher; - $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + if ($noShowTitle == 0) { + $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields); + } $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower); $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addScriptCode(' diff --git a/workflow/engine/xmlform/processes/processes_Edit.html b/workflow/engine/xmlform/processes/processes_Edit.html index 387e1be76..00627684f 100755 --- a/workflow/engine/xmlform/processes/processes_Edit.html +++ b/workflow/engine/xmlform/processes/processes_Edit.html @@ -47,6 +47,10 @@ {$PRO_DEBUG} {$form.PRO_DEBUG} + + {$PRO_SHOW_MESSAGE} + {$form.PRO_SHOW_MESSAGE} +
{$form.SUBMIT}   {$form.BTN_CANCEL} diff --git a/workflow/engine/xmlform/processes/processes_Edit.xml b/workflow/engine/xmlform/processes/processes_Edit.xml index 4069368d4..66afb3c82 100755 --- a/workflow/engine/xmlform/processes/processes_Edit.xml +++ b/workflow/engine/xmlform/processes/processes_Edit.xml @@ -50,6 +50,10 @@ Debug + + Hide the case number and the case title in the steps + + Cancel