sync

[Pman.Admin] / Pman.Dialog.AdminWatch.bjs

diff --git a/Pman.Dialog.AdminWatch.bjs b/Pman.Dialog.AdminWatch.bjs
index ef72e0a..0a8a13f 100644 (file)
--- a/Pman.Dialog.AdminWatch.bjs
+++ b/Pman.Dialog.AdminWatch.bjs
@@ -1,5 +1,5 @@
 {
-    "id": "roo-file-170",
+    "id": "roo-file-220",
     "name": "Pman.Dialog.AdminWatch",
     "parent": "",
     "title": "",
@@ -9,6 +9,7 @@
             "closable": false,
             "collapsible": false,
             "height": 230,
+            "modal": true,
             "resizable": false,
             "title": "Edit / Create core_watch",
             "width": 500,
@@ -65,7 +66,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "|beforeload": "function (_self, o)\n{\n    o.params = o.params || {};\n    // staff can see all logs, other companies can only see their own.\n    if (Pman.Login.authUser.company_id_comptype != 'OWNER') {\n        o.params.company_id = Pman.Login.authUser.company_id;\n    }\n    o.params._distinct = 'on_table';\n    o.params._columns ='on_table';\n}"
+                                                "|beforeload": "function (_self, o)\n{\n    o.params = o.params || {};\n    // staff can see all logs, other companies can only see their own.\n    if ((typeof(Pman.Login) != 'undefined') && Pman.Login.authUser.company_id_comptype != 'OWNER') {\n        o.params.company_id = Pman.Login.authUser.company_id;\n    }\n    o.params._distinct = 'on_table';\n    o.params._columns ='on_table';\n}"
                                             },
                                             "*prop": "store",
                                             "remoteSort": true,
@@ -108,7 +109,7 @@
                                     "fieldLabel": "Notify Who",
                                     "forceSelection": true,
                                     "hiddenName": "person_id",
-                                    "listWidth": 400,
+                                    "listWidth": 500,
                                     "loadingText": "Searching...",
                                     "minChars": 2,
                                     "name": "person_id_name",
@@ -116,7 +117,7 @@
                                     "qtip": "Select Person",
                                     "queryParam": "query[name]",
                                     "selectOnFocus": true,
-                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
+                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> ({company_id_name}) &lt;{email}&gt;</div>",
                                     "triggerAction": "all",
                                     "typeAhead": true,
                                     "valueField": "id",
@@ -125,21 +126,21 @@
                                     "|xns": "Roo.form",
                                     "items": [
                                         {
-                                            "*prop": "store",
-                                            "xtype": "Store",
-                                            "|xns": "Roo.data",
-                                            "remoteSort": true,
-                                            "|sortInfo": "{ direction : 'ASC', field: 'id' }",
                                             "listeners": {
                                                 "|beforeload": "function (_self, o){\n    o.params = o.params || {};\n    // set more here\n}\n"
                                             },
+                                            "*prop": "store",
+                                            "remoteSort": true,
+                                            "xtype": "Store",
+                                            "|sortInfo": "{ direction : 'ASC', field: 'name' }",
+                                            "|xns": "Roo.data",
                                             "items": [
                                                 {
                                                     "*prop": "proxy",
                                                     "xtype": "HttpProxy",
                                                     "method": "GET",
                                                     "|xns": "Roo.data",
-                                                    "|url": "baseURL + '/Roo/Person.php'"
+                                                    "|url": "baseURL + '/Roo/core_person'"
                                                 },
                                                 {
                                                     "*prop": "reader",
@@ -162,7 +163,6 @@
                                     "allowBlank": true,
                                     "displayField": "action",
                                     "editable": true,
-                                    "emptyText": "Select Action",
                                     "fieldLabel": "Match Event",
                                     "forceSelection": false,
                                     "listWidth": 300,
@@ -183,7 +183,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "|beforeload": "function (_self, o)\n{\n    o.params = o.params || {};\n    // staff can see all logs, other companies can only see their own.\n    if (Pman.Login.authUser.company_id_comptype != 'OWNER') {\n        o.params.company_id = Pman.Login.authUser.company_id;\n    }\n    o.params._distinct = 'action';\n    o.params._columns ='action';\n}"
+                                                "|beforeload": "function (_self, o)\n{\n    o.params = o.params || {};\n    // staff can see all logs, other companies can only see their own.\n    if (typeof(Pman.Login) !='undefined' && Pman.Login.authUser.company_id_comptype != 'OWNER') {\n        o.params.company_id = Pman.Login.authUser.company_id;\n    }\n    o.params._distinct = 'action';\n    o.params._columns ='action';\n}"
                                             },
                                             "*prop": "store",
                                             "remoteSort": true,
@@ -214,8 +214,9 @@
                                 {
                                     "allowBlank": true,
                                     "displayField": "val",
-                                    "editable": false,
+                                    "editable": true,
                                     "fieldLabel": "Action",
+                                    "forceSelection": false,
                                     "listWidth": 200,
                                     "name": "medium",
                                     "triggerAction": "all",
@@ -227,7 +228,7 @@
                                         {
                                             "*prop": "store",
                                             "xtype": "SimpleStore",
-                                            "|data": "[ [ 'email' ], [ 'APPROVAL' ] ]",
+                                            "|data": "[ [ 'email' ], [ 'APPROVAL' ], ['ENDOFDAYMAIL'] ]",
                                             "|fields": "[ 'val' ]",
                                             "|xns": "Roo.data"
                                         }