DataObjects/ProjectDirectory.php

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

diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs
index 934d46f..355b965 100644 (file)
--- a/Pman.Dialog.CoreCompanies.bjs
+++ b/Pman.Dialog.CoreCompanies.bjs
@@ -13,7 +13,7 @@
             "height": 400,
             "modal": true,
             "shadow": "true",
-            "title": "Edit Companies",
+            "title": "Edit Company",
             "width": 750,
             "xtype": "LayoutDialog",
             "|xns": "Roo",
@@ -38,7 +38,7 @@
                         {
                             "listeners": {
                                 "actionfailed": "function(f, act) {\n    _this.dialog.el.unmask();\n    // error msg???\n    Pman.standardActionFailed(f,act);\n              \n}",
-                                "actioncomplete": "function(f, act) {\n    _this.dialog.el.unmask();\n    //console.log('load completed'); \n    // error messages?????\n    if(act.type == 'setdata'){\n        this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n        return;\n    }\n   \n    if (act.type == 'load') {\n        _this.data = act.result.data;\n        var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';\n     \n            \n        if (_this.form.findField('comptype')) {\n            _this.form.findField('comptype')[meth]();\n        }\n         \n       // _this.loaded();\n        return;\n    }\n    \n    \n    if (act.type == 'submit') { // only submitted here if we are \n        _this.dialog.hide();\n       \n        if (_this.callback) {\n            _this.callback.call(this, act.result.data);\n        }\n        return; \n    }\n    // unmask?? \n}",
+                                "actioncomplete": "function(f, act) {\n    _this.dialog.el.unmask();\n    //console.log('load completed'); \n    // error messages?????\n    if(act.type == 'setdata'){\n        this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n        return;\n    }\n   \n    if (act.type == 'load') {\n        _this.data = act.result.data;\n        var meth = _this.data.comptype == 'OWNER' ? 'disable' : 'enable';\n     \n            \n        if (_this.form.findField('comptype')) {\n            _this.form.findField('comptype')[meth]();\n        }\n         \n       // _this.loaded();\n        return;\n    }\n    \n    \n    if (act.type == 'submit') { // only submitted here if we are \n        _this.dialog.hide();\n       \n        if (_this.callback) {\n            _this.callback.call(this, act.result.data);\n        }\n        return; \n    }\n    // unmask?? \n}",
                                 "rendered": "function (form)\n{\n    _this.form = form;\n}"
                             },
                             "fileUpload": true,
@@ -66,7 +66,7 @@
                                                 "render": "function (_self)\n{\n    _this.etypeCombo = _self;\n}"
                                             },
                                             "alwaysQuery": true,
-                                            "displayField": "name",
+                                            "displayField": "display_name",
                                             "emptyText": "Select Type",
                                             "fieldLabel": "Type",
                                             "forceSelection": true,
@@ -74,15 +74,15 @@
                                             "listWidth": 250,
                                             "loadingText": "Searching...",
                                             "minChars": 2,
-                                            "name": "comptype_name",
+                                            "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": "id",
+                                            "valueField": "name",
                                             "width": 200,
                                             "xtype": "ComboBox",
                                             "|xns": "Roo.form",
@@ -165,7 +165,7 @@
                                         {
                                             "allowBlank": true,
                                             "fieldLabel": "Remarks",
-                                            "height": 40,
+                                            "height": 120,
                                             "name": "remarks",
                                             "qtip": "Enter remarks",
                                             "width": 300,
@@ -183,7 +183,7 @@
                                         {
                                             "fieldLabel": "Background Colour",
                                             "name": "background_color",
-                                            "xtype": "TextField",
+                                            "xtype": "ColorField",
                                             "|xns": "Roo.form"
                                         },
                                         {