DataObjects/core.sql

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

diff --git a/Pman.Dialog.CoreNotifyRecur.js b/Pman.Dialog.CoreNotifyRecur.js
index 691dfed..fb12481 100644 (file)
--- a/Pman.Dialog.CoreNotifyRecur.js
+++ b/Pman.Dialog.CoreNotifyRecur.js
@@ -216,7 +216,11 @@ Pman.Dialog.CoreNotifyRecur = {
                                                 tz : 'Asia/Hong_Kong',
                                                 onid : _this.data.onid,
                                                 ontable : _this.data.ontable,
-                                                method : _this.data.method,
+                                                method : _this.data.method, // default...
+                                                
+                                                method_id : _this.data.method_id, // default...
+                                                method_id_display_name : _this.data.method_id_display_name, // default...        
+                                                
                                                 last_event_id : 0,
                                                 freq_day_name : '',
                                                 freq_hour_name : '',
@@ -278,65 +282,64 @@ Pman.Dialog.CoreNotifyRecur = {
                             {
                                 xtype: 'ColumnModel',
                                 xns: Roo.grid,
-                                dataIndex : 'method_id_display_name',
-                                header : 'From',
-                                width : 75,
-                                renderer : function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); },
+                                dataIndex : 'method_id',
+                                header : 'Type',
+                                width : 120,
+                                renderer : function(v,x,r) {
+                                     return String.format('{0}', r.data.method_id_display_name); 
+                                },
                                 editor : {
                                     xtype: 'GridEditor',
                                     xns: Roo.grid,
-                                    items : [
-                                        {
-                                            xtype: 'ComboBox',
-                                            xns: Roo.form,
-                                            allowBlank : 'false',
-                                            editable : 'false',
-                                            emptyText : "Select core_enum",
-                                            forceSelection : true,
-                                            listWidth : 400,
-                                            loadingText : "Searching...",
-                                            minChars : 2,
-                                            pageSize : 20,
-                                            qtip : "Select core_enum",
-                                            selectOnFocus : true,
-                                            triggerAction : 'all',
-                                            typeAhead : true,
-                                            width : 300,
-                                            tpl : '<div class="x-grid-cell-text x-btn button"><b>{name}</b> </div>',
-                                            queryParam : '',
-                                            fieldLabel : 'core_enum',
-                                            valueField : 'id',
-                                            displayField : '',
-                                            hiddenName : '',
-                                            name : '',
-                                            store : {
-                                                xtype: 'Store',
-                                                xns: Roo.data,
-                                                remoteSort : true,
-                                                sortInfo : { direction : 'ASC', field: 'id' },
-                                                listeners : {
-                                                    beforeload : function (_self, o){
-                                                        o.params = o.params || {};
-                                                        // set more here
-                                                    }
-                                                },
-                                                proxy : {
-                                                    xtype: 'HttpProxy',
-                                                    xns: Roo.data,
-                                                    method : 'GET',
-                                                    url : baseURL + '/Roo/core_enum.php'
-                                                },
-                                                reader : {
-                                                    xtype: 'JsonReader',
-                                                    xns: Roo.data,
-                                                    id : 'id',
-                                                    root : 'data',
-                                                    totalProperty : 'total',
-                                                    fields : [{"name":"id","type":"int"},{"name":"etype","type":"string"}]
+                                    field : {
+                                        xtype: 'ComboBox',
+                                        xns: Roo.form,
+                                        allowBlank : 'false',
+                                        displayField : 'display_name',
+                                        editable : false,
+                                        emptyText : "Select Type",
+                                        fieldLabel : 'core_enum',
+                                        forceSelection : true,
+                                        hiddenName : 'method_id',
+                                        listWidth : 400,
+                                        loadingText : "Searching...",
+                                        name : 'method_id_display_name',
+                                        pageSize : 20,
+                                        qtip : "Select core_enum",
+                                        selectOnFocus : true,
+                                        tpl : '<div class="x-grid-cell-text x-btn button"><b>{display_name}</b> </div>',
+                                        triggerAction : 'all',
+                                        typeAhead : true,
+                                        valueField : 'id',
+                                        width : 300,
+                                        store : {
+                                            xtype: 'Store',
+                                            xns: Roo.data,
+                                            listeners : {
+                                                beforeload : function (_self, o){
+                                                    o.params = o.params || {};
+                                                    // set more here
+                                                    o.params.etype = 'core_notify_recur';
                                                 }
+                                            },
+                                            remoteSort : true,
+                                            sortInfo : { direction : 'ASC', field: 'id' },
+                                            proxy : {
+                                                xtype: 'HttpProxy',
+                                                xns: Roo.data,
+                                                method : 'GET',
+                                                url : baseURL + '/Roo/core_enum.php'
+                                            },
+                                            reader : {
+                                                xtype: 'JsonReader',
+                                                xns: Roo.data,
+                                                id : 'id',
+                                                root : 'data',
+                                                totalProperty : 'total',
+                                                fields : [{"name":"id","type":"int"},{"name":"etype","type":"string"}]
                                             }
                                         }
-                                    ]
+                                    }
                                 }
                             },
                             {