fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMC-974: Back Button: Use the filters saved and add the button return

Browse Source 
complete icon, and validations for filters

remove d character

clean code

remove extra line

solve
This commit is contained in:
Rodrigo Quelca
2019-07-23 08:41:16 -04:00
committed by Julio Cesar Laura Avendaño
parent 214c3f4491
commit 77050d255e
10 changed files with 152 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -23873,6 +23873,12 @@ msgstr "Show Dirs"
msgid "Show or hide the Cases Steps"
msgstr "Show or hide the Cases Steps"
# TRANSLATION
# LABEL/ID_SHOW_RETURN_ADVANCED_SEARCH
#: LABEL/ID_SHOW_RETURN_ADVANCED_SEARCH
msgid "Return to Advanced Search"
msgstr "Return to Advanced Search"
# TRANSLATION
# LABEL/ID_SIGN_IN
#: LABEL/ID_SIGN_IN

1
workflow/engine/data/mysql/insert.sql
View File

@@ -60864,6 +60864,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SHOW_CASES_NOTES','en','Show Case Notes','2014-01-15') ,
( 'LABEL','ID_SHOW_DIRS','en','Show Dirs','2014-01-15') ,
( 'LABEL','ID_SHOW_HIDE_CASES_STEPS','en','Show or hide the Cases Steps','2014-01-15') ,
( 'LABEL','ID_SHOW_RETURN_ADVANCED_SEARCH','en','Return to Advanced Search','2017-07-23') ,
( 'LABEL','ID_SIGN_IN','en','Sign In','2014-01-15') ,
( 'LABEL','ID_SIGN_OUT','en','Sign out','2014-01-15') ,
( 'LABEL','ID_SIMPLE_REPORT','en','Simple Report','2014-01-15') ,

3
workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css
View File

