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

complete icon, and validations for filters

remove d character

clean code

remove extra line

solve

workflow/engine/content/translations/english/processmaker.en.po

@@ -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

workflow/engine/data/mysql/insert.sql

@@ -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') ,

workflow/engine/skinEngine/base/css/pmos-xtheme-gray.css

@@ -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;

workflow/engine/skinEngine/neoclassic/css/pmos-xtheme-gray.css

@@ -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*/
 

workflow/engine/skinEngine/uxmodern/css/pmos-xtheme-gray.css

@@ -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;

workflow/engine/skinEngine/uxs/css/pmos-xtheme-gray.css

@@ -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;

workflow/engine/templates/cases/casesList.js

@@ -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("category",
-            storeCases.setBaseParam("process", "");
+                typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.category ?
-            storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField));
+                filtersValues.advanced.category : ""
-            storeCases.setBaseParam("columnSearch", comboColumnSearch.store.getAt(0).get(comboColumnSearch.valueField));
+            );
-            storeCases.setBaseParam("search", textSearch.getValue());
+            storeCases.setBaseParam("process", 
-            storeCases.setBaseParam("dateFrom", dateFrom.getValue());
+                typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.process ?
-            storeCases.setBaseParam("dateTo", dateTo.getValue());
+                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);
+    if (action === "search") {
-    storeCases.setBaseParam("limit", pageSize);
+        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
     }
-
+    if (action === "search") {
-    comboCategory.setValue("");
+        comboCategory.setValue(
-    suggestProcess.setValue("");
+            typeof filtersValues !== 'undefined' && filtersValues.advanced && filtersValues.advanced.category ?
-    comboStatus.setValue("");
+            filtersValues.advanced.category : ""
-    comboColumnSearch.setValue("APP_TITLE");
+        );
-    /*----------------------------------********---------------------------------*/
+        // Loading process suggest
-    if (typeof valueFilterStatus != 'undefined') {
+        suggestProcess.getStore().loadData([{
-        comboFilterStatus.setValue(valueFilterStatus);
+            "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();

workflow/engine/templates/cases/open.js

@@ -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: '  ' + _('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") {