DataObjects/core.sql

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

diff --git a/Pman.Dialog.CoreCompanies.js b/Pman.Dialog.CoreCompanies.js
index 6cd46ed..d345bfc 100644 (file)
--- a/Pman.Dialog.CoreCompanies.js
+++ b/Pman.Dialog.CoreCompanies.js
@@ -30,26 +30,6 @@ Pman.Dialog.CoreCompanies = {
         this.dialog = Roo.factory({
             xtype: 'LayoutDialog',
             xns: Roo,
-            listeners : {
-                beforeshow : function (_self)
-                {
-                    if (data.isOwner || !Pman.Login.isOwner()) {
-                        this.dialog.setTitle("Your Company Details");
-                        if (_this.form.findField('comptype')) {
-                            _this.form.findField('comptype').disable();
-                        }
-                        
-                        
-                        
-                        
-                    } else {
-                        this.dialog.setTitle(data.id ? "Edit Company" : "Add Company");
-                        if (_this.form.findField('comptype')) {
-                            _this.form.findField('comptype').enable();
-                        }
-                    }
-                }
-            },
             autoCreate : 'true',
             closable : false,
             collapsible : false,
@@ -57,7 +37,7 @@ Pman.Dialog.CoreCompanies = {
             height : 400,
             modal : true,
             shadow : 'true',
-            title : "Edit Companies",
+            title : "Edit Company",
             width : 750,
             items : [
                 {
@@ -82,37 +62,13 @@ Pman.Dialog.CoreCompanies = {
                                     //console.log('load completed'); 
                                     // error messages?????
                                     if(act.type == 'setdata'){
-                                        if (data._fetch) {
-                                            _this.dialog.el.mask("Loading");
-                                            _this.form.doAction('load', {
-                                                url: baseURL + '/Roo/Companies.html',
-                                                method: 'GET',
-                                                params: {
-                                                    _id: this._id ,
-                                                    _ts : Math.random()
-                                                } 
-                                            });
-                                            return;
-                                        } else {
-                                            _this.form.setValues(data);
-                                        }
-                                        
-                                        if (data.isOwner || !Pman.Login.isOwner()) {
-                                            _this.dialog.setTitle("Your Company Details");
-                                            if (_this.form.findField('comptype')) {
-                                                _this.form.findField('comptype').disable();
-                                            }
-                                        } else {
-                                            _this.dialog.setTitle(data.id ? "Edit Company" : "Add Company");
-                                            if (_this.form.findField('comptype')) {
-                                                _this.form.findField('comptype').enable();
-                                            }
-                                        }
+                                        this.load({ method: 'GET', params: { '_id' : _this.data.id }});
+                                        return;
                                     }
                                    
                                     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')) {
@@ -141,7 +97,7 @@ Pman.Dialog.CoreCompanies = {
                             },
                             fileUpload : true,
                             labelWidth : 160,
-                            url : baseURL + '/Roo/Person.php',
+                            url : baseURL + '/Roo/Companies.php',
                             items : [
                                 {
                                     xtype: 'Column',
@@ -151,7 +107,7 @@ Pman.Dialog.CoreCompanies = {
                                         {
                                             xtype: 'TextField',
                                             xns: Roo.form,
-                                            allowBlank : false,
+                                            allowBlank : true,
                                             fieldLabel : 'Company ID (for filing Ref.)',
                                             name : 'code',
                                             qtip : "Enter code",
@@ -160,25 +116,58 @@ Pman.Dialog.CoreCompanies = {
                                         {
                                             xtype: 'ComboBox',
                                             xns: Roo.form,
-                                            allowBlank : false,
-                                            displayField : 'desc',
-                                            editable : false,
+                                            listeners : {
+                                                render : function (_self)
+                                                {
+                                                    _this.etypeCombo = _self;
+                                                }
+                                            },
+                                            alwaysQuery : true,
+                                            displayField : 'display_name',
                                             emptyText : "Select Type",
                                             fieldLabel : 'Type',
+                                            forceSelection : true,
                                             hiddenName : 'comptype',
                                             listWidth : 250,
-                                            name : 'comptype_name',
-                                            qtip : "Select Company type",
+                                            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> : {display_name}</div>',
                                             triggerAction : 'all',
                                             typeAhead : false,
-                                            valueField : 'val',
+                                            valueField : 'name',
                                             width : 200,
                                             store : {
-                                                xtype: 'SimpleStore',
+                                                xtype: 'Store',
                                                 xns: Roo.data,
-                                                data : '[ \'CONSULTANT\', "Consultant" ],[ \'CLIENT\'    ,  "Client" ],[ \'CONTRACTOR\' , "Contractor" ]',
-                                                fields : '[\'val\', \'desc\']'
+                                                listeners : {
+                                                    beforeload : function (_self, o){
+                                                        o.params = o.params || {};
+                                                        // set more here
+                                                        //o.params['query[empty_etype]'] = 1;
+                                                        o.params.etype = 'COMPTYPE';
+                                                    }
+                                                },
+                                                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":"name","type":"string"}]
+                                                }
                                             }
                                         },
                                         {
@@ -231,7 +220,7 @@ Pman.Dialog.CoreCompanies = {
                                             xns: Roo.form,
                                             allowBlank : true,
                                             fieldLabel : 'Remarks',
-                                            height : 40,
+                                            height : 120,
                                             name : 'remarks',
                                             qtip : "Enter remarks",
                                             width : 300
@@ -245,7 +234,7 @@ Pman.Dialog.CoreCompanies = {
                                     width : 200,
                                     items : [
                                         {
-                                            xtype: 'TextField',
+                                            xtype: 'ColorField',
                                             xns: Roo.form,
                                             fieldLabel : 'Background Colour',
                                             name : 'background_color'
@@ -293,11 +282,6 @@ Pman.Dialog.CoreCompanies = {
                                         }
                                     ]
                                 },
-                                {
-                                    xtype: 'Hidden',
-                                    xns: Roo.form,
-                                    name : 'isOwner'
-                                },
                                 {
                                     xtype: 'Hidden',
                                     xns: Roo.form,
@@ -321,11 +305,28 @@ Pman.Dialog.CoreCompanies = {
                 {
                     xtype: 'Button',
                     xns: Roo,
+                    listeners : {
+                        click : function (_self, e)
+                        {
+                            _this.dialog.hide();
+                        }
+                    },
                     text : "Cancel"
                 },
                 {
                     xtype: 'Button',
                     xns: Roo,
+                    listeners : {
+                        click : function (_self, e)
+                        {
+                            // do some checks?
+                             
+                            
+                            _this.dialog.el.mask("Saving");
+                            _this.form.doAction("submit");
+                        
+                        }
+                    },
                     text : "Save"
                 }
             ]