DataObjects/Core_watch.php

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

diff --git a/Pman.Dialog.CoreCompanies.js b/Pman.Dialog.CoreCompanies.js
index 9bf7c23..c3d0b54 100644 (file)
--- a/Pman.Dialog.CoreCompanies.js
+++ b/Pman.Dialog.CoreCompanies.js
@@ -37,7 +37,7 @@ Pman.Dialog.CoreCompanies = {
             height : 400,
             modal : true,
             shadow : 'true',
-            title : "Edit Companies",
+            title : "Edit Company",
             width : 750,
             items : [
                 {
@@ -68,7 +68,7 @@ Pman.Dialog.CoreCompanies = {
                                    
                                     if (act.type == 'load') {
                                         _this.data = act.result.data;
-                                        var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';
+                                        var meth = _this.data.comptype == 'OWNER' ? 'disable' : 'enable';
                                      
                                             
                                         if (_this.form.findField('comptype')) {
@@ -107,36 +107,12 @@ Pman.Dialog.CoreCompanies = {
                                         {
                                             xtype: 'TextField',
                                             xns: Roo.form,
-                                            allowBlank : false,
+                                            allowBlank : true,
                                             fieldLabel : 'Company ID (for filing Ref.)',
                                             name : 'code',
                                             qtip : "Enter code",
                                             width : 100
                                         },
-                                        {
-                                            xtype: 'ComboBox',
-                                            xns: Roo.form,
-                                            allowBlank : false,
-                                            displayField : 'desc',
-                                            editable : false,
-                                            emptyText : "Select Type",
-                                            fieldLabel : 'Type',
-                                            hiddenName : 'comptype',
-                                            listWidth : 250,
-                                            name : 'comptype_name',
-                                            qtip : "Select Company type",
-                                            selectOnFocus : true,
-                                            triggerAction : 'all',
-                                            typeAhead : false,
-                                            valueField : 'val',
-                                            width : 200,
-                                            store : {
-                                                xtype: 'SimpleStore',
-                                                xns: Roo.data,
-                                                data : '[ \'CONSULTANT\', "Consultant" ],[ \'CLIENT\'    ,  "Client" ],[ \'CONTRACTOR\' , "Contractor" ]',
-                                                fields : '[\'val\', \'desc\']'
-                                            }
-                                        },
                                         {
                                             xtype: 'ComboBox',
                                             xns: Roo.form,
@@ -144,30 +120,27 @@ Pman.Dialog.CoreCompanies = {
                                                 render : function (_self)
                                                 {
                                                     _this.etypeCombo = _self;
-                                                },
-                                                select : function (combo, record, index)
-                                                {
-                                                    _this.grid.footer.onClick('first');
                                                 }
                                             },
                                             alwaysQuery : true,
-                                            displayField : 'name',
-                                            editable : 'false',
+                                            displayField : 'display_name',
                                             emptyText : "Select Type",
                                             fieldLabel : 'Type',
                                             forceSelection : true,
+                                            hiddenName : 'comptype',
                                             listWidth : 250,
                                             loadingText : "Searching...",
                                             minChars : 2,
+                                            name : 'comptype_display',
                                             pageSize : 20,
                                             qtip : "Select type",
                                             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> : {display_name}</div>',
                                             triggerAction : 'all',
                                             typeAhead : false,
                                             valueField : 'name',
-                                            width : 300,
+                                            width : 200,
                                             store : {
                                                 xtype: 'Store',
                                                 xns: Roo.data,
@@ -175,7 +148,8 @@ Pman.Dialog.CoreCompanies = {
                                                     beforeload : function (_self, o){
                                                         o.params = o.params || {};
                                                         // set more here
-                                                        o.params['query[empty_etype]'] = 1;
+                                                        //o.params['query[empty_etype]'] = 1;
+                                                        o.params.etype = 'COMPTYPE';
                                                     }
                                                 },
                                                 remoteSort : true,
@@ -192,7 +166,7 @@ Pman.Dialog.CoreCompanies = {
                                                     id : 'id',
                                                     root : 'data',
                                                     totalProperty : 'total',
-                                                    fields : [{"name":"id","type":"int"},{"name":"etype","type":"string"}]
+                                                    fields : [{"name":"id","type":"int"},{"name":"name","type":"string"}]
                                                 }
                                             }
                                         },
@@ -246,7 +220,7 @@ Pman.Dialog.CoreCompanies = {
                                             xns: Roo.form,
                                             allowBlank : true,
                                             fieldLabel : 'Remarks',
-                                            height : 40,
+                                            height : 120,
                                             name : 'remarks',
                                             qtip : "Enter remarks",
                                             width : 300
@@ -260,7 +234,7 @@ Pman.Dialog.CoreCompanies = {
                                     width : 200,
                                     items : [
                                         {
-                                            xtype: 'TextField',
+                                            xtype: 'ColorField',
                                             xns: Roo.form,
                                             fieldLabel : 'Background Colour',
                                             name : 'background_color'