Mercurial > lada > lada-client

changeset 1415:3da3772272a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change column order in ort grid
author Michael Stanko <mstanko@bfs.de>
date Tue, 28 Mar 2017 15:04:25 +0200
parents 6f9985b4cf47
children 41b894caacfe
files app/view/grid/Orte.js
diffstat 1 files changed, 70 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/app/view/grid/Orte.js	Mon Mar 27 17:08:13 2017 +0200
+++ b/app/view/grid/Orte.js	Tue Mar 28 15:04:25 2017 +0200
@@ -107,6 +107,7 @@
             dataIndex: 'netzbetreiberId'
         }, {
             header: i18n.getMsg('orte.ortId'),
+            width: 60,
             editor: {
                 xtype: 'textfield',
                 maxLength: 10,
@@ -117,20 +118,14 @@
             },
             dataIndex: 'ortId'
         }, {
-            header: i18n.getMsg('orte.nutsCode'),
-            editor: {
-                xtype: 'textfield',
-                maxLength: 10
-            },
+            header: i18n.getMsg('orte.ortTyp'),
+            width: 40,
             filter: {
                 type: 'string'
             },
-            dataIndex: 'nutsCode'
-        }, {
-            header: i18n.getMsg('orte.anlageId'),
             editor: {
                 xtype: 'combobox',
-                store: Ext.data.StoreManager.get('ktas'),
+                store: Ext.data.StoreManager.get('orttyp'),
                 displayField: 'code',
                 valueField: 'id'
             },
@@ -141,15 +136,38 @@
                 ) {
                     return '';
                 }
-                var store = Ext.data.StoreManager.get('ktas');
-                var record = store.getById(value);
+                var ot = Ext.data.StoreManager.get('orttyp');
+                var record = ot.getById(value);
                 return record.get('code');
             },
-            dataIndex: 'anlageId'
+            dataIndex: 'ortTyp'
+        }, {
+            header: i18n.getMsg('orte.kurztext'),
+            filter: {
+                type: 'string'
+            },
+            editor: {
+                xtype: 'textfield',
+                maxLength: 15,
+                allowBlank: false
+            },
+            dataIndex: 'kurztext'
+        }, {
+            header: i18n.getMsg('orte.langtext'),
+            width: 200,
+            filter: {
+                type: 'string'
+            },
+            editor: {
+                xtype: 'textfield',
+                maxLength: 100,
+                allowBlank: false
+            },
+            dataIndex: 'langtext'
         }, {
             header: i18n.getMsg('orte.verwaltungseinheit'),
             dataIndex: 'gemId',
-            width: 120,
+            width: 200,
             filter: {
                 type: 'string'
             },
@@ -174,7 +192,7 @@
         }, {
             header: i18n.getMsg('orte.staatId'),
             dataIndex: 'staatId',
-            width: 70,
+            width: 50,
             filter: {
                 type: 'string'
             },
@@ -197,28 +215,15 @@
                 allowBlank: false
             }
         }, {
-            header: i18n.getMsg('orte.kdaId'),
+            header: i18n.getMsg('orte.nutsCode'),
+            editor: {
+                xtype: 'textfield',
+                maxLength: 10
+            },
             filter: {
                 type: 'string'
             },
-            editor: {
-                xtype: 'combobox',
-                store: Ext.data.StoreManager.get('koordinatenart'),
-                displayField: 'koordinatenart',
-                valueField: 'id'
-            },
-            renderer: function(value) {
-                if (value === undefined ||
-                    value === null ||
-                    value === ''
-                ) {
-                    return '';
-                }
-                var kda = Ext.data.StoreManager.get('koordinatenart');
-                var record = kda.getById(value);
-                return record.get('koordinatenart');
-            },
-            dataIndex: 'kdaId'
+            dataIndex: 'nutsCode'
         }, {
             header: i18n.getMsg('orte.ozId'),
             filter: {
@@ -243,13 +248,10 @@
             },
             dataIndex: 'ozId'
         }, {
-            header: i18n.getMsg('orte.ortTyp'),
-            filter: {
-                type: 'string'
-            },
+            header: i18n.getMsg('orte.anlageId'),
             editor: {
                 xtype: 'combobox',
-                store: Ext.data.StoreManager.get('orttyp'),
+                store: Ext.data.StoreManager.get('ktas'),
                 displayField: 'code',
                 valueField: 'id'
             },
@@ -260,11 +262,11 @@
                 ) {
                     return '';
                 }
-                var ot = Ext.data.StoreManager.get('orttyp');
-                var record = ot.getById(value);
+                var store = Ext.data.StoreManager.get('ktas');
+                var record = store.getById(value);
                 return record.get('code');
             },
-            dataIndex: 'ortTyp'
+            dataIndex: 'anlageId'
         }, {
             header: i18n.getMsg('orte.mpArt'),
             filter: {
@@ -316,28 +318,6 @@
             },
             dataIndex: 'berichtstext'
         }, {
-            header: i18n.getMsg('orte.kurztext'),
-            filter: {
-                type: 'string'
-            },
-            editor: {
-                xtype: 'textfield',
-                maxLength: 15,
-                allowBlank: false
-            },
-            dataIndex: 'kurztext'
-        }, {
-            header: i18n.getMsg('orte.langtext'),
-            filter: {
-                type: 'string'
-            },
-            editor: {
-                xtype: 'textfield',
-                maxLength: 100,
-                allowBlank: false
-            },
-            dataIndex: 'langtext'
-        }, {
             header: i18n.getMsg('orte.unscharf'),
             filter: {
                 type: 'string'
@@ -347,14 +327,28 @@
             },
             dataIndex: 'unscharf'
         }, {
-            header: i18n.getMsg('orte.hoeheLand'),
+            header: i18n.getMsg('orte.kdaId'),
             filter: {
-                type: 'numeric'
+                type: 'string'
             },
             editor: {
-                xtype: 'numberfield'
+                xtype: 'combobox',
+                store: Ext.data.StoreManager.get('koordinatenart'),
+                displayField: 'koordinatenart',
+                valueField: 'id'
             },
-            dataIndex: 'hoeheLand'
+            renderer: function(value) {
+                if (value === undefined ||
+                    value === null ||
+                    value === ''
+                ) {
+                    return '';
+                }
+                var kda = Ext.data.StoreManager.get('koordinatenart');
+                var record = kda.getById(value);
+                return record.get('koordinatenart');
+            },
+            dataIndex: 'kdaId'
         }, {
             header: i18n.getMsg('orte.koordXExtern'),
             filter: {
@@ -396,6 +390,15 @@
             },
             dataIndex: 'latitude'
         }, {
+            header: i18n.getMsg('orte.hoeheLand'),
+            filter: {
+                type: 'numeric'
+            },
+            editor: {
+                xtype: 'numberfield'
+            },
+            dataIndex: 'hoeheLand'
+        }, {
             header: i18n.getMsg('letzteAenderung'),
             filter: {
                 type: 'date'
http://lada.wald.intevation.org