Pman.Tab.AdminLogDrill.bjs

Pman.Tab.AdminLogDrill.bjs
Pman.Tab.AdminLogDrill.js
Pman.Tab.AdminLogDrill.js

diff --git a/Pman.Tab.AdminLogDrill.bjs b/Pman.Tab.AdminLogDrill.bjs
index 9d0778c..1e681fc 100644 (file)
--- a/Pman.Tab.AdminLogDrill.bjs
+++ b/Pman.Tab.AdminLogDrill.bjs
@@ -170,7 +170,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "beforeload": "function (_self, o)\n{\n     if (! _this.dategrid) {\n     return;\n    }\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.tablegrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    _this.tablegrid.view.el.unmask();\n \n    o.params = o.params || {};\n     \n \n    act = _this.dateFrom.getValue();\n    if (act.format) {\n        o.params['query[from]'] = act.format('Y-m-d');\n    }\n    act = _this.dateTo.getValue();\n    if (act.format) {\n        o.params['query[to]'] = act.format('Y-m-d');\n    }\n    o.params.person_id = s.data.person_id;\n    o.params['query[table_sum]'] = 1;\n    o.params._columns = 'on_table,qty,uqty';\n\n    \n}"
+                                                "beforeload": "function (_self, o)\n{\n     if (! _this.dategrid) {\n     return;\n    }\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.tablegrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    _this.tablegrid.view.el.unmask();\n \n    o.params = o.params || {};\n    var act = _this.actionSel.getValue();\n    if (act.length) {\n        o.params.action = act;\n    }\n    var tbl = _this.affectSel.getValue();\n    if (tbl.length) {\n        o.params.on_table = tbl;\n    }\n \n    act = _this.dateFrom.getValue();\n    if (act.format) {\n        o.params['query[from]'] = act.format('Y-m-d');\n    }\n    act = _this.dateTo.getValue();\n    if (act.format) {\n        o.params['query[to]'] = act.format('Y-m-d');\n    }\n    o.params.person_id = s.data.person_id;\n    o.params['query[table_sum]'] = 1;\n    o.params._columns = 'on_table,qty,uqty';\n\n    \n}"
                                             },
                                             "*prop": "dataSource",
                                             "remoteSort": true,

diff --git a/Pman.Tab.AdminLogDrill.js b/Pman.Tab.AdminLogDrill.js
index 22cae20..01acfb9 100644 (file)
--- a/Pman.Tab.AdminLogDrill.js
+++ b/Pman.Tab.AdminLogDrill.js
@@ -360,7 +360,14 @@ Pman.Tab.AdminLogDrill = new Roo.util.Observable({
                                         _this.tablegrid.view.el.unmask();
                                      
                                         o.params = o.params || {};
-                                         
+                                        var act = _this.actionSel.getValue();
+                                        if (act.length) {
+                                            o.params.action = act;
+                                        }
+                                        var tbl = _this.affectSel.getValue();
+                                        if (tbl.length) {
+                                            o.params.on_table = tbl;
+                                        }
                                      
                                         act = _this.dateFrom.getValue();
                                         if (act.format) {