diff app/view/grid/Probenzusatzwert.js @ 636:f4f76fc04e28

merged.
author Raimund Renkert <raimund.renkert@intevation.de>
date Mon, 16 Mar 2015 17:32:15 +0100
parents f59bda7551d7
children 4a9bd2664da6
line wrap: on
line diff
--- a/app/view/grid/Probenzusatzwert.js	Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Probenzusatzwert.js	Mon Mar 16 17:32:15 2015 +0100
@@ -49,11 +49,11 @@
         this.columns = [{
             header: 'PZW-ID',
             dataIndex: 'id',
-            width: 70
+            flex: 1,
         }, {
             header: 'PZW-Größe',
             dataIndex: 'pzsId',
-            flex: 1,
+            flex: 3,
             renderer: function(value) {
                 if (!value || value === '') {
                     return '';
@@ -72,21 +72,16 @@
         }, {
             header: 'Messwert',
             dataIndex: 'messwertPzs',
-            width: 80,
-            renderer: function(value, meta, record) {
-                var nwg = record.get('nwgZuMesswert');
-                if (value < nwg) {
-                    return '<' + value;
-                }
-                return value;
-            },
+            xtype: 'numbercolumn',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
         }, {
             header: 'Maßeinheit',
             dataIndex: 'pzsId',
-            width: 80,
+            flex: 1,
             renderer: function(value) {
                 if (!value || value === '') {
                     return '';
@@ -100,16 +95,34 @@
         }, {
             header: 'Nachweisgrenze',
             dataIndex: 'nwgZuMesswert',
-            width: 110,
+            xtype: 'numbercolumn',
+            format: '0',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
         }, {
             header: 'rel. Unsich.[%]',
             dataIndex: 'messfehler',
+            xtype: 'numbercolumn',
+            format: '0',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
+        }, {
+            header: '< NWG',
+            flex: 1,
+            renderer: function(value, meta, record) {
+                var nwg = record.get('nwgZuMesswert');
+                var mw = record.get('messwertPzs');
+                if ( mw < nwg) {
+                    return 'MW < NWG';
+                }
+                return '';
+            }
         }];
         this.initData();
         this.callParent(arguments);

http://lada.wald.intevation.org