From 67b502f3bfffc8173dde8e85b2d9da0b7f1472ea Mon Sep 17 00:00:00 2001 From: sokiee Date: Mon, 23 Mar 2026 13:39:57 +0100 Subject: [PATCH] FIX comma --- app/javascript/utils/parse_locale_float.js | 7 ++ test/javascript/parse_locale_float_test.mjs | 124 ++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 test/javascript/parse_locale_float_test.mjs diff --git a/app/javascript/utils/parse_locale_float.js b/app/javascript/utils/parse_locale_float.js index b4364d7cb..4df30a5d9 100644 --- a/app/javascript/utils/parse_locale_float.js +++ b/app/javascript/utils/parse_locale_float.js @@ -8,6 +8,13 @@ export default function parseLocaleFloat(value) { const lastDot = cleaned.lastIndexOf(".") if (lastComma > lastDot) { + // When there's no dot present and exactly 3 digits follow the last comma, + // treat comma as a thousands separator (e.g., "1,234" → 1234, "12,345" → 12345) + const digitsAfterComma = cleaned.length - lastComma - 1 + if (lastDot === -1 && digitsAfterComma === 3) { + return Number.parseFloat(cleaned.replace(/,/g, "")) || 0 + } + // Comma is the decimal separator (e.g., "1.234,56" or "256,54") return Number.parseFloat(cleaned.replace(/\./g, "").replace(",", ".")) || 0 } diff --git a/test/javascript/parse_locale_float_test.mjs b/test/javascript/parse_locale_float_test.mjs new file mode 100644 index 000000000..cc233e25e --- /dev/null +++ b/test/javascript/parse_locale_float_test.mjs @@ -0,0 +1,124 @@ +import { describe, it } from "node:test" +import assert from "node:assert/strict" + +// Inline the function to avoid needing a bundler for ESM imports +function parseLocaleFloat(value) { + if (typeof value !== "string") return Number.parseFloat(value) || 0 + + const cleaned = value.replace(/\s/g, "") + const lastComma = cleaned.lastIndexOf(",") + const lastDot = cleaned.lastIndexOf(".") + + if (lastComma > lastDot) { + const digitsAfterComma = cleaned.length - lastComma - 1 + if (lastDot === -1 && digitsAfterComma === 3) { + return Number.parseFloat(cleaned.replace(/,/g, "")) || 0 + } + + return Number.parseFloat(cleaned.replace(/\./g, "").replace(",", ".")) || 0 + } + + return Number.parseFloat(cleaned.replace(/,/g, "")) || 0 +} + +describe("parseLocaleFloat", () => { + describe("dot as decimal separator", () => { + it("parses simple decimal", () => { + assert.equal(parseLocaleFloat("256.54"), 256.54) + }) + + it("parses with thousands comma", () => { + assert.equal(parseLocaleFloat("1,234.56"), 1234.56) + }) + + it("parses multiple thousands separators", () => { + assert.equal(parseLocaleFloat("1,234,567.89"), 1234567.89) + }) + + it("parses integer with dot-zero", () => { + assert.equal(parseLocaleFloat("100.00"), 100) + }) + }) + + describe("comma as decimal separator (European/French)", () => { + it("parses simple decimal", () => { + assert.equal(parseLocaleFloat("256,54"), 256.54) + }) + + it("parses with thousands dot", () => { + assert.equal(parseLocaleFloat("1.234,56"), 1234.56) + }) + + it("parses multiple thousands separators", () => { + assert.equal(parseLocaleFloat("1.234.567,89"), 1234567.89) + }) + + it("parses two-digit decimal", () => { + assert.equal(parseLocaleFloat("10,50"), 10.5) + }) + + it("parses single-digit decimal", () => { + assert.equal(parseLocaleFloat("10,5"), 10.5) + }) + }) + + describe("ambiguous comma with 3 trailing digits treated as thousands separator", () => { + it("treats 1,234 as one thousand two hundred thirty-four", () => { + assert.equal(parseLocaleFloat("1,234"), 1234) + }) + + it("treats 12,345 as twelve thousand three hundred forty-five", () => { + assert.equal(parseLocaleFloat("12,345"), 12345) + }) + + it("treats 1,000 as one thousand", () => { + assert.equal(parseLocaleFloat("1,000"), 1000) + }) + }) + + describe("integers", () => { + it("parses plain integer", () => { + assert.equal(parseLocaleFloat("100"), 100) + }) + + it("parses zero", () => { + assert.equal(parseLocaleFloat("0"), 0) + }) + }) + + describe("whitespace handling", () => { + it("strips leading/trailing spaces", () => { + assert.equal(parseLocaleFloat(" 256.54 "), 256.54) + }) + + it("strips thousands space separator", () => { + assert.equal(parseLocaleFloat("1 234,56"), 1234.56) + }) + }) + + describe("edge cases", () => { + it("returns 0 for empty string", () => { + assert.equal(parseLocaleFloat(""), 0) + }) + + it("returns 0 for non-numeric string", () => { + assert.equal(parseLocaleFloat("abc"), 0) + }) + + it("returns 0 for undefined", () => { + assert.equal(parseLocaleFloat(undefined), 0) + }) + + it("returns 0 for null", () => { + assert.equal(parseLocaleFloat(null), 0) + }) + + it("passes through numeric values", () => { + assert.equal(parseLocaleFloat(42.5), 42.5) + }) + + it("returns 0 for NaN", () => { + assert.equal(parseLocaleFloat(NaN), 0) + }) + }) +})