Mercurial > lada > lada-client
diff app/view/grid/Messwert.js @ 1054:7e801af49eeb
Use exponential notation for messwerte and zusatzwerte.
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Wed, 02 Mar 2016 12:59:15 +0100 |
parents | f9449df5f9fb |
children | e76551a6da27 |
line wrap: on
line diff
--- a/app/view/grid/Messwert.js Tue Mar 01 14:20:49 2016 +0100 +++ b/app/view/grid/Messwert.js Wed Mar 02 12:59:15 2016 +0100 @@ -100,25 +100,17 @@ dataIndex: 'messwertNwg', editor: { xtype: 'checkbox', - inputValue: '<' + inputValue: '<' } }, { header: 'Messwert', dataIndex: 'messwert', - xtype: 'numbercolumn', width: 80, - renderer: function(value) { - return value.toExponential(2); - }, editor: { - xtype: 'numberfield', + xtype: 'textfield', allowBlank: false, - maxLength: 10, - allowExponential: true, - enforceMaxLength: true, - hideTrigger: true, - keyNavEnabled: false, - mouseWheelEnabled: false + regex: /^[+\-]?(?:(?:0|[1-9]\d*)(?:[\.\,][0-9]\d*)?(?:[eE][+\-]?\d+)|(\d+[\.\,]?\d*)?)$/, + regexText: 'Keine Zahl' } }, { header: 'Messeinheit', @@ -159,25 +151,13 @@ } }, { header: 'Nachweisgrenze', - xtype: 'numbercolumn', dataIndex: 'nwgZuMesswert', width: 80, - renderer: function(value) { - if (!value) { - return null; - } else { - return value.toExponential(2); - } - }, editor: { - xtype: 'numberfield', + xtype: 'textfield', allowBlank: true, - maxLength: 10, - allowExponential: true, - enforceMaxLength: true, - hideTrigger: true, - keyNavEnabled: false, - mouseWheelEnabled: false + regex: /^[+\-]?(?:(?:0|[1-9]\d*)(?:[\.\,][0-9]\d*)?(?:[eE][+\-]?\d+)|(\d+[\.\,]?\d*)?)$/, + regexText: 'Keine Zahl' } }, { header: 'Grenzwertüberschreitung',