Merge pull request #210 from hector-cortez/BUG-9388

BUG 9388 Case nr. and Title configurables para que pueda o no aparecer.....

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,

workflow/engine/methods/cases/cases_PrintView.php

@@ -34,11 +34,10 @@ try {
     G::LoadClass('case');
     $oCase = new Cases();
 
-  if ( isset($_SESSION['APPLICATION']) ) {
+    if (isset($_SESSION['APPLICATION'])) {
-    $Fields             = $oCase->loadCase( $_SESSION['APPLICATION'] );
+        $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
         $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants());
-  }
+    } else {
-  else {
         $Fields['APP_DATA'] = Array();
     }
 
@@ -46,11 +45,15 @@ try {
     $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->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');
@@ -66,19 +69,27 @@ try {
 
     if (isset($Fields['TITLE']) && strlen($Fields['TITLE']) > 0) {
         $array['TITLE'] = G::LoadTranslation('ID_TITLE');
-  }
+    } else {
-  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'];
+    $aDyn['DYN_UID'] = (isset($_SESSION['DYN_UID_PRINT']) && $_SESSION['DYN_UID_PRINT'] != '')
+                       ? $_SESSION['DYN_UID_PRINT']
+                       : $aDyn['DYN_UID'];
+    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_PUBLISH->AddContent('dynaform',
+                           'xmlform',
+                           $aDyn['PRO_UID'] . '/' . $aDyn['DYN_UID'],
+                           '',
+                           $Fields['APP_DATA'],
+                           '',
+                           '',
+                           'view');
     G::RenderPage('publish', 'blank');
-
 } catch (Exception $oException) {
     die($oException->getMessage());
 }
@@ -113,3 +124,4 @@ try {
         window.print();
     } catch(e){}
 </script>
+

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':
+      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':
+      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':
+          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':
+      if($noShowTitle == 0) {
         $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-
+      }
       $oPluginRegistry = &PMPluginRegistry::getSingleton();
       $externalSteps   = $oPluginRegistry->getSteps();
 

workflow/engine/methods/tracker/tracker_DynaDocs.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * tracker_ViewMap.php
  *
@@ -22,40 +23,51 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-
+/*
-   /*
  * dynaforms & documents for Case Tracker
  *
  * @author Everth S. Berrios Morales <everth@colosa.com>
  *
  */
-	if (!isset($_SESSION['PROCESS']))
+if (!isset($_SESSION['PROCESS'])) {
-  {
     G::header('location: login');
-  }
+}
-	$G_MAIN_MENU            = 'caseTracker';
+$G_MAIN_MENU        = 'caseTracker';
-  $G_ID_MENU_SELECTED     = 'DYNADOC';
+$G_ID_MENU_SELECTED = 'DYNADOC';
 
-  G::LoadClass('processMap');
+G::LoadClass('processMap');
-  $oProcessMap = new processMap();
+$oProcessMap = new processMap();
 
-  G::LoadClass('case');
+G::LoadClass('case');
-	$oCase = new Cases();
+$oCase = new Cases();
-	$aFields = $oCase->loadCase($_SESSION['APPLICATION']);
+
-	if (isset($aFields['TITLE'])) {
+$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'];
-	}
+}
-	if ($aFields['APP_PROC_CODE'] != '') {
+if ($aFields['APP_PROC_CODE'] != '') {
     $aFields['APP_NUMBER'] = $aFields['APP_PROC_CODE'];
-	}
+}
-  $aFields['CASE']  = G::LoadTranslation('ID_CASE');
+$aFields['CASE'] = G::LoadTranslation('ID_CASE');
-  $aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
+$aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
 
-  $G_PUBLISH = new Publisher();
+$G_PUBLISH = new Publisher();
+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')));
+}
+$G_PUBLISH->AddContent( 'propeltable',
+                        'paged-table',
+                        'tracker/tracker_DynaDocs',
+                        $oProcessMap->getCaseTrackerObjectsCriteria($_SESSION['PROCESS']),
+                        array('VIEW' => G::LoadTranslation('ID_VIEW')));
 
+G::RenderPage('publish');
 
-    
-	
-	G::RenderPage('publish');

workflow/engine/methods/tracker/tracker_History.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * tracker_ViewMap.php
  *
@@ -22,34 +23,48 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-
+/*
-   /*
  * Hystory case for Case Tracker
  *
  * @author Everth S. Berrios Morales <everth@colosa.com>
  *
  */
-	if (!isset($_SESSION['PROCESS']))
+if (!isset($_SESSION['PROCESS'])) {
-  {
     G::header('location: login');
-  }
+}
 
-	$G_MAIN_MENU            = 'caseTracker';
+$G_MAIN_MENU = 'caseTracker';
-  $G_ID_MENU_SELECTED     = 'HISTORY';
+$G_ID_MENU_SELECTED = 'HISTORY';
 
-  G::LoadClass('case');
+G::LoadClass('case');
-	$oCase = new Cases();
+$oCase = new Cases();
-	$aFields = $oCase->loadCase($_SESSION['APPLICATION']);
+$aFields = $oCase->loadCase($_SESSION['APPLICATION']);
-	if (isset($aFields['TITLE'])) {
+
+$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'];
-	}
+}
-	if ($aFields['APP_PROC_CODE'] != '') {
+if ($aFields['APP_PROC_CODE'] != '') {
     $aFields['APP_NUMBER'] = $aFields['APP_PROC_CODE'];
-	}
+}
-  $aFields['CASE']  = G::LoadTranslation('ID_CASE');
+$aFields['CASE'] = G::LoadTranslation('ID_CASE');
-  $aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
+$aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
 
