Pman.Dialog.CoreNotifyRecur.bjs

[Pman.Core] / Pman.Dialog.CoreNotifyRecur.bjs

diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs
index 64ba5c0..a3c7055 100644 (file)
--- a/Pman.Dialog.CoreNotifyRecur.bjs
+++ b/Pman.Dialog.CoreNotifyRecur.bjs
@@ -86,7 +86,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "|click": "function()\n{\n    var grid = _this.grid;\n    var r = grid.getDataSource().reader.newRow({\n    // defaults..\n        person_id : _this.data.person_id,\n        dtstart : new Date(),\n        dtend : Date.parseDate('2030-01-01', 'Y-m-d'),\n        tz : 'Asia/Hong Kong',\n        onid : _this.data.onid,\n        ontable : _this.data.ontable,\n        method : _this.data.method,\n        last_event_id : 0,\n        freq_day_name : '',\n        freq_hour_name : '',\n        freq_name : ''\n        \n    \n    });\n    grid.stopEditing();\n    grid.getDataSource().insert(0, r); \n    grid.startEditing(0, 2); \n    \n\n}\n"
+                                                "|click": "function()\n{\n    var grid = _this.grid;\n    var r = grid.getDataSource().reader.newRow({\n    // defaults..\n        person_id : _this.data.person_id,\n        dtstart : new Date(),\n        dtend : Date.parseDate('2050-01-01', 'Y-m-d'),\n        tz : 'Asia/Hong Kong',\n        onid : _this.data.onid,\n        ontable : _this.data.ontable,\n        method : _this.data.method,\n        last_event_id : 0,\n        freq_day_name : '',\n        freq_hour_name : '',\n        freq_name : ''\n        \n    \n    });\n    grid.stopEditing();\n    grid.getDataSource().insert(0, r); \n    grid.startEditing(0, 2); \n    \n\n}\n"
                                             },
                                             "cls": "x-btn-text-icon",
                                             "text": "Add",
@@ -266,11 +266,10 @@
                                                     "emptyText": "Select timezone",
                                                     "fieldLabel": "core_enum",
                                                     "forceSelection": true,
-                                                    "hiddenName": "tz",
                                                     "listWidth": 400,
                                                     "loadingText": "Searching...",
                                                     "minChars": 2,
-                                                    "name": "tz_name",
+                                                    "name": "tz",
                                                     "pageSize": 999,
                                                     "qtip": "Select timezone",
                                                     "queryParam": "q",
@@ -278,7 +277,6 @@
                                                     "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{tz}</b> </div>",
                                                     "triggerAction": "all",
                                                     "typeAhead": true,
-                                                    "valueField": "tz",
                                                     "width": 300,
                                                     "xtype": "ComboBox",
                                                     "|xns": "Roo.form",
@@ -318,13 +316,13 @@
                                     ]
                                 },
                                 {
-                                    "xtype": "ColumnModel",
-                                    "header": "Last event",
-                                    "width": 75,
+                                    "*prop": "colModel[]",
                                     "dataIndex": "last_event_id",
-                                    "|renderer": "function(v) { return String.format('{0}', v); }",
-                                    "|xns": "Roo.grid",
-                                    "*prop": "colModel[]"
+                                    "header": "Last Sent",
+                                    "width": 75,
+                                    "xtype": "ColumnModel",
+                                    "|renderer": "function(v) { return String.format('{0}', v ? v : 'never'); }",
+                                    "|xns": "Roo.grid"
                                 }
                             ]
                         }