[Lada-commits] [PATCH 2 of 2] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1462885256 -7200
# Node ID 4932f7abc8a86e34f010be214423a64239dc688c
# Parent  3582308128e8be907a17a95e31d3f42666ec94fc
# Parent  9a0f7712f3661d04e52ae951dafbf0df120674dd
merged.

diff -r 3582308128e8 -r 4932f7abc8a8 app/model/Messwert.js
--- a/app/model/Messwert.js	Tue May 10 15:00:34 2016 +0200
+++ b/app/model/Messwert.js	Tue May 10 15:00:56 2016 +0200
@@ -42,37 +42,11 @@
                 return value;
             }
             var valueString = value.toString();
-            if (valueString.indexOf('E') > 0) {
-                valueString = valueString.replace('E', 'e');
+            if (valueString.indexOf(',') > 0) {
+                valueString.replace(',', '.');
             }
-            var tmp;
-            if (valueString.indexOf('e') > 0) {
-                tmp = valueString;
-            }
-            else {
-                // Currently not locale friendly...
-                if (valueString.indexOf(',') > 0) {
-                    valueString = valueString.replace(',', '.');
-                }
-                tmp = parseFloat(valueString).toExponential();
-            }
-            var parts = tmp.split('e');
-            if (parts[0].indexOf('.') > 0) {
-                var floatPart = parseFloat(parts[0]);
-                var separator = floatPart.toFixed(2).toLocaleString().replace(/[-\d]/g, '');
-                parts[0] = floatPart.toFixed(2).replace('.', separator);
-            }
-            else if (parts[0].indexOf(',') < 0) {
-                parts[0] = parts[0] + ',00';
-            }
-            var intPart = parseInt(parts[1]);
-            if (intPart < 10 && intPart >= 0) {
-                parts[1] = '+0' + parseInt(parts[1]);
-            }
-            else if (intPart < 0 && intPart > -10) {
-                parts[1] = parts[1].replace('-', '-0');
-            }
-            return parts[0] + 'e' + parts[1];
+            return parseFloat(valueString).toExponential(2).toString()
+                .replace('.', ',');
         }
     }, {
         name: 'messwertNwg',
diff -r 3582308128e8 -r 4932f7abc8a8 resources/i18n/Lada_de-DE.properties
--- a/resources/i18n/Lada_de-DE.properties	Tue May 10 15:00:34 2016 +0200
+++ b/resources/i18n/Lada_de-DE.properties	Tue May 10 15:00:56 2016 +0200
@@ -2,7 +2,7 @@
 # Error Codes
 ##
 ! General errors
-200:OK
+200:Unbekannter Fehler
 601:Probe existiert bereits
 602:Objekt ist keine Probe
 603:Fehler in der Verbindung zur DB