-	$G_PUBLISH = new Publisher();
+$G_PUBLISH = new Publisher();
+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');
+$G_PUBLISH->AddContent( 'propeltable',
+                        'paged-table',
+                        'tracker/tracker_TransferHistory',
+                        Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']),
+                        array());
+G::RenderPage('publish');
+ 

workflow/engine/methods/tracker/tracker_Messages.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * tracker_Messages.php
  *
@@ -22,35 +23,48 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-
+/*
-   /*
  * History messages for Case Tracker
  *
  * @author Everth S. Berrios Morales <everth@colosa.com>
  *
  */
-	if (!isset($_SESSION['PROCESS']))
+if (!isset($_SESSION['PROCESS'])) {
-  {
     G::header('location: login');
-  }
+}
-	$G_MAIN_MENU            = 'caseTracker';
+$G_MAIN_MENU = 'caseTracker';
-  $G_ID_MENU_SELECTED     = 'MESSAGES';
+$G_ID_MENU_SELECTED = 'MESSAGES';
 
-  $oHeadPublisher->addScriptFile('/jscore/tracker/tracker.js');
+$oHeadPublisher->addScriptFile('/jscore/tracker/tracker.js');
 
-  G::LoadClass('case');
+G::LoadClass('case');
-	$oCase = new Cases();
+$oCase = new Cases();
-	$aFields = $oCase->loadCase($_SESSION['APPLICATION']);
+$aFields = $oCase->loadCase($_SESSION['APPLICATION']);
-	if (isset($aFields['TITLE'])) {
+
+$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'];
-	}
+}
-	if ($aFields['APP_PROC_CODE'] != '') {
+if ($aFields['APP_PROC_CODE'] != '') {
     $aFields['APP_NUMBER'] = $aFields['APP_PROC_CODE'];
-	}
+}
-  $aFields['CASE']  = G::LoadTranslation('ID_CASE');
+$aFields['CASE'] = G::LoadTranslation('ID_CASE');
-  $aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
+$aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
 
-  $G_PUBLISH = new Publisher();
+$G_PUBLISH = new Publisher();
+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');
+$G_PUBLISH->AddContent( 'propeltable',
+                        'paged-table',
+                        'tracker/tracker_Messages',
+                        Cases::getHistoryMessagesTracker($_SESSION['APPLICATION']),
+                        array('VIEW' => G::LoadTranslation('ID_VIEW')));
+G::RenderPage('publish');

workflow/engine/methods/tracker/tracker_ViewMap.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * tracker_ViewMap.php
  *
@@ -22,23 +23,31 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  *
  */
-
+/*
-   /*
  * Map for Case Tracker
  *
  * @author Everth S. Berrios Morales <everth@colosa.com>
  *
  */
-  if (!isset($_SESSION['PROCESS'])) {
+require_once 'classes/model/Process.php';
+if (!isset($_SESSION['PROCESS'])) {
     G::header('location: login');
-  }
+}
-  $G_MAIN_MENU        = 'caseTracker';
+$G_MAIN_MENU = 'caseTracker';
-  $G_ID_MENU_SELECTED = 'MAP';
+$G_ID_MENU_SELECTED = 'MAP';
 
-  require_once 'classes/model/CaseTracker.php';
+require_once 'classes/model/CaseTracker.php';
-  $oCaseTracker = new CaseTracker();
+$oCaseTracker = new CaseTracker();
-  $aCaseTracker = $oCaseTracker->load($_SESSION['PROCESS']);
+$aCaseTracker = $oCaseTracker->load($_SESSION['PROCESS']);
-  switch (($aCaseTracker['CT_MAP_TYPE'])) {
+
+$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
         break;
@@ -57,9 +66,11 @@
         $oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html');
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher;
+        if ($noShowTitle == 0) {
             $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields);
+        }
         $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-      $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = & headPublisher::getSingleton();
         $oHeadPublisher->addScriptCode('
         leimnud.event.add(window,"load",function(){
           var pb = leimnud.dom.capture("tag.body 0");
@@ -138,9 +149,11 @@
         $oTemplatePower = new TemplatePower(PATH_TPL . 'tracker/stages_Map.html');
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher;
+        if ($noShowTitle == 0) {
             $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields);
+        }
         $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-      $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = & headPublisher::getSingleton();
         $oHeadPublisher->addScriptCode('
         leimnud.Package.Load("stagesmap",{Type:"file",Absolute:true,Path:"/jscore/stagesmap/core/stagesmap.js"});
         leimnud.event.add(window,"load",function(){

workflow/engine/xmlform/processes/processes_Edit.html

@@ -47,6 +47,10 @@
           <td class="FormLabel" width="{$form_labelWidth}">{$PRO_DEBUG}</td>
           <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_DEBUG}</td>
         </tr>
+        <tr>
+          <td class="FormLabel" width="{$form_labelWidth}">{$PRO_SHOW_MESSAGE}</td>
+          <td class="FormFieldContent" width="{$form_fieldContentWidth}">{$form.PRO_SHOW_MESSAGE}</td>
+        </tr>
         <tr>
           <td class="FormButton" colspan="2" align="center"><br/> {$form.SUBMIT} &nbsp; {$form.BTN_CANCEL} </td>
         </tr>

workflow/engine/xmlform/processes/processes_Edit.xml

@@ -50,6 +50,10 @@
   <en>Debug</en>
 </PRO_DEBUG>
 
+<PRO_SHOW_MESSAGE type="checkbox" value="1" falsevalue="0" defaultvalue="1" labelonright="0">
+  <en>Hide the case number and the case title in the steps</en>
+</PRO_SHOW_MESSAGE>
+
 <BTN_CANCEL type="button" onclick="cancel();">
   <en>Cancel</en>
 </BTN_CANCEL>