Pman.Dialog.CorePersonContact.js

diff --git a/Pman.Dialog.CorePersonContact.js b/Pman.Dialog.CorePersonContact.js
index 11deb95..5421ec5 100644 (file)
--- a/Pman.Dialog.CorePersonContact.js
+++ b/Pman.Dialog.CorePersonContact.js
@@ -83,24 +83,24 @@ Pman.Dialog.CorePersonContact = {
                                     xns: Roo.form,
                                     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',
                                     store : {
                                         xtype: 'Store',
                                         xns: Roo.data,
@@ -116,7 +116,7 @@ Pman.Dialog.CorePersonContact = {
                                             xtype: 'HttpProxy',
                                             xns: Roo.data,
                                             method : 'GET',
-                                            url : baseURL + '/Roo/Office.php'
+                                            url : baseURL + '/Roo/Companies.php'
                                         },
                                         reader : {
                                             xtype: 'JsonReader',
@@ -124,61 +124,33 @@ Pman.Dialog.CorePersonContact = {
                                             id : 'id',
                                             root : 'data',
                                             totalProperty : 'total',
-                                            fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}]
+                                            fields : [{"name":"id","type":"int"},{"name":"code","type":"string"}]
                                         }
                                     }
                                 },
-                                {
-                                    xtype: 'TextField',
-                                    xns: Roo.form,
-                                    fieldLabel : 'Name',
-                                    name : 'name',
-                                    width : 200
-                                },
-                                {
-                                    xtype: 'TextField',
-                                    xns: Roo.form,
-                                    fieldLabel : 'Phone',
-                                    name : 'phone',
-                                    width : 200
-                                },
-                                {
-                                    xtype: 'TextField',
-                                    xns: Roo.form,
-                                    fieldLabel : 'Fax',
-                                    name : 'fax',
-                                    width : 200
-                                },
-                                {
-                                    xtype: 'TextField',
-                                    xns: Roo.form,
-                                    fieldLabel : 'Email',
-                                    name : 'email',
-                                    width : 200
-                                },
                                 {
                                     xtype: 'ComboBox',
                                     xns: Roo.form,
                                     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',
                                     store : {
                                         xtype: 'Store',
                                         xns: Roo.data,
@@ -194,7 +166,7 @@ Pman.Dialog.CorePersonContact = {
                                             xtype: 'HttpProxy',
                                             xns: Roo.data,
                                             method : 'GET',
-                                            url : baseURL + '/Roo/Companies.php'
+                                            url : baseURL + '/Roo/Office.php'
                                         },
                                         reader : {
                                             xtype: 'JsonReader',
@@ -202,10 +174,38 @@ Pman.Dialog.CorePersonContact = {
                                             id : 'id',
                                             root : 'data',
                                             totalProperty : 'total',
-                                            fields : [{"name":"id","type":"int"},{"name":"code","type":"string"}]
+                                            fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}]
                                         }
                                     }
                                 },
+                                {
+                                    xtype: 'TextField',
+                                    xns: Roo.form,
+                                    fieldLabel : 'Name',
+                                    name : 'name',
+                                    width : 200
+                                },
+                                {
+                                    xtype: 'TextField',
+                                    xns: Roo.form,
+                                    fieldLabel : 'Phone',
+                                    name : 'phone',
+                                    width : 200
+                                },
+                                {
+                                    xtype: 'TextField',
+                                    xns: Roo.form,
+                                    fieldLabel : 'Fax',
+                                    name : 'fax',
+                                    width : 200
+                                },
+                                {
+                                    xtype: 'TextField',
+                                    xns: Roo.form,
+                                    fieldLabel : 'Email',
+                                    name : 'email',
+                                    width : 200
+                                },
                                 {
                                     xtype: 'TextField',
                                     xns: Roo.form,