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 c818aad..c0746b0 100644 (file)
--- a/Pman.Tab.AdminLogDrill.bjs
+++ b/Pman.Tab.AdminLogDrill.bjs
@@ -382,7 +382,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "beforeload": "function (_self, o)\n{\n     if (! _this.dategrid) {\n         return;\n    }\n    \n    o.params = o.params || {};\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.detailgrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    \n    o.params.person_id = s.data.person_id;    \n    \n    var s = _this.tablegrid.selModel.getSelected();\n    if (!s) {\n        _this.detailgrid.view.el.mask(\"Select a table\");\n        return false;\n    }\n    o.params.person_id = s.data.on_table;        \n    \n    _this.detailgrid.view.el.unmask();\n \n\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\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    o.params = o.params || {};\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.detailgrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    \n    o.params.person_id = s.data.person_id;    \n    \n    var s = _this.tablegrid.selModel.getSelected();\n    if (!s) {\n        _this.detailgrid.view.el.mask(\"Select a table\");\n        return false;\n    }\n    o.params.person_id = s.data.on_table;        \n    \n    _this.detailgrid.view.el.unmask();\n \n\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\n    //o.params['query[table_d]'] = 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 9abcd40..6f9f857 100644 (file)
--- a/Pman.Tab.AdminLogDrill.js
+++ b/Pman.Tab.AdminLogDrill.js
@@ -961,7 +961,7 @@ Pman.Tab.AdminLogDrill = new Roo.util.Observable({
                                             o.params['query[to]'] = act.format('Y-m-d');
                                         }
                                     
-                                        o.params['query[table_sum]'] = 1;
+                                        //o.params['query[table_d]'] = 1;
                                         o.params._columns = 'on_table,qty,uqty';