[Lada-commits] [PATCH] reorg mewwert grid

[Wald Commits]

# HG changeset patch
# User Michael Stanko <mstanko at bfs.de>
# Date 1451300507 -3600
# Node ID 19b78162e12869f4c69653f92ba675a3ebca94cb
# Parent  c2a726887dd7bece4c592fea7e8ad0002ac1780c
reorg mewwert grid

diff -r c2a726887dd7 -r 19b78162e128 app/model/Messwert.js
--- a/app/model/Messwert.js	Wed Dec 16 09:49:09 2015 +0100
+++ b/app/model/Messwert.js	Mon Dec 28 12:01:47 2015 +0100
@@ -29,7 +29,14 @@
         name: 'messwert',
         type: 'float'
     }, {
-        name: 'messwertNwg'
+        name: 'messwertNwg',
+        convert: function(v) {
+            if (!v) {
+                return null;
+            }
+            return "<";
+        },
+//         defaultValue: null
     }, {
         name: 'messfehler',
         type: 'float'
diff -r c2a726887dd7 -r 19b78162e128 app/view/grid/Messwert.js
--- a/app/view/grid/Messwert.js	Wed Dec 16 09:49:09 2015 +0100
+++ b/app/view/grid/Messwert.js	Mon Dec 28 12:01:47 2015 +0100
@@ -95,16 +95,29 @@
                 triggerAction: 'all'
             }
         }, {
+            header: '<NWG',
+            width: 60,
+            dataIndex: 'messwertNwg',
+            editor: {
+                xtype: 'checkbox'
+            }
+        }, {
             header: 'Messwert',
             dataIndex: 'messwert',
             xtype: 'numbercolumn',
             width: 80,
+            renderer: function(value) {
+              return value.toExponential(3);
+            },
             editor: {
                 xtype: 'numberfield',
                 allowBlank: false,
                 maxLength: 10,
-                allowExponential: false,
-                enforceMaxLength: true
+                allowExponential: true,
+                enforceMaxLength: true,
+                hideTrigger: true,
+                keyNavEnabled: false,
+                mouseWheelEnabled: false
             }
         }, {
             header: 'Messeinheit',
@@ -132,16 +145,6 @@
                 triggerAction: 'all'
             }
         }, {
-            header: '<NWG',
-            xtype: 'numbercolumn',
-            width: 60,
-            dataIndex: 'messwertNwg'
-        }, {
-            header: 'Nachweisgrenze',
-            xtype: 'numbercolumn',
-            width: 110,
-            dataIndex: 'nwgZuMesswert'
-        }, {
             header: 'Messfehler',
             dataIndex: 'messfehler',
             xtype: 'numbercolumn',
@@ -154,6 +157,28 @@
                 enforceMaxLength: true
             }
         }, {
+            header: 'Nachweisgrenze',
+            xtype: 'numbercolumn',
+            dataIndex: 'nwgZuMesswert',
+            width: 80,
+            renderer: function(value) {
+              if (!value) {
+                return null;
+              } else {
+                return value.toExponential(3);
+              }
+            },
+            editor: {
+                xtype: 'numberfield',
+                allowBlank: true,
+                maxLength: 10,
+                allowExponential: true,
+                enforceMaxLength: true,
+                hideTrigger: true,
+                keyNavEnabled: false,
+                mouseWheelEnabled: false
+            }
+        }, {
             header: 'Grenzwertüberschreitung',
             dataIndex: 'grenzwertueberschreitung',
             flex: 1,