Pman.Tab.AdminNotify.bjs

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

diff --git a/Pman.Tab.AdminNotify.bjs b/Pman.Tab.AdminNotify.bjs
index d112083..841aa29 100644 (file)
--- a/Pman.Tab.AdminNotify.bjs
+++ b/Pman.Tab.AdminNotify.bjs
@@ -31,7 +31,7 @@
                     "items" : [
                         {
                             "listeners" : {
-                                "beforeload" : "function (_self, options)\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}"
+                                "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}"
                             },
                             "xtype" : "Store",
                             "remoteSort" : true,
@@ -127,6 +127,48 @@
                                         }
                                     ]
                                 },
+                                {
+                                    "xtype" : "Separator",
+                                    "$ xns" : "Roo.Toolbar"
+                                },
+                                {
+                                    "text" : "From",
+                                    "xtype" : "TextItem",
+                                    "$ xns" : "Roo.Toolbar"
+                                },
+                                {
+                                    "listeners" : {
+                                        "render" : "function (_self)\r\n{\r\n    _this.fromDateSel = _self;\r\n   //_self.setValue(  new Date() );\r\n}",
+                                        "select" : "function (combo, date)\n{\n    _this.grid.footer.onClick('first');\n}"
+                                    },
+                                    "format" : "d/M/Y",
+                                    "xtype" : "DateField",
+                                    "width" : 100,
+                                    "$ xns" : "Roo.form"
+                                },
+                                {
+                                    "xtype" : "Separator",
+                                    "$ xns" : "Roo.Toolbar"
+                                },
+                                {
+                                    "text" : "To",
+                                    "xtype" : "TextItem",
+                                    "$ xns" : "Roo.Toolbar"
+                                },
+                                {
+                                    "listeners" : {
+                                        "render" : "function (_self)\r\n{\r\n    _this.toDateSel = _self;\r\n   //_self.setValue(  new Date() );\r\n}",
+                                        "select" : "function (combo, date)\n{\n    _this.grid.footer.onClick('first');\n}"
+                                    },
+                                    "format" : "d/M/Y",
+                                    "xtype" : "DateField",
+                                    "width" : 100,
+                                    "$ xns" : "Roo.form"
+                                },
+                                {
+                                    "xtype" : "Separator",
+                                    "$ xns" : "Roo.Toolbar"
+                                },
                                 {
                                     "xtype" : "Fill",
                                     "$ xns" : "Roo.Toolbar"
@@ -168,7 +210,7 @@
                             "sortable" : true,
                             "header" : "Method",
                             "width" : 200,
-                            "$ renderer" : "function(v,x,r) \n{ \n    var vv = (typeof(r.data.evtype_align) != 'undefined' && r.data.evtype_align) ? r.data.evtype_align : v;\n    return String.format('{0}', vv ); \n}",
+                            "$ renderer" : "function(v,x,r) \n{ \n    var vv = (typeof(r.data.evtype_align) != 'undefined' && r.data.evtype_align) ? r.data.evtype_align : v;\n    return String.format('<span qtip=\"{0}\">{1}</span>', v, vv ); \n}",
                             "$ xns" : "Roo.grid",
                             "* prop" : "colModel[]",
                             "dataIndex" : "evtype"