Pman.Dialog.CorePersonContact.bjs

diff --git a/Pman.Dialog.CorePersonContact.bjs b/Pman.Dialog.CorePersonContact.bjs
index f8969d0..ce4869c 100644 (file)
--- a/Pman.Dialog.CorePersonContact.bjs
+++ b/Pman.Dialog.CorePersonContact.bjs
@@ -41,24 +41,24 @@
                                     "xtype": "ComboBox",
                                     "allowBlank": "false",
                                     "editable": "false",
-                                    "emptyText": "Select Office",
+                                    "emptyText": "Select Companies",
                                     "forceSelection": true,
                                     "listWidth": 400,
                                     "loadingText": "Searching...",
                                     "minChars": 2,
                                     "pageSize": 20,
-                                    "qtip": "Select Office",
+                                    "qtip": "Select Companies",
                                     "selectOnFocus": true,
                                     "triggerAction": "all",
                                     "typeAhead": true,
                                     "width": 300,
-                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
-                                    "queryParam": "query[name]",
-                                    "fieldLabel": "Office",
+                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{code}</b> </div>",
+                                    "queryParam": "query[code]",
+                                    "fieldLabel": "Company",
                                     "valueField": "id",
-                                    "displayField": "name",
-                                    "hiddenName": "office_id",
-                                    "name": "office_id_name",
+                                    "displayField": "code",
+                                    "hiddenName": "company_id",
+                                    "name": "company_id_code",
                                     "items": [
                                         {
                                             "*prop": "store",
@@ -75,7 +75,7 @@
                                                     "xtype": "HttpProxy",
                                                     "method": "GET",
                                                     "|xns": "Roo.data",
-                                                    "|url": "baseURL + '/Roo/Office.php'"
+                                                    "|url": "baseURL + '/Roo/Companies.php'"
                                                 },
                                                 {
                                                     "*prop": "reader",
@@ -84,63 +84,35 @@
                                                     "id": "id",
                                                     "root": "data",
                                                     "totalProperty": "total",
-                                                    "|fields": "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]"
+                                                    "|fields": "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"code\",\"type\":\"string\"}]"
                                                 }
                                             ]
                                         }
                                     ]
                                 },
-                                {
-                                    "fieldLabel": "Name",
-                                    "name": "name",
-                                    "width": 200,
-                                    "|xns": "Roo.form",
-                                    "xtype": "TextField"
-                                },
-                                {
-                                    "fieldLabel": "Phone",
-                                    "name": "phone",
-                                    "width": 200,
-                                    "|xns": "Roo.form",
-                                    "xtype": "TextField"
-                                },
-                                {
-                                    "fieldLabel": "Fax",
-                                    "name": "fax",
-                                    "width": 200,
-                                    "|xns": "Roo.form",
-                                    "xtype": "TextField"
-                                },
-                                {
-                                    "fieldLabel": "Email",
-                                    "name": "email",
-                                    "width": 200,
-                                    "|xns": "Roo.form",
-                                    "xtype": "TextField"
-                                },
                                 {
                                     "|xns": "Roo.form",
                                     "xtype": "ComboBox",
                                     "allowBlank": "false",
                                     "editable": "false",
-                                    "emptyText": "Select Companies",
+                                    "emptyText": "Select Office",
                                     "forceSelection": true,
                                     "listWidth": 400,
                                     "loadingText": "Searching...",
                                     "minChars": 2,
                                     "pageSize": 20,
-                                    "qtip": "Select Companies",
+                                    "qtip": "Select Office",
                                     "selectOnFocus": true,
                                     "triggerAction": "all",
                                     "typeAhead": true,
                                     "width": 300,
-                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{code}</b> </div>",
-                                    "queryParam": "query[code]",
-                                    "fieldLabel": "Company",
+                                    "tpl": "<div class=\"x-grid-cell-text x-btn button\"><b>{name}</b> </div>",
+                                    "queryParam": "query[name]",
+                                    "fieldLabel": "Office",
                                     "valueField": "id",
-                                    "displayField": "code",
-                                    "hiddenName": "company_id",
-                                    "name": "company_id_code",
+                                    "displayField": "name",
+                                    "hiddenName": "office_id",
+                                    "name": "office_id_name",
                                     "items": [
                                         {
                                             "*prop": "store",
@@ -157,7 +129,7 @@
                                                     "xtype": "HttpProxy",
                                                     "method": "GET",
                                                     "|xns": "Roo.data",
-                                                    "|url": "baseURL + '/Roo/Companies.php'"
+                                                    "|url": "baseURL + '/Roo/Office.php'"
                                                 },
                                                 {
                                                     "*prop": "reader",
@@ -166,12 +138,40 @@
                                                     "id": "id",
                                                     "root": "data",
                                                     "totalProperty": "total",
-                                                    "|fields": "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"code\",\"type\":\"string\"}]"
+                                                    "|fields": "[{\"name\":\"id\",\"type\":\"int\"},{\"name\":\"name\",\"type\":\"string\"}]"
                                                 }
                                             ]
                                         }
                                     ]
                                 },
+                                {
+                                    "fieldLabel": "Name",
+                                    "name": "name",
+                                    "width": 200,
+                                    "|xns": "Roo.form",
+                                    "xtype": "TextField"
+                                },
+                                {
+                                    "fieldLabel": "Phone",
+                                    "name": "phone",
+                                    "width": 200,
+                                    "|xns": "Roo.form",
+                                    "xtype": "TextField"
+                                },
+                                {
+                                    "fieldLabel": "Fax",
+                                    "name": "fax",
+                                    "width": 200,
+                                    "|xns": "Roo.form",
+                                    "xtype": "TextField"
+                                },
+                                {
+                                    "fieldLabel": "Email",
+                                    "name": "email",
+                                    "width": 200,
+                                    "|xns": "Roo.form",
+                                    "xtype": "TextField"
+                                },
                                 {
                                     "fieldLabel": "Role",
                                     "name": "role",