Merge pull request #404 from hector-cortez/BUG-9486

BUG 9486 User Name Display Format in all locations SOLVED.

workflow/engine/classes/class.applications.php

@@ -27,6 +27,7 @@ class Applications
     require_once ( "classes/model/AdditionalTables.php" );
     require_once ( "classes/model/AppDelay.php" );
     require_once ( "classes/model/Fields.php" );
+    require_once ( "classes/model/Users.php" );
 
     //$userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null; <-- passed by param
     $oAppCache = new AppCacheView();
@@ -97,6 +98,11 @@ class Applications
       break;
     }
 
+    // $Criteria->addJoin(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+    $Criteria->addJoin(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+    $Criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME );
+    $Criteria->addSelectColumn(UsersPeer::USR_LASTNAME );
+
     if ( !is_array($confCasesList) ) {
         $rows = $this->getDefaultFields( $action );
         $result = $this->genericJsonResponse( '', array(), $rows , 20, '' );
@@ -387,7 +393,9 @@ class Applications
      $fields['APP_PRO_TITLE']           = array( 'name' => 'APP_PRO_TITLE'  ,         'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_PRO_TITLE') ,         'width' => 140, 'align' => 'left');
      $fields['APP_TAS_TITLE']           = array( 'name' => 'APP_TAS_TITLE'  ,         'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_TAS_TITLE') ,         'width' => 140, 'align' => 'left');
      $fields['APP_DEL_PREVIOUS_USER']   = array( 'name' => 'APP_DEL_PREVIOUS_USER'  , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_DEL_PREVIOUS_USER') , 'width' => 120, 'align' => 'left');
-     $fields['APP_CURRENT_USER']        = array( 'name' => 'APP_CURRENT_USER'       , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER')  ,     'width' => 120, 'align' => 'left');
+     $fields['APP_CURRENT_USER']        = array( 'name' => 'APP_CURRENT_USER'       , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER')      ,'width' => 120, 'align' => 'left');
+     $fields['USR_FIRSTNAME']           = array( 'name' => 'USR_FIRSTNAME'          , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER')      , 'width' => 120, 'align' => 'left');
+     $fields['USR_LASTNAME']            = array( 'name' => 'USR_LASTNAME'           , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER')      , 'width' => 120, 'align' => 'left');
      $fields['DEL_TASK_DUE_DATE']       = array( 'name' => 'DEL_TASK_DUE_DATE'      , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_DEL_TASK_DUE_DATE') ,     'width' => 100, 'align' => 'left');
      $fields['APP_UPDATE_DATE']         = array( 'name' => 'APP_UPDATE_DATE'        , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_APP_UPDATE_DATE') ,       'width' => 100, 'align' => 'left');
      $fields['DEL_PRIORITY']            = array( 'name' => 'DEL_PRIORITY'           , 'fieldType' => 'case field' , 'label' => G::loadTranslation('ID_CASESLIST_DEL_PRIORITY')    ,       'width' => 80,  'align' => 'left');
@@ -459,6 +467,8 @@ class Applications
         $rows[] = $fields['APP_CURRENT_USER'];
         $rows[] = $fields['APP_UPDATE_DATE'];
         $rows[] = $fields['APP_STATUS'];
+        $rows[] = $fields['USR_FIRSTNAME'];
+        $rows[] = $fields['USR_LASTNAME'];
         break;
       case 'unassigned' :  //#, Case, task, process, completed by user, finish date
         $fields = $this->setDefaultFields();

workflow/engine/templates/cases/casesList.js

@@ -475,6 +475,11 @@ Ext.onReady ( function() {
     return '<img src="/images/ext/default/s.gif" class="x-tree-node-icon ICON_CASES_NOTES" unselectable="off" id="extdd-17" onClick="openCaseNotesWindow(\''+appUid+'\', true, \''+title+'\')">';
   }
 
+  //Render Full Name
+  full_name = function(v,x,s){
+      return _FNF(v, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
+  };
+
   for(var i = 0, len = columns.length; i < len; i++){
     var c = columns[i];
     c.renderer = columnRenderer;
@@ -485,6 +490,8 @@ Ext.onReady ( function() {
     if( c.id == 'unpauseLink')                  c.renderer = unpauseLink;
     if( c.dataIndex == 'CASE_SUMMARY')          c.renderer = renderSummary;
     if( c.dataIndex == 'CASE_NOTES_COUNT')      c.renderer = renderNote;
+    if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = full_name;
+    if( c.dataIndex == 'APP_CURRENT_USER')      c.renderer = full_name;
   }
 
   //adding the hidden field DEL_INIT_DATE
@@ -492,6 +499,9 @@ Ext.onReady ( function() {
   readerFields.push ( {name: "APP_UID"});
   readerFields.push ( {name: "DEL_INDEX"});
 
+  readerFields.push ( {name: "USR_FIRSTNAME"});
+  readerFields.push ( {name: "USR_LASTNAME"});
+
   for (i=0; i<columns.length; i++) {
     if (columns[i].dataIndex == 'USR_UID') {
       columns[i].hideable = false;