X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreNotifyRecur.bjs;h=a2fe7b968bd76a34135fe23b823661217c9ede4e;hp=e9223d1befbc695bde1abb88c807ec5892bba2d2;hb=8cd2a9237c684aa16bc21e3ac6d3793c49c65400;hpb=ae723ce9495d8edab37b72ad8d6098067be980d3

diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs
index e9223d1b..a2fe7b96 100644
--- a/Pman.Dialog.CoreNotifyRecur.bjs
+++ b/Pman.Dialog.CoreNotifyRecur.bjs
@@ -13,7 +13,6 @@
   "157e432ec303efd7d537b653cb255ccc" : "on day(s)",
   "236df51bb0e6416236e255b528346fca" : "Timezone",
   "44c68bed631ff6e62aecc4a4d32176e6" : "Select timezone",
-  "867343577fa1f33caa632a19543bd252" : "Keywords",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "b26686c0a708faee42861d8b905e882e" : "Last Sent",
   "c1d32776cd2d2afcd2c45a52f58679f4" : "Modify Recurrent Notifications",
@@ -30,11 +29,11 @@
     "show" : "function (_self)\n{\n    _this.grid.ds.load({});\n}"
    },
    "modal" : true,
-   "title" : "Modify Recurrent Notifications",
    "xtype" : "LayoutDialog",
+   "title" : "Modify Recurrent Notifications",
    "width" : 800,
    "$ xns" : "Roo",
-   "resizable" : false,
+   "resizable" : true,
    "height" : 550,
    "items" : [
     {
@@ -48,9 +47,9 @@
      "listeners" : {
       "|activate" : "function() {\n _this.panel = this;\n    if (_this.grid) {\n//        _this.grid.footer.onClick('first');\n    }\n}"
      },
+     "region" : "center",
      "fitToFrame" : true,
      "background" : false,
-     "region" : "center",
      "title" : "core_notify_recur",
      "xtype" : "GridPanel",
      "fitContainer" : true,
@@ -59,7 +58,6 @@
      "items" : [
       {
        "listeners" : {
-        "cellclick" : "function (_self, rowIndex, columnIndex, e)\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}"
        },
@@ -83,8 +81,8 @@
          "items" : [
           {
            "$ url" : "baseURL + '/Roo/core_notify_recur.php'",
-           "method" : "GET",
            "xtype" : "HttpProxy",
+           "method" : "GET",
            "$ xns" : "Roo.data",
            "* prop" : "proxy"
           },
@@ -132,8 +130,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Type",
          "width" : 120,
+         "header" : "Type",
          "$ renderer" : "function(v,x,r) {\n     return String.format('{0}', r.data.method_id_display_name); \n}",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -179,8 +177,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Roo/core_enum.php'",
-                 "method" : "GET",
                  "xtype" : "HttpProxy",
+                 "method" : "GET",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -203,8 +201,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "From",
          "width" : 75,
+         "header" : "From",
          "$ renderer" : "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -226,8 +224,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Until",
          "width" : 75,
+         "header" : "Until",
          "$ renderer" : "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -249,8 +247,8 @@
         },
         {
          "xtype" : "ColumnModel",
+         "width" : 150,
          "header" : "on day(s)",
-         "width" : 100,
          "$ 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,8 +291,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "at Hour(s)",
          "width" : 100,
+         "header" : "at Hour(s)",
          "$ 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[]",
@@ -337,8 +335,8 @@
         },
         {
          "xtype" : "ColumnModel",
-         "header" : "Timezone",
          "width" : 100,
+         "header" : "Timezone",
          "$ renderer" : "function(v) { return String.format('{0}', v); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
@@ -384,8 +382,8 @@
                "items" : [
                 {
                  "$ url" : "baseURL + '/Core/I18n/Timezone.php'\n",
-                 "xtype" : "HttpProxy",
                  "method" : "GET",
+                 "xtype" : "HttpProxy",
                  "$ xns" : "Roo.data",
                  "* prop" : "proxy"
                 },
@@ -408,18 +406,9 @@
         },
         {
          "xtype" : "ColumnModel",
-         "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) { return String.format('{0}', v ? v : ''); }",
+         "$ renderer" : "function(v) { return String.format('{0}', v ? v : 'never'); }",
          "$ xns" : "Roo.grid",
          "* prop" : "colModel[]",
          "dataIndex" : "last_event_id"