Pman.Tab.AdminNotify.bjs

[Pman.Admin] / Pman.Tab.AdminNotify.bjs

diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs
index cb1eec2..1edb8fe 100644 (file)
--- a/Pman.Tab.AdminNotify.bjs
+++ b/Pman.Tab.AdminNotify.bjs
@@ -31,7 +31,7 @@
                     "items" : [
                         {
                             "listeners" : {
-                                "beforeload" : "function (_self, options)\n{\n    options.params = options.params || {};\n    \n    options.params._evtype_align = 1;\n    \n    if (!_this.toggleBtn.pressed) {\n        options.params['event_id'] = 0;\n    }\n    if (!_this.personCombo) {\n        return false;\n    }\n    var p = _this.personCombo.getValue();\n    if (p*1) { \n        options.params.person_id = p;\n    }\n    \n    var from = _this.fromDateSel.getValue();\n    \n    if(from){\n        options.params.from = from.format('Y-m-d');\n    }\n    \n    var to = _this.toDateSel.getValue();\n    \n    if(to){\n        options.params.to = to.format('Y-m-d');\n    }\n}"
+                                "beforeload" : "function (_self, options)\n{\n    options.params = options.params || {};\n    \n    options.params._evtype_align = 1;\n    \n    if (!_this.toggleBtn.pressed) {\n        options.params['event_id'] = 0;\n    }\n    if (!_this.personCombo) {\n        return false;\n    }\n    var p = _this.personCombo.getValue();\n    if (p*1) { \n        options.params.person_id = p;\n    }\n    \n    var from = _this.fromDateSel.getValue();\n    \n    if(from){\n        options.params.from = from.format('Y-m-d');\n    }\n    \n    var to = _this.toDateSel.getValue();\n    \n    if(to){\n        options.params.to = to.format('Y-m-d');\n    }\n    \n    var type = _this.typeCombo.getValue();\n    \n    if(type.length){\n        o.params.evtype = type;\n    }\n}"
                             },
                             "xtype" : "Store",
                             "remoteSort" : true,
@@ -131,7 +131,7 @@
                                 },
                                 {
                                     "listeners" : {
-                                        "render" : "function (_self)\n{\n   _this.evtypeCombo = _self;\n}",
+                                        "render" : "function (_self)\n{\n   _this.typeCombo = _self;\n}",
                                         "select" : "function (combo, record, index)\n{\n   _this.grid.footer.onClick('first');\n}"
                                     },
                                     "listWidth" : 400,
@@ -148,7 +148,6 @@
                                     "editable" : true,
                                     "width" : 200,
                                     "$ xns" : "Roo.form",
-                                    "name" : "name",
                                     "qtip" : "Select type",
                                     "queryParam" : "query[name]",
                                     "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b></div>",
@@ -156,16 +155,16 @@
                                     "items" : [
                                         {
                                             "listeners" : {
-                                                "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    o.params._distinct='person_id';\n    o.params._columns='person_id,person_id_name,person_id_email';\n    o.params['!person_id_name'] = '';\n    \n    // set more here\n}\n"
+                                                "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    o.params.etype = 'Core.NotifyType';\n    o.params.active = 1;\n}\n"
                                             },
                                             "xtype" : "Store",
                                             "remoteSort" : true,
-                                            "$ sortInfo" : "{ direction : 'ASC', field: 'person_id_name' }",
+                                            "$ sortInfo" : "{ direction : 'ASC', field: 'id' }",
                                             "$ xns" : "Roo.data",
                                             "* prop" : "store",
                                             "items" : [
                                                 {
-                                                    "$ url" : "baseURL + '/Roo/core_notify.php'",
+                                                    "$ url" : "baseURL + '/Roo/core_enum.php'",
                                                     "xtype" : "HttpProxy",
                                                     "method" : "GET",
                                                     "$ xns" : "Roo.data",
@@ -176,7 +175,7 @@
                                                     "root" : "data",
                                                     "xtype" : "JsonReader",
                                                     "$ xns" : "Roo.data",
-                                                    "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"ontable\",\"type\":\"string\"}]",
+                                                    "$ fields" : "[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"display_name\",\"type\":\"string\"}]",
                                                     "* prop" : "reader",
                                                     "totalProperty" : "total"
                                                 }