diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php index f8487b47f..f2e32ecd5 100644 --- a/workflow/engine/methods/mails/emailsAjax.php +++ b/workflow/engine/methods/mails/emailsAjax.php @@ -62,6 +62,7 @@ switch($req){ $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE); $criteria->addSelectColumn(ApplicationPeer::PRO_UID); + $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); $criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE'); $criteria->addAlias('C2', 'CONTENT'); @@ -110,33 +111,33 @@ switch($req){ $result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = Array(); $dataPro = array(); - $index = 0; + $index = 1; $content = new Content(); $tasTitleDefault = G::LoadTranslation('ID_TASK_NOT_RELATED'); while ( $result->next() ) { - $row = $result->getRow(); $row['APP_MSG_FROM'] =htmlentities($row['APP_MSG_FROM'], ENT_QUOTES, "UTF-8"); $row['APP_MSG_STATUS'] = ucfirst ( $row['APP_MSG_STATUS']); - $row['TAS_TITLE'] = $tasTitleDefault; if ($row['DEL_INDEX'] != 0) { - $criteria = new Criteria(); - $criteria->addSelectColumn(AppDelegationPeer::PRO_UID); - $criteria->addSelectColumn(AppDelegationPeer::TAS_UID); - $criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX); - $criteria->add(AppDelegationPeer::APP_UID, $row['APP_UID']); - $resultDelegation = AppDelegationPeer::doSelectRS($criteria); - $resultDelegation->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $row['TAS_TITLE'] = '-'; - while ($resultDelegation->next()) { - $rowDelegation = $resultDelegation->getRow(); - if ($row['DEL_INDEX'] == $rowDelegation['DEL_INDEX']) { - $row['TAS_TITLE'] = $content->load( 'TAS_TITLE', '', $rowDelegation['TAS_UID'], SYS_LANG ); - break; - } - } + $index = $row['DEL_INDEX']; + } + + $criteria = new Criteria(); + $criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE); + $criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE); + $criteria->add(AppCacheViewPeer::APP_UID, $row['APP_UID']); + $criteria->add(AppCacheViewPeer::DEL_INDEX, $index); + $resultCacheView = AppCacheViewPeer::doSelectRS($criteria); + $resultCacheView->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $row['APP_TITLE'] = '-'; + while ($resultCacheView->next()) { + $rowCacheView = $resultCacheView->getRow(); + $row['APP_TITLE'] = $rowCacheView['APP_TITLE']; + $row['TAS_TITLE'] = $rowCacheView['APP_TAS_TITLE']; + } + if ($row['DEL_INDEX'] == 0) { + $row['TAS_TITLE'] = $tasTitleDefault; } - $data[] = $row; } $response = array(); diff --git a/workflow/engine/templates/mails/emailList.js b/workflow/engine/templates/mails/emailList.js index 02cfc145f..eb2a0b2b1 100644 --- a/workflow/engine/templates/mails/emailList.js +++ b/workflow/engine/templates/mails/emailList.js @@ -161,8 +161,10 @@ Ext.onReady(function(){ {name : 'DEL_INDEX'}, {name : 'PRO_UID'}, {name : 'TAS_UID'}, + {name : 'APP_NUMBER'}, {name : 'PRO_TITLE'}, {name : 'TAS_TITLE'}, + {name : 'APP_TITLE'}, {name : 'APP_MSG_TYPE'}, {name : 'APP_MSG_SUBJECT'}, {name : 'APP_MSG_FROM'}, @@ -208,6 +210,8 @@ Ext.onReady(function(){ {header: 'DEL_INDEX', dataIndex: 'DEL_INDEX', hidden:true, hideable:false}, {header: 'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false, sortable: false}, {header: 'TAS_UID', dataIndex: 'TAS_UID', hidden:true, hideable:false, sortable: false}, + {header: _('ID_HEADER_NUMBER'), dataIndex: 'APP_NUMBER', width: 40, hidden: false,renderer: columnRenderer, sortable: true}, + {header: _('ID_CASE'), dataIndex: 'APP_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {header: _('ID_TASK'), dataIndex: 'TAS_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {header: _('ID_TYPE'), dataIndex: 'APP_MSG_TYPE', width: 50, hidden: false,renderer: columnRenderer, sortable: true},