X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.CoreNotifyRecurKeywords.bjs;h=7f90bd4ea63725d65dcff33bd8be1eabd54000ba;hb=61229b70e50bf98a966c52d17bcd81af76369208;hp=5305e2105519a86e9d2fcc79face615e55c40c75;hpb=a43919628d9250fa78edfb9977b080fb59222f03;p=Pman.Core

diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.bjs b/Pman.Dialog.CoreNotifyRecurKeywords.bjs
index 5305e210..7f90bd4e 100644
--- a/Pman.Dialog.CoreNotifyRecurKeywords.bjs
+++ b/Pman.Dialog.CoreNotifyRecurKeywords.bjs
@@ -23,11 +23,11 @@
    "background" : true,
    "title" : "Add Notification Keywords",
    "xtype" : "LayoutDialog",
-   "width" : 400,
+   "width" : 600,
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
-   "height" : 150,
+   "height" : 180,
    "items" : [
     {
      "xtype" : "LayoutRegion",
@@ -44,7 +44,7 @@
      "items" : [
       {
        "listeners" : {
-        "|actioncomplete" : "function (_self, action)\n{\n  if (action.type == 'setdata') {\n        \n        if(_this.data.id){\n            _this.dialog.el.mask(\"Loading\");\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n        }\n        \n        return;\n    }\n    if (action.type == 'load') {\n        _this.dialog.el.unmask();\n        return;\n    }\n    if (action.type == 'submit' ) {\n        _this.dialog.el.unmask();\n        _this.dialog.hide();\n\n        if (_this.callback) {\n           _this.callback.call(_this, action.result.data);\n        }\n        _this.form.reset();\n    }\n}\n",
+        "|actioncomplete" : "function (_self, action)\n{\n  if (action.type == 'setdata') {\n        \n        if(_this.data.id){\n            _this.dialog.el.mask(\"Loading\");\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n        }\n        \n        return;\n    }\n    if (action.type == 'load') {\n        \n        _this.dialog.el.unmask();\n        \n        _this.data = action.result.data;\n        \n        if(typeof(_this.data.keywords) != 'undefined'){\n            var n = Roo.decode(_this.data.keywords);\n            _this.form.findField('keyword_filters').setValue(n);\n        }\n        \n        return;\n    }\n    if (action.type == 'submit' ) {\n        _this.dialog.el.unmask();\n        _this.dialog.hide();\n\n        if (_this.callback) {\n           _this.callback.call(_this, action.result.data);\n        }\n        _this.form.reset();\n    }\n}\n",
         "|rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_notify_recur.php'",
@@ -53,11 +53,6 @@
        "style" : "margin: 5px",
        "$ xns" : "Roo.form",
        "items" : [
-        {
-         "xtype" : "Hidden",
-         "$ xns" : "Roo.form",
-         "name" : "id"
-        },
         {
          "alwaysQuery" : true,
          "listWidth" : 400,
@@ -66,6 +61,7 @@
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,
+         "Number width" : 400,
          "displayField" : "name",
          "emptyText" : "Select Campaign",
          "hiddenName" : "campaign_id",
@@ -76,24 +72,24 @@
          "typeAhead" : false,
          "editable" : true,
          "$ xns" : "Roo.form",
-         "name" : "camapign_id_name",
+         "name" : "campaign_id_name",
          "qtip" : "Select campaign",
-         "queryParam" : "search[name]",
-         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>#{pressrelease_id} - {name}</b></div>",
+         "queryParam" : "query[name]",
+         "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b></div>",
          "loadingText" : "Searching...",
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    // set more here\n    o.params.etype = 'crm_industry';\n    o.params.active  = 1;\n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
-           "$ sortInfo" : "{ direction : 'ASC', field: 'display_name' }",
+           "$ sortInfo" : "{ direction : 'DESC', field: 'id' }",
            "$ xns" : "Roo.data",
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/core_enum.php'",
+             "$ url" : "baseURL + '/Roo/Projects.php'",
              "method" : "GET",
              "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
@@ -104,13 +100,77 @@
              "root" : "data",
              "xtype" : "JsonReader",
              "$ xns" : "Roo.data",
-             "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"etype\",\"type\":\"string\"}]",
+             "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]",
              "* prop" : "reader",
              "totalProperty" : "total"
             }
            ]
           }
          ]
+        },
+        {
+         "Boolean allowBlank" : false,
+         "fieldLabel" : "Keywords",
+         "hiddenName" : "keyword_filters",
+         "xtype" : "ComboBoxArray",
+         "width" : 410,
+         "$ xns" : "Roo.form",
+         "name" : "keyword_filters_name",
+         "items" : [
+          {
+           "alwaysQuery" : true,
+           "listWidth" : 400,
+           "triggerAction" : "all",
+           "fieldLabel" : "Keyword",
+           "forceSelection" : true,
+           "displayField" : "keyword",
+           "minChars" : 2,
+           "valueField" : "id",
+           "xtype" : "ComboBox",
+           "allowBlank" : true,
+           "editable" : true,
+           "width" : 400,
+           "$ xns" : "Roo.form",
+           "* prop" : "combo",
+           "queryParam" : "query[keyword]",
+           "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{keyword}</b> </div>",
+           "items" : [
+            {
+             "listeners" : {
+              "beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    var s = _this.form.findField('campaign_id').getValue() * 1;\n    \n    if(isNaN(s) || s < 1){\n        return false;\n    }\n    \n    o.params.is_active  = 1;\n    o.params.is_keyword = 1;\n    o.params.project_id = s;\n}\n"
+             },
+             "xtype" : "Store",
+             "remoteSort" : true,
+             "$ sortInfo" : "{ direction : 'ASC', field: 'display_name' }",
+             "$ xns" : "Roo.data",
+             "* prop" : "store",
+             "items" : [
+              {
+               "$ url" : "baseURL + '/Roo/clipping_keywords.php'",
+               "xtype" : "HttpProxy",
+               "method" : "GET",
+               "$ xns" : "Roo.data",
+               "* prop" : "proxy"
+              },
+              {
+               "id" : "code",
+               "root" : "data",
+               "xtype" : "JsonReader",
+               "$ fields" : "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"keyword\",\"type\":\"string\"}]",
+               "$ xns" : "Roo.data",
+               "* prop" : "reader",
+               "totalProperty" : "total"
+              }
+             ]
+            }
+           ]
+          }
+         ]
+        },
+        {
+         "xtype" : "Hidden",
+         "$ xns" : "Roo.form",
+         "name" : "id"
         }
        ]
       }
@@ -127,7 +187,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\n\n    var name =     _this.form.findField('name').getValue();\n    name = name.toUpperCase().replace(/[^A-Z]+/g, '');\n    if (!name.length) {\n        Roo.MessageBox.alert(\"Error\",\"Please fill in a valid name\");\n        return;\n    }\n    _this.form.findField('name').setValue(name);\n \n    _this.form.doAction('submit');\n    \n}"
+      "|click" : "function() {\n    \n    _this.form.doAction('submit');\n    \n}"
      },
      "text" : "OK",
      "xtype" : "Button",