DataObjects/Core_notify_recur.php

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

diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs
index 654eefc..d866a16 100644 (file)
--- a/Pman.Dialog.CoreNotifyRecur.bjs
+++ b/Pman.Dialog.CoreNotifyRecur.bjs
@@ -13,6 +13,7 @@
   "157e432ec303efd7d537b653cb255ccc" : "on day(s)",
   "236df51bb0e6416236e255b528346fca" : "Timezone",
   "44c68bed631ff6e62aecc4a4d32176e6" : "Select timezone",
+  "867343577fa1f33caa632a19543bd252" : "Keywords",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "b26686c0a708faee42861d8b905e882e" : "Last Sent",
   "c1d32776cd2d2afcd2c45a52f58679f4" : "Modify Recurrent Notifications",
@@ -33,7 +34,7 @@
    "xtype" : "LayoutDialog",
    "width" : 800,
    "$ xns" : "Roo",
-   "resizable" : false,
+   "resizable" : true,
    "height" : 550,
    "items" : [
     {
@@ -58,11 +59,11 @@
      "items" : [
       {
        "listeners" : {
-        "|rowdblclick" : "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) return;\n    _this.dialog.show( this.getDataSource().getAt(rowIndex).data, function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n",
+        "cellclick" : "function (_self, rowIndex, columnIndex, e)\n{\n    var di = this.colModel.getDataIndex(columnIndex);\n    if (di != 'keyword_filters') {\n        return;\n    }\n    \n    var d = this.ds.getAt(rowIndex);\n    \n    if(!d || d.data.id * 1 < 1){\n        return;\n    }\n    \n    Pman.Dialog.CoreNotifyRecurKeywords.show({id : d.data.id}, function(res){\n        _this.grid.ds.load({});\n    });\n    \n}",
         "|render" : "function() \n{\n    _this.grid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.panel.active) {\n    //   this.footer.onClick('first');\n    }\n}",
         "afteredit" : "function (e)\n{\n   e.record.commit();\n}"
        },
-       "autoExpandColumn" : "freq_day",
+       "autoExpandColumn" : "keyword_filters",
        "xtype" : "EditorGrid",
        "loadMask" : true,
        "clicksToEdit" : 1,
@@ -249,7 +250,7 @@
         {
          "xtype" : "ColumnModel",
          "header" : "on day(s)",
-         "width" : 100,
+         "width" : 150,
          "$ renderer" : "function(v,x,r) { \n    \n    if (v.length) {\n     \n        var cm = _this.grid.colModel;\n       \n        var ci = cm.getColumnByDataIndex(this.name);\n       \n         var tv = [];\n        var vals = Roo.decode(v);\n        Roo.each(vals, function(k) {\n            var r = this.findRecord(this.valueField, k);\n            if(r){\n                tv.push(r.data[this.displayField]);\n            }else if(this.valueNotFoundText !== undefined){\n                tv.push( this.valueNotFoundText );\n            }\n        },ci.editor.field);\n\n        r.data[this.name + '_name'] = tv.join(', ');\n        return String.format('{0}',tv.join(', '));\n\n        \n    \n    }\n    r.data[this.name + '_name'] = '';\n    return String.format('{0}', r.data.freq_day_name || v); \n    \n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -293,7 +294,7 @@
         {
          "xtype" : "ColumnModel",
          "header" : "at Hour(s)",
-         "width" : 250,
+         "width" : 100,
          "$ renderer" : "function(v,x,r) { \n    \n \n    if (v.length) {\n     \n        var cm = _this.grid.colModel;\n       \n        var ci = cm.getColumnByDataIndex(this.name);\n       \n         var tv = [];\n        var vals = Roo.decode(v);\n        Roo.each(vals, function(k) {\n            var r = this.findRecord(this.valueField, k);\n            if(r){\n                tv.push(r.data[this.displayField]);\n            }else if(this.valueNotFoundText !== undefined){\n                tv.push( this.valueNotFoundText );\n            }\n        },ci.editor.field);\n\n         r.data[this.name + '_name'] = tv.join(', ');\n        return String.format('{0}',tv.join(', '));\n\n        \n    \n    }\n        r.data[this.name + '_name'] = '';\n    return String.format('{0}', r.data.freq_hour_name || v); \n    \n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -407,12 +408,21 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Last Sent",
          "width" : 75,
+         "header" : "Last Sent",
          "$ renderer" : "function(v) { return String.format('{0}', v ? v : 'never'); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
          "dataIndex" : "last_event_id"
+        },
+        {
+         "xtype" : "ColumnModel",
+         "header" : "Keywords",
+         "width" : 75,
+         "$ renderer" : "function(v,x,r) { \n    return String.format('{0}', v ? r.data.keywords : ''); \n}",
+         "$ xns" : "Roo.grid",
+         "* prop" : "colModel[]",
+         "dataIndex" : "keyword_filters"
         }
        ]
       }