From 2a38115acdac2ba798a0f73a9d39d7a72b7e5787 Mon Sep 17 00:00:00 2001 From: Edward Date: Tue, 5 May 2015 11:24:03 +0800 Subject: [PATCH] commit --- DataObjects/Core_notify_recur.php | 40 ---- DataObjects/pman.links.ini | 1 - Pman.Dialog.CoreNotifyRecur.bjs | 37 +-- Pman.Dialog.CoreNotifyRecur.js | 32 +-- Pman.Dialog.CoreNotifyRecurKeywords.bjs | 200 ---------------- Pman.Dialog.CoreNotifyRecurKeywords.js | 306 ------------------------ sql/core_notify_recur.sql | 4 - 7 files changed, 14 insertions(+), 606 deletions(-) delete mode 100644 Pman.Dialog.CoreNotifyRecurKeywords.bjs delete mode 100644 Pman.Dialog.CoreNotifyRecurKeywords.js delete mode 100644 sql/core_notify_recur.sql diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php index 02246062..bd683128 100644 --- a/DataObjects/Core_notify_recur.php +++ b/DataObjects/Core_notify_recur.php @@ -212,44 +212,4 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject $n->delete(DB_DATAOBJECT_WHEREADD_ONLY); } - function toRooSingleArray($authUser, $request) - { - $ret = $this->toArray(); - - if(!empty($ret['keyword_filters'])){ - $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters']))); - - $clipping_keywords = DB_DataObject::factory('clipping_keywords'); - $clipping_keywords->whereAddIn('id', $keywords, 'int'); - - $li = array(); - - foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){ - $li[] = array( - 'id' => $k, - 'keyword' => $v - ); - } - - $ret['keywords'] = json_encode($li); - } - - return $ret; - } - - function toRooArray($request) - { - $ret = $this->toArray(); - - if(!empty($ret['keyword_filters'])){ - $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters']))); - - $clipping_keywords = DB_DataObject::factory('clipping_keywords'); - $clipping_keywords->whereAddIn('id', $keywords, 'int'); - - $ret['keywords'] = implode(',', $clipping_keywords->fetchAll('keyword')); - } - - return $ret; - } } diff --git a/DataObjects/pman.links.ini b/DataObjects/pman.links.ini index e402467c..ba64f6b9 100644 --- a/DataObjects/pman.links.ini +++ b/DataObjects/pman.links.ini @@ -65,7 +65,6 @@ trigger_event_id = Events:id person_id = Person:id last_event_id = Events:id method_id = core_enum:id -campaign_id = Projects:id diff --git a/Pman.Dialog.CoreNotifyRecur.bjs b/Pman.Dialog.CoreNotifyRecur.bjs index d866a163..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,8 +29,8 @@ "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" : true, @@ -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,11 +58,10 @@ "items" : [ { "listeners" : { - "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" : "keyword_filters", + "autoExpandColumn" : "freq_day", "xtype" : "EditorGrid", "loadMask" : true, "clicksToEdit" : 1, @@ -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", - "header" : "on day(s)", "width" : 150, + "header" : "on day(s)", "$ 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,21 +406,12 @@ }, { "xtype" : "ColumnModel", - "width" : 75, "header" : "Last Sent", + "width" : 75, "$ 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" } ] } diff --git a/Pman.Dialog.CoreNotifyRecur.js b/Pman.Dialog.CoreNotifyRecur.js index 0908ebc7..1a09714f 100644 --- a/Pman.Dialog.CoreNotifyRecur.js +++ b/Pman.Dialog.CoreNotifyRecur.js @@ -14,7 +14,6 @@ Pman.Dialog.CoreNotifyRecur = { '157e432ec303efd7d537b653cb255ccc' :"on day(s)", '236df51bb0e6416236e255b528346fca' :"Timezone", '44c68bed631ff6e62aecc4a4d32176e6' :"Select timezone", - '867343577fa1f33caa632a19543bd252' :"Keywords", '1243daf593fa297e07ab03bf06d925af' :"Searching...", 'b26686c0a708faee42861d8b905e882e' :"Last Sent", 'c1d32776cd2d2afcd2c45a52f58679f4' :"Modify Recurrent Notifications", @@ -293,7 +292,7 @@ Pman.Dialog.CoreNotifyRecur = { }, '|xns' : 'Roo.grid', - autoExpandColumn : 'keyword_filters', + autoExpandColumn : 'freq_day', clicksToEdit : 1, loadMask : true, xns : Roo.grid, @@ -702,17 +701,6 @@ Pman.Dialog.CoreNotifyRecur = { width : 75, xns : Roo.grid, xtype : 'ColumnModel' - }, -{ - '|xns' : 'Roo.grid', - dataIndex : 'keyword_filters', - header : _this._strings['867343577fa1f33caa632a19543bd252'], - renderer : function(v,x,r) { - return String.format('{0}', v ? r.data.keywords : ''); - }, - width : 75, - xns : Roo.grid, - xtype : 'ColumnModel' } ], listeners : { @@ -720,24 +708,6 @@ Pman.Dialog.CoreNotifyRecur = { { e.record.commit(); }, - cellclick : function (_self, rowIndex, columnIndex, e) - { - var di = this.colModel.getDataIndex(columnIndex); - if (di != 'keyword_filters') { - return; - } - - var d = this.ds.getAt(rowIndex); - - if(!d || d.data.id * 1 < 1){ - return; - } - - Pman.Dialog.CoreNotifyRecurKeywords.show({id : d.data.id}, function(res){ - _this.grid.ds.load({}); - }); - - }, render : function() { _this.grid = this; diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.bjs b/Pman.Dialog.CoreNotifyRecurKeywords.bjs deleted file mode 100644 index 7f90bd4e..00000000 --- a/Pman.Dialog.CoreNotifyRecurKeywords.bjs +++ /dev/null @@ -1,200 +0,0 @@ -{ - "name" : "Pman.Dialog.CoreNotifyRecurKeywords", - "parent" : "", - "title" : "", - "path" : "/home/edward/gitlive/Pman.Core/Pman.Dialog.CoreNotifyRecurKeywords.bjs", - "permname" : "", - "modOrder" : "001", - "strings" : { - "0ee0f676f631ad4e8a5844314a3a20de" : "Select campaign", - "1243daf593fa297e07ab03bf06d925af" : "Searching...", - "ea4788705e6873b424c65e91c2846b19" : "Cancel", - "e0aa021e21dddbd6d8cecec71e9cf564" : "OK", - "790f855c2139f2faecb810519e90b833" : "Add Notification Keywords", - "ded4cba1b04eb8236e24a3e39470d8a7" : "Select Campaign" - }, - "items" : [ - { - "listeners" : { - "show" : "function (_self)\n{\n \n}" - }, - "modal" : true, - "collapsible" : false, - "background" : true, - "title" : "Add Notification Keywords", - "xtype" : "LayoutDialog", - "width" : 600, - "$ xns" : "Roo", - "closable" : false, - "resizable" : false, - "height" : 180, - "items" : [ - { - "xtype" : "LayoutRegion", - "$ xns" : "Roo", - "titlebar" : false, - "* prop" : "center" - }, - { - "region" : "center", - "fitToFrame" : true, - "background" : true, - "xtype" : "ContentPanel", - "$ xns" : "Roo", - "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 \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'", - "xtype" : "Form", - "method" : "POST", - "style" : "margin: 5px", - "$ xns" : "Roo.form", - "items" : [ - { - "alwaysQuery" : true, - "listWidth" : 400, - "triggerAction" : "all", - "fieldLabel" : "Campaign", - "forceSelection" : true, - "selectOnFocus" : true, - "pageSize" : 20, - "Number width" : 400, - "displayField" : "name", - "emptyText" : "Select Campaign", - "hiddenName" : "campaign_id", - "minChars" : 2, - "valueField" : "id", - "xtype" : "ComboBox", - "allowBlank" : false, - "typeAhead" : false, - "editable" : true, - "$ xns" : "Roo.form", - "name" : "campaign_id_name", - "qtip" : "Select campaign", - "queryParam" : "query[name]", - "tpl" : "
{name}
", - "loadingText" : "Searching...", - "items" : [ - { - "listeners" : { - "|beforeload" : "function (_self, o){\n o.params = o.params || {};\n \n}\n" - }, - "xtype" : "Store", - "remoteSort" : true, - "$ sortInfo" : "{ direction : 'DESC', field: 'id' }", - "$ xns" : "Roo.data", - "* prop" : "store", - "items" : [ - { - "$ url" : "baseURL + '/Roo/Projects.php'", - "method" : "GET", - "xtype" : "HttpProxy", - "$ xns" : "Roo.data", - "* prop" : "proxy" - }, - { - "id" : "id", - "root" : "data", - "xtype" : "JsonReader", - "$ xns" : "Roo.data", - "$ 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" : "
{keyword}
", - "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" - } - ] - } - ] - }, - { - "listeners" : { - "|click" : "function() {\n _this.form.reset();\n _this.dialog.hide();\n}" - }, - "text" : "Cancel", - "xtype" : "Button", - "$ xns" : "Roo", - "* prop" : "buttons[]" - }, - { - "listeners" : { - "|click" : "function() {\n \n _this.form.doAction('submit');\n \n}" - }, - "text" : "OK", - "xtype" : "Button", - "$ xns" : "Roo", - "* prop" : "buttons[]" - } - ] - } - ] -} \ No newline at end of file diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.js b/Pman.Dialog.CoreNotifyRecurKeywords.js deleted file mode 100644 index bddf1de2..00000000 --- a/Pman.Dialog.CoreNotifyRecurKeywords.js +++ /dev/null @@ -1,306 +0,0 @@ -//