@@ -717,6 +717,9 @@ antes funcionaba.
width:15px !important;
height:15px !important;
}
.ICON_RETURN {
background-image: url(/images/baseline_arrow_back_black_18dp.png) !important;
}
.ICON_CASES_NOTES {
/*ss_comment*/
background-image:url( /images/icons_silk/sprites.png) !important;

3
workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css
View File

@@ -848,6 +848,9 @@ antes funcionaba.
width: 15px !important;
height: 15px !important;
}
.ICON_RETURN {
background-image: url(/skins/neoclassic/images/baseline_arrow_back_black_18dp.png) !important;
}
.ICON_CASES_NOTES {
/*ss_comment*/

3
workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css
View File

@@ -742,6 +742,9 @@ antes funcionaba.
width:15px !important;
height:15px !important;
}
.ICON_RETURN {
background-image: url(/images/baseline_arrow_back_black_18dp.png) !important;
}
.ICON_CASES_NOTES {
/*ss_comment*/
background-image:url( /images/icons_silk/sprites.png) !important;

3
workflow/engine/skinEngine/uxs/css/pmos-xtheme-gray.css
View File

@@ -714,6 +714,9 @@ antes funcionaba.
width:15px !important;
height:15px !important;
}
.ICON_RETURN {
background-image: url(/images/baseline_arrow_back_black_18dp.png) !important;
}
.ICON_CASES_NOTES {
/*ss_comment*/
background-image:url( /images/icons_silk/sprites.png) !important;

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

@@ -978,25 +978,6 @@ Ext.onReady ( function() {
'</div></tpl>'
);
Ext.Ajax.request({
url : 'casesList_Ajax',
params : {
actionAjax : 'processListExtJs',
action: action,
CATEGORY_UID: filterCategory
},
success: function ( result, request ) {
processValues = Ext.util.JSON.decode(result.responseText);
suggestProcess.getStore().removeAll();
suggestProcess.getStore().loadData(processValues);
},
failure: function ( result, request) {
if (typeof(result.responseText) != 'undefined') {
Ext.MessageBox.alert(_('ID_FAILED'), result.responseText);
}
}
});
processProxy = new Ext.data.HttpProxy( {
url : 'casesList_Ajax?actionAjax=processListExtJs&action='+action,
method : 'POST'
@@ -1450,7 +1431,12 @@ Ext.onReady ( function() {
searchText = textSearch.getValue();
storeCases.setBaseParam('dateFrom', dateFrom.getValue());
storeCases.setBaseParam('dateTo', dateTo.getValue());
storeCases.setBaseParam( 'search', searchText);
storeCases.setBaseParam('search', searchText);
if ( action === 'search' ) {
storeCases.setBaseParam('doSearch', true);
storeCases.setBaseParam('process_label', suggestProcess.getRawValue());
storeCases.setBaseParam('user_label', suggestUser.getRawValue());
}
storeCases.load({params:{ start : 0 , limit : pageSize }});
if ( action === 'search' ){
showLoadingDialog();
@@ -2506,13 +2492,34 @@ Ext.onReady ( function() {
storeCases.setBaseParam("search", textSearch.getValue());
break;
case "search":
storeCases.setBaseParam("category", "");
storeCases.setBaseParam("process", "");
storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
storeCases.setBaseParam("columnSearch", comboColumnSearch.store.getAt(0).get(comboColumnSearch.valueField));
storeCases.setBaseParam("search", textSearch.getValue());
storeCases.setBaseParam("dateFrom", dateFrom.getValue());
storeCases.setBaseParam("dateTo", dateTo.getValue());
storeCases.setBaseParam("category",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.category ?
filtersValues.advanced.category : ""
);
storeCases.setBaseParam("process",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.process ?
filtersValues.advanced.process : ""
);
storeCases.setBaseParam("filterStatus",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.filterStatus ?
filtersValues.advanced.filterStatus : ""
);
storeCases.setBaseParam("columnSearch",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.columnSearch ?
filtersValues.advanced.columnSearch : ""
);
storeCases.setBaseParam("search",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.search ?
filtersValues.advanced.search : ""
);
storeCases.setBaseParam("dateFrom",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.dateFrom ?
filtersValues.advanced.dateFrom : ""
);
storeCases.setBaseParam("dateTo",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.dateTo ?
filtersValues.advanced.dateTo : ""
);
break;
case "unassigned":
storeCases.setBaseParam("category", "");
@@ -2533,8 +2540,19 @@ Ext.onReady ( function() {
}
storeCases.setBaseParam("action", action);
storeCases.setBaseParam("start", 0);
storeCases.setBaseParam("limit", pageSize);
if (action === "search") {
storeCases.setBaseParam("start",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.start ?
parseInt(filtersValues.advanced.start, 10) : 0
);
storeCases.setBaseParam("limit",
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.limit ?
parseInt(filtersValues.advanced.limit, 10) : pageSize
);
} else {
storeCases.setBaseParam("start", 0);
storeCases.setBaseParam("limit", pageSize);
}
var viewText = Ext.getCmp('casesGrid').getView();
storeCases.removeAll();
@@ -2543,7 +2561,7 @@ Ext.onReady ( function() {
storeCases.load();
} else {
viewText.emptyText = _('ID_ENTER_SEARCH_CRITERIA');
storeCases.load( {params: { first: true}} );
storeCases.load();
}
__OPEN_APPLICATION_UID__ = null;
@@ -2652,20 +2670,68 @@ Ext.onReady ( function() {
catch (e) {
// Nothing to do
}
comboCategory.setValue("");
suggestProcess.setValue("");
comboStatus.setValue("");
comboColumnSearch.setValue("APP_TITLE");
/*----------------------------------********---------------------------------*/
if (typeof valueFilterStatus != 'undefined') {
comboFilterStatus.setValue(valueFilterStatus);
if (action === "search") {
comboCategory.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.category ?
filtersValues.advanced.category : ""
);
// Loading process suggest
suggestProcess.getStore().loadData([{
"PRO_UID": typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.process ?
filtersValues.advanced.process : "",
"PRO_TITLE": typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.process_label ?
filtersValues.advanced.process_label : ""
}]);
suggestProcess.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.process ?
filtersValues.advanced.process : ""
);
comboStatus.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.filterStatus ?
filtersValues.advanced.filterStatus : ""
);
comboColumnSearch.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.columnSearch ?
filtersValues.advanced.columnSearch: ""
);
comboColumnSearch.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.columnSearch ?
filtersValues.advanced.columnSearch : ""
);
textSearch.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.search ?
filtersValues.advanced.search : ""
);
dateFrom.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.dateFrom ?
filtersValues.advanced.dateFrom : ""
);
dateTo.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.dateTo ?
filtersValues.advanced.dateTo : ""
);
// Loading user suggest
suggestUser.getStore().loadData([{
"USR_UID": typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.user ?
filtersValues.advanced.user : "",
"USR_FULLNAME": typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.user_label ?
filtersValues.advanced.user_label : ""
}]);
suggestUser.setValue(
typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.user ?
filtersValues.advanced.user : ""
);
} else {
comboCategory.setValue("");
suggestProcess.setValue("");
comboStatus.setValue("");
comboColumnSearch.setValue("APP_TITLE");
/*----------------------------------********---------------------------------*/
if (typeof valueFilterStatus !== 'undefined') {
comboFilterStatus.setValue(valueFilterStatus);
}
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
if(typeof(comboUser) != 'undefined'){
comboUser.setValue("");
}
function reassign(){
storeReassignCases.removeAll();
var rows = grid.getSelectionModel().getSelections();

27
workflow/engine/templates/cases/open.js
View File

@@ -143,7 +143,9 @@ Ext.onReady(function(){
}
actionMenu.show();
break;
case 'RETURN_ADVANCED_SEARCH':
Ext.getCmp('returnButton').show();
break;
// custom menus from plugins or others
default:
var navPanel = Ext.getCmp('navPanel');
@@ -498,7 +500,24 @@ Ext.onReady(function(){
region: 'center',
layout: 'border',
items: [navPanelWest, navPanelCenter],
tbar: [{
tbar: [
{
id: 'returnButton',
pressed: false,
enableToggle: true,
text: _('ID_RETURN_ADVANCED_SEARCH'),
iconCls: 'button_menu_ext ICON_RETURN',
tooltip: {
title:_('ID_RETURN_ADVANCED_SEARCH'),
text: _('ID_SHOW_RETURN_ADVANCED_SEARCH')
},
toggleHandler: function (btn, pressed) {
if (history) {
history.go(-1);
}
}
},
{
id: 'stepsMenu',
text: '&nbsp;&nbsp;' + _('ID_STEPS'),
pressed: false,
@@ -535,7 +554,8 @@ Ext.onReady(function(){
closeCaseNotesWindow();
}
}
}]
}
]
};
/**
@@ -577,6 +597,7 @@ Ext.onReady(function(){
Ext.getCmp('caseNotes').hide();
Ext.getCmp('informationMenu').hide();
Ext.getCmp('actionMenu').hide();
Ext.getCmp('returnButton').hide();
hideCaseNavigatorPanel();
if(typeof appStatus !== "undefined") {