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 e8cca2b..c818aad 100644 (file)
--- a/Pman.Tab.AdminLogDrill.bjs
+++ b/Pman.Tab.AdminLogDrill.bjs
@@ -381,9 +381,12 @@
                                     "|xns": "Roo.grid",
                                     "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}"
+                                            },
                                             "*prop": "dataSource",
-                                            "xtype": "Store",
                                             "remoteSort": true,
+                                            "xtype": "Store",
                                             "|sortInfo": "{ field : 'person_name', direction: 'ASC' }",
                                             "|xns": "Roo.data",
                                             "items": [

diff --git a/Pman.Tab.AdminLogDrill.js b/Pman.Tab.AdminLogDrill.js
index af20afa..9abcd40 100644 (file)
--- a/Pman.Tab.AdminLogDrill.js
+++ b/Pman.Tab.AdminLogDrill.js
@@ -923,6 +923,50 @@ Pman.Tab.AdminLogDrill = new Roo.util.Observable({
                             dataSource : {
                                 xtype: 'Store',
                                 xns: Roo.data,
+                                listeners : {
+                                    beforeload : function (_self, o)
+                                    {
+                                         if (! _this.dategrid) {
+                                             return;
+                                        }
+                                        
+                                        o.params = o.params || {};
+                                        
+                                        var s = _this.dategrid.selModel.getSelected();
+                                        if (!s) {
+                                            _this.detailgrid.view.el.mask("Select a person");
+                                            return false;
+                                        }
+                                        
+                                        o.params.person_id = s.data.person_id;    
+                                        
+                                        var s = _this.tablegrid.selModel.getSelected();
+                                        if (!s) {
+                                            _this.detailgrid.view.el.mask("Select a table");
+                                            return false;
+                                        }
+                                        o.params.person_id = s.data.on_table;        
+                                        
+                                        _this.detailgrid.view.el.unmask();
+                                     
+                                    
+                                         
+                                     
+                                        act = _this.dateFrom.getValue();
+                                        if (act.format) {
+                                            o.params['query[from]'] = act.format('Y-m-d');
+                                        }
+                                        act = _this.dateTo.getValue();
+                                        if (act.format) {
+                                            o.params['query[to]'] = act.format('Y-m-d');
+                                        }
+                                    
+                                        o.params['query[table_sum]'] = 1;
+                                        o.params._columns = 'on_table,qty,uqty';
+                                    
+                                        
+                                    }
+                                },
                                 remoteSort : true,
                                 sortInfo : { field : 'person_name', direction: 'ASC' },
                                 proxy : {