fernando/luos
1
0
Fork 0
Code Releases Activity

Refactoring the translation calls for the ext based cases list, removing the no longer necessarely G::loadTranslation calls, and fixing the translation configuration save

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2011-02-17 15:40:35 +00:00
parent 987ae73936
commit 28938f2473
3 changed files with 649 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -96,40 +96,6 @@
$oHeadPublisher->assign( 'allUsersValues',$allUsers); //sending the columns to display in grid
$TRANSLATIONS['LABEL_GRID_LOADING'] = G::LoadTranslation('ID_CASES_LIST_GRID_LOADING');
$TRANSLATIONS['LABEL_REFRESH'] = G::LoadTranslation('ID_REFRESH_LABEL');
$TRANSLATIONS['MESSAGE_REFRESH'] = G::LoadTranslation('ID_REFRESH_MESSAGE');
$TRANSLATIONS['LABEL_OPT_READ'] = G::LoadTranslation('ID_OPT_READ');
$TRANSLATIONS['LABEL_OPT_UNREAD'] = G::LoadTranslation('ID_OPT_UNREAD');
$TRANSLATIONS['LABEL_OPT_ALL'] = G::LoadTranslation('ID_OPT_ALL');
$TRANSLATIONS['LABEL_OPT_STARTED'] = G::LoadTranslation('ID_OPT_STARTED');
$TRANSLATIONS['LABEL_OPT_COMPLETED'] = G::LoadTranslation('ID_OPT_COMPLETED');
$TRANSLATIONS['LABEL_EMPTY_PROCESSES'] = G::LoadTranslation('ID_EMPTY_PROCESSES');
$TRANSLATIONS['LABEL_EMPTY_USERS'] = G::LoadTranslation('ID_EMPTY_USERS');
$TRANSLATIONS['LABEL_EMPTY_SEARCH'] = G::LoadTranslation('ID_EMPTY_SEARCH');
$TRANSLATIONS['LABEL_EMPTY_CASE'] = G::LoadTranslation('ID_EMPTY_CASE');
$TRANSLATIONS['LABEL_SEARCH'] = G::LoadTranslation('ID_SEARCH');
$TRANSLATIONS['LABEL_OPT_JUMP'] = G::LoadTranslation('ID_OPT_JUMP');
$TRANSLATIONS['LABEL_DISPLAY_ITEMS'] = G::LoadTranslation('ID_DISPLAY_ITEMS');
$TRANSLATIONS['LABEL_DISPLAY_EMPTY'] = G::LoadTranslation('ID_DISPLAY_EMPTY');
$TRANSLATIONS['LABEL_OPEN_CASE'] = G::LoadTranslation('ID_OPEN_CASE');
$TRANSLATIONS['LABEL_ACTIONS'] = G::LoadTranslation('ID_ACTIONS');
$TRANSLATIONS['LABEL_CHECK_ALL'] = G::LoadTranslation('ID_CHECK_ALL');
$TRANSLATIONS['LABEL_UN_CHECK_ALL'] = G::LoadTranslation('ID_UN_CHECK_ALL');
$TRANSLATIONS['LABEL_REASSIGN'] = G::LoadTranslation('ID_REASSIGN');
$TRANSLATIONS2 = G::getTranslations(Array(
'ID_CASESLIST_APP_UID', 'ID_CONFIRM', 'ID_MSG_CONFIRM_DELETE_CASES', 'ID_DELETE', 'ID_REASSIGN',
'ID_VIEW', 'ID_UNPAUSE', 'ID_PROCESSING', 'ID_CONFIRM_UNPAUSE_CASE',
'ID_PROCESS', 'ID_STATUS', 'ID_USER', 'ID_DELEGATE_DATE_FROM', 'ID_TO', 'ID_FILTER_BY_DELEGATED_DATE',
'ID_TO_DO', 'ID_DRAFT', 'ID_COMPLETED', 'ID_CANCELLED', 'ID_PAUSED',
'ID_PRO_DESCRIPTION', 'ID_PRO_TITLE', 'ID_CATEGORY', 'ID_STATUS', 'ID_PRO_USER', 'ID_PRO_CREATE_DATE', 'ID_PRO_DEBUG', 'ID_INBOX', 'ID_DRAFT',
'ID_COMPLETED', 'ID_CANCELLED', 'ID_TOTAL_CASES', 'ID_ENTER_SEARCH_TERM', 'ID_ACTIVATE', 'ID_DEACTIVATE',
'ID_SELECT', 'ID_SEARCH', 'ID_NO_SELECTION_WARNING', 'ID_SELECT_ONE_AT_LEAST', 'ID_MSG_CONFIRM_DELETE_CASES2',
'ID_PAUSE_CASE_TO_DATE', 'ID_DELETING_ELEMENTS', 'ID_MSG_CONFIRM_CANCEL_CASE', 'ID_MSG_CONFIRM_CANCEL_CASES',
'ID_OPEN_CASE', 'ID_PAUSE_CASE', 'ID_REASSIGN', 'ID_DELETE', 'ID_CANCEL', 'ID_UNPAUSE_CASE','ID_MSG_CONFIRM_DELETE_CASE'
));
//menu permissions
/*$c = new Criteria('workflow');
@@ -143,10 +109,6 @@
$menuPerms = $menuPerms . ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) ? 'R': ''; //can reassign case
$menuPerms = $menuPerms . ($cnt == 1) ? 'C': ''; //can cancel case
$TRANSLATIONS = array_merge($TRANSLATIONS, $TRANSLATIONS2);
$oHeadPublisher->assign( 'TRANSLATIONS', $TRANSLATIONS); //translations
$oHeadPublisher->assign( '___p34315105', $menuPerms); // user menu permissions
$oHeadPublisher->addExtJsScript('cases/casesList', false ); //adding a javascript file .js
@@ -684,8 +646,8 @@
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
// $caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'), 'dataIndex' => 'APP_STATUS', 'width' => 50 );
$caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120, 'hidden'=> true );
$caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'TAS_UID', 'width' => 120, 'hidden'=> true );
$caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120, 'hidden'=> true, 'hideable'=> false );
$caseColumns[] = array( 'header' => 'Reassigned Uid', 'dataIndex' => 'TAS_UID', 'width' => 120, 'hidden'=> true, 'hideable'=> false );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_REASSIGN_TO'),'dataIndex' => 'APP_REASSIGN_USER', 'width' => 170 );
$caseReaderFields = array();

4
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -99,7 +99,7 @@
if ( !is_array($confCasesList) ) {
$rows = getDefaultFields( $action );
$result = genericJsonResponse( '', array(), $rows , 20, '' );
$conf->saveObject($result,'casesList',$action,'','','');
//$conf->saveObject($result,'casesList',$action,'','','');
}
// add the process filter
@@ -519,10 +519,8 @@
$rows[] = $fields['APP_PRO_TITLE'];
$rows[] = $fields['APP_TAS_TITLE'];
$rows[] = $fields['APP_CURRENT_USER'];
// $rows[] = $fields['APP_DEL_PREVIOUS_USER'];
$rows[] = $fields['APP_UPDATE_DATE'];
$rows[] = $fields['APP_STATUS'];
// $rows[] = $fields['USR_UID'];
break;

55
workflow/engine/templates/cases/casesList.js
View File

@@ -12,7 +12,7 @@ new Ext.KeyMap(document, {
storeCases.reload();
}
else
Ext.Msg.alert(TRANSLATIONS.LABEL_REFRESH, TRANSLATIONS.MESSAGE_REFRESH);
Ext.Msg.alert(TRANSLATIONS.ID_REFRESH_LABEL, TRANSLATIONS.ID_REFRESH_MESSAGE);
}
});
@@ -33,7 +33,7 @@ function openCase(){
var caseTitle = (rowModel.data.APP_TITLE) ? rowModel.data.APP_TITLE : rowModel.data.APP_UID;
Ext.Msg.show({
msg: TRANSLATIONS.LABEL_OPEN_CASE + ' ' + caseTitle,
msg: TRANSLATIONS.ID_OPEN_CASE + ' ' + caseTitle,
width:300,
wait:true,
waitConfig: {interval:200}
@@ -329,7 +329,7 @@ Ext.onReady ( function() {
});
var btnCloseReassign = new Ext.Button ({
text: 'Close',
text: TRANSLATIONS.ID_CLOSE,
// text: TRANSLATIONS.LABEL_SELECT_ALL,
handler: function(){
newPopUp.hide();
@@ -337,7 +337,8 @@ Ext.onReady ( function() {
});
var btnExecReassign = new Ext.Button ({
text: 'Reassign All',
text: TRANSLATIONS.ID_REASSIGN_ALL,
// text: 'Reassign All',
// text: TRANSLATIONS.LABEL_SELECT_ALL,
handler: function(){
@@ -369,7 +370,8 @@ Ext.onReady ( function() {
});
var btnExecReassignSelected = new Ext.Button ({
text: 'Reassign',
text: TRANSLATIONS.ID_REASSIGN,
// text: 'Reassign',
// text: TRANSLATIONS.LABEL_SELECT_ALL,
handler: function(){
newPopUp.hide();
@@ -513,7 +515,7 @@ Ext.onReady ( function() {
// creating the button for filters
var btnRead = new Ext.Button ({
id: 'read',
text: TRANSLATIONS.LABEL_OPT_READ,
text: TRANSLATIONS.ID_OPT_READ,
enableToggle: true,
toggleHandler: onItemToggle,
allowDepress: false,
@@ -522,7 +524,7 @@ Ext.onReady ( function() {
var btnUnread = new Ext.Button ({
id: 'unread',
text: TRANSLATIONS.LABEL_OPT_UNREAD,
text: TRANSLATIONS.ID_OPT_UNREAD,
enableToggle: true,
toggleHandler: onItemToggle,
allowDepress: false,
@@ -531,7 +533,7 @@ Ext.onReady ( function() {
var btnAll = new Ext.Button ({
id: 'all',
text: TRANSLATIONS.LABEL_OPT_ALL,
text: TRANSLATIONS.ID_OPT_ALL,
enableToggle: true,
toggleHandler: onItemToggle,
allowDepress: false,
@@ -541,7 +543,7 @@ Ext.onReady ( function() {
var btnStarted = new Ext.Button ({
id: 'started',
// text: 'started by me',
text: TRANSLATIONS.LABEL_OPT_STARTED,
text: TRANSLATIONS.ID_OPT_STARTED,
enableToggle: true,
toggleHandler: onItemToggle,
allowDepress: true,
@@ -551,7 +553,7 @@ Ext.onReady ( function() {
var btnCompleted = new Ext.Button ({
id: 'completed',
// text: 'Completed by me',
text: TRANSLATIONS.LABEL_OPT_COMPLETED,
text: TRANSLATIONS.ID_OPT_COMPLETED,
enableToggle: true,
toggleHandler: onItemToggle,
allowDepress: true,
@@ -566,7 +568,7 @@ Ext.onReady ( function() {
displayField : 'APP_PRO_TITLE',
valueField : 'PRO_UID',
forceSelection: false,
emptyText: TRANSLATIONS.LABEL_EMPTY_PROCESSES,
emptyText: TRANSLATIONS.ID_EMPTY_PROCESSES,
selectOnFocus: true,
@@ -604,7 +606,7 @@ Ext.onReady ( function() {
forceSelection: true,
triggerAction: 'all',
emptyText: TRANSLATIONS.LABEL_EMPTY_USERS,
emptyText: TRANSLATIONS.ID_EMPTY_USERS,
selectOnFocus: true,
//getListParent: function() {
// return this.el.up('.x-menu');
@@ -635,7 +637,8 @@ Ext.onReady ( function() {
});
var btnSelectAll = new Ext.Button ({
text: TRANSLATIONS.LABEL_CHECK_ALL, // 'Check All',
text: TRANSLATIONS.CHECK_ALL,
// text: 'Check All',
// text: TRANSLATIONS.LABEL_SELECT_ALL,
handler: function(){
grid.getSelectionModel().selectAll();
@@ -643,7 +646,8 @@ Ext.onReady ( function() {
});
var btnUnSelectAll = new Ext.Button ({
text: TRANSLATIONS.LABEL_UN_CHECK_ALL, // 'Un-Check All',
text: TRANSLATIONS.UNCHECK_ALL,
// text: 'Un-Check All',
// text: TRANSLATIONS.LABEL_UNSELECT_ALL,
handler: function(){
grid.getSelectionModel().clearSelections();
@@ -651,7 +655,8 @@ Ext.onReady ( function() {
});
var btnReassign = new Ext.Button ({
text: TRANSLATIONS.LABEL_REASSIGN, // 'Reassign',
text: TRANSLATIONS.ID_REASSIGN,
// text: 'Reassign',
// text: TRANSLATIONS.LABEL_UNSELECT_ALL,
handler: function(){
reassign();
@@ -683,7 +688,7 @@ Ext.onReady ( function() {
plain:true,
items:[nav],
buttons:[{
text:'submit',
text: TRANSLATIONS.ID_SUBMIT,
handler:function(){
Ext.Msg.alert('OK','save ?');
Ext.Msg.prompt('Name','please enter your name: ',function(btn,text){
@@ -693,7 +698,7 @@ Ext.onReady ( function() {
});
}
}, {
text:'close',
text: TRANSLATIONS.ID_CLOSE,
handler:function() {
reassignPopup.hide();
}
@@ -741,7 +746,7 @@ Ext.onReady ( function() {
valueField : 'USR_UID',
mode : 'local',
forceSelection: false,
emptyText: 'Select',
emptyText: TRANSLATIONS.ID_SELECT,
selectOnFocus: true,
typeAhead: true,
@@ -770,7 +775,7 @@ Ext.onReady ( function() {
allowBlank: true,
ctCls:'pm_search_text_field',
width: 150,
emptyText: TRANSLATIONS.LABEL_EMPTY_SEARCH,
emptyText: TRANSLATIONS.ID_EMPTY_SEARCH,
listeners: {
specialkey: function(f,e){
if (e.getKey() == e.ENTER) {
@@ -781,7 +786,7 @@ Ext.onReady ( function() {
});
var btnSearch = new Ext.Button ({
text: TRANSLATIONS.LABEL_SEARCH,
text: TRANSLATIONS.ID_SEARCH,
handler: doSearch
});
@@ -821,7 +826,7 @@ Ext.onReady ( function() {
};
var btnJump = new Ext.Button ({
text: TRANSLATIONS.LABEL_OPT_JUMP,
text: TRANSLATIONS.ID_OPT_JUMP,
handler: function(){
var caseNumber = parseFloat(Ext.util.Format.trim(Ext.getCmp('textJump').getValue()));
if (caseNumber){
@@ -978,7 +983,7 @@ Ext.onReady ( function() {
var toolbarTodo = [
{
xtype: 'tbsplit',
text: TRANSLATIONS.LABEL_ACTIONS, // 'Actions',
text: TRANSLATIONS.ID_ACTIONS,
menu: menuItems,
listeners: { menushow: enableDisableMenuOption }
},
@@ -1048,7 +1053,7 @@ Ext.onReady ( function() {
var toolbarDraft = [
{
xtype: 'tbsplit',
text: TRANSLATIONS.LABEL_ACTIONS, // 'Actions',
text: TRANSLATIONS.ID_ACTIONS,
menu: menuItems,
listeners: { menushow: enableDisableMenuOption }
},
@@ -1204,8 +1209,8 @@ Ext.onReady ( function() {
store: storeCases,
displayInfo: true,
//displayMsg: 'Displaying items {0} - {1} of {2} ' + '   ' ,
displayMsg: TRANSLATIONS.LABEL_DISPLAY_ITEMS + '   ',
emptyMsg: TRANSLATIONS.LABEL_DISPLAY_EMPTY
displayMsg: TRANSLATIONS.ID_DISPLAY_ITEMS + '   ',
emptyMsg: TRANSLATIONS.ID_DISPLAY_EMPTY
})
});