Mercurial > lada > lada-client

comparison app/model/Zusatzwert.js @ 1069:1d20cec263ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed exponential number format.
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 31 Mar 2016 11:44:03 +0200
parents 7fa853864d9b
children b73f9a976c82
comparison
equal deleted inserted replaced
1068:096d552508cd 1069:1d20cec263ee
54 tmp = parseFloat(valueString).toExponential(); 54 tmp = parseFloat(valueString).toExponential();
55 } 55 }
56 var parts = tmp.split('e'); 56 var parts = tmp.split('e');
57 if (parts[0].indexOf('.') > 0) { 57 if (parts[0].indexOf('.') > 0) {
58 var floatPart = parseFloat(parts[0]); 58 var floatPart = parseFloat(parts[0]);
59 var separator = floatPart.toLocaleString().replace(/[-\d]/g, ''); 59 var separator = floatPart.toFixed(2).toLocaleString().replace(/[-\d]/g, '');
60 parts[0] = floatPart.toFixed(3).replace('.', separator); 60 parts[0] = floatPart.toFixed(2).replace('.', separator);
61 }
62 else if (parts[0].indexOf(',') < 0) {
63 parts[0] = parts[0] + ',00';
64 }
65 var intPart = parseInt(parts[1]);
66 if (intPart < 10 && intPart >= 0) {
67 parts[1] = '+0' + parseInt(parts[1]);
68 }
69 else if (intPart < 0 && intPart > -10) {
70 parts[1] = parts[1].replace('-', '-0');
61 } 71 }
62 return parts[0] + 'e' + parts[1]; 72 return parts[0] + 'e' + parts[1];
63 } 73 }
64 }, { 74 }, {
65 name: 'messwertPzs', 75 name: 'messwertPzs',
90 tmp = parseFloat(valueString).toExponential(); 100 tmp = parseFloat(valueString).toExponential();
91 } 101 }
92 var parts = tmp.split('e'); 102 var parts = tmp.split('e');
93 if (parts[0].indexOf('.') > 0) { 103 if (parts[0].indexOf('.') > 0) {
94 var floatPart = parseFloat(parts[0]); 104 var floatPart = parseFloat(parts[0]);
95 var separator = floatPart.toLocaleString().replace(/[-\d]/g, ''); 105 var separator = floatPart.toFixed(2).toLocaleString().replace(/[-\d]/g, '');
96 parts[0] = floatPart.toFixed(3).replace('.', separator); 106 parts[0] = floatPart.toFixed(2).replace('.', separator);
107 }
108 else if (parts[0].indexOf(',') < 0) {
109 parts[0] = parts[0] + ',00';
110 }
111 var intPart = parseInt(parts[1]);
112 if (intPart < 10 && intPart >= 0) {
113 parts[1] = '+0' + parseInt(parts[1]);
114 }
115 else if (intPart < 0 && intPart > -10) {
116 parts[1] = parts[1].replace('-', '-0');
97 } 117 }
98 return parts[0] + 'e' + parts[1]; 118 return parts[0] + 'e' + parts[1];
99 } 119 }
100 }, { 120 }, {
101 name: 'messfehler', 121 name: 'messfehler',
http://lada.wald.intevation.org