Pman.Tab.AdminCompanies.bjs

[Pman.Admin] / Pman.Tab.AdminCompanies.bjs

diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs
index 87e3c0e..5aab291 100644 (file)
--- a/Pman.Tab.AdminCompanies.bjs
+++ b/Pman.Tab.AdminCompanies.bjs
@@ -19,14 +19,14 @@
             },
             "items": [
                 {
-                    "*prop": "grid",
-                    "xtype": "Grid",
-                    "autoExpandColumn": "code",
-                    "loadMask": true,
                     "listeners": {
                         "|render": "function() \n{\n    _this.grid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.panel.active) {\n       this.footer.onClick('first');\n    }\n}",
                         "|rowdblclick": "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) return;\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n"
                     },
+                    "*prop": "grid",
+                    "autoExpandColumn": "name",
+                    "loadMask": true,
+                    "xtype": "Grid",
                     "|xns": "Roo.grid",
                     "items": [
                         {
@@ -107,58 +107,59 @@
                             ]
                         },
                         {
+                            "*prop": "colModel[]",
+                            "dataIndex": "comptype",
+                            "header": "Type",
+                            "sortable": true,
+                            "width": 90,
                             "xtype": "ColumnModel",
-                            "header": "Code",
-                            "width": 200,
-                            "dataIndex": "code",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|renderer": "function (v,x ,r) {\n    return Pman.Dialog.Companies.comptypeListToString(r.data.isOwner ? 'OWNER' : v);\n}",
+                            "|xns": "Roo.grid"
                         },
                         {
+                            "*prop": "colModel[]",
+                            "dataIndex": "code",
+                            "header": "Ref#",
+                            "width": 50,
                             "xtype": "ColumnModel",
-                            "header": "Comptype",
-                            "width": 200,
-                            "dataIndex": "comptype",
                             "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|xns": "Roo.grid"
                         },
                         {
-                            "xtype": "ColumnModel",
-                            "header": "Code",
+                            "*prop": "colModel[]",
+                            "dataIndex": "name",
+                            "header": "Name",
                             "width": 200,
-                            "dataIndex": "code",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "xtype": "ColumnModel",
+                            "|renderer": "function(v,x,r) {\n    return String.format(r.data.isOwner ? '<B>{0}</B>' : '{0}',v);    \n}",
+                            "|xns": "Roo.grid"
                         },
                         {
+                            "*prop": "colModel[]",
+                            "dataIndex": "tel",
+                            "header": "Tel",
+                            "width": 100,
                             "xtype": "ColumnModel",
-                            "header": "Name",
-                            "width": 200,
-                            "dataIndex": "name",
                             "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|xns": "Roo.grid"
                         },
                         {
+                            "*prop": "colModel[]",
+                            "dataIndex": "fax",
+                            "header": "Fax",
+                            "width": 100,
                             "xtype": "ColumnModel",
-                            "header": "Remarks",
-                            "width": 200,
-                            "dataIndex": "remarks",
                             "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|xns": "Roo.grid"
                         },
                         {
+                            "*prop": "colModel[]",
+                            "dataIndex": "email",
+                            "header": "Email",
+                            "width": 100,
                             "xtype": "ColumnModel",
-                            "header": "Owner",
-                            "width": 75,
-                            "dataIndex": "owner_id",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|renderer": " function (v) {\n        return (v.length && v.indexOf('@') > 0 ) ? \n            String.format('<a href=\"mailto:{0}\">{0}</a>',v) : v;\n            \n    }",
+                            "|xns": "Roo.grid"
                         },
                         {
                             "xtype": "ColumnModel",
@@ -171,9 +172,9 @@
                         },
                         {
                             "xtype": "ColumnModel",
-                            "header": "Tel",
+                            "header": "Remarks",
                             "width": 200,
-                            "dataIndex": "tel",
+                            "dataIndex": "remarks",
                             "|renderer": "function(v) { return String.format('{0}', v); }",
                             "|xns": "Roo.grid",
                             "*prop": "colModel[]"
@@ -187,15 +188,6 @@
                             "|xns": "Roo.grid",
                             "*prop": "colModel[]"
                         },
-                        {
-                            "xtype": "ColumnModel",
-                            "header": "Email",
-                            "width": 200,
-                            "dataIndex": "email",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
-                        },
                         {
                             "xtype": "ColumnModel",
                             "header": "Id",