From 27a161bfbb9b081e215bbd0dc5b50d1e79fcdf25 Mon Sep 17 00:00:00 2001 From: Christian Vidal Wolf Date: Sun, 29 Mar 2026 14:55:30 +0200 Subject: [PATCH] fix: correctly format weight and kg columns to 2 decimals --- src/App.tsx | 29 ++++++++++++++--------------- src/components/MatrixView.tsx | 17 ++++++++--------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 373eddc..c5199f0 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -82,16 +82,15 @@ export default function App() { const header = (rawHeaders[idx] || '').toLowerCase(); // Skip Article No, Barcodes, and other code-like fields - if (header.includes('id') || header.includes('no') || header.includes('code') || - header.includes('art.') || header.includes('barcode') || header.includes('article')) { + // But allow if it's a weight/measure column (e.g. Article NW (kg)) + if ((header.includes('id') || header.includes('no') || header.includes('code') || + header.includes('art.') || header.includes('barcode') || header.includes('article')) && + !(header.includes('nw') || header.includes('gw') || header.includes('weight') || header.includes('kg'))) { return val; } - const priceKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk']; - const isPriceCol = priceKeywords.some(kw => header.includes(kw)); - - // Format weight columns (NW = Net Weight, GW = Gross Weight, kg, etc.) - const isWeightCol = header.includes('nw') || header.includes('gw') || header.includes('weight') || header.includes('kg'); + const formatKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk', 'nw', 'gw', 'weight', 'kg']; + const shouldFormat = formatKeywords.some(kw => header.includes(kw)); if (typeof val === 'number') { return Number(val.toFixed(2)); @@ -100,7 +99,7 @@ export default function App() { if (typeof val === 'string') { const normalized = val.trim().replace(',', '.'); const num = parseFloat(normalized); - if (!isNaN(num) && (isPriceCol || isWeightCol || val.includes('.') || val.includes(','))) { + if (!isNaN(num) && (shouldFormat || val.includes('.') || val.includes(','))) { return num.toFixed(2); } } @@ -158,14 +157,14 @@ export default function App() { if (header.includes('id') || header.includes('no') || header.includes('code') || header.includes('art.') || header.includes('barcode') || header.includes('article')) { - return val; + // But allow if it's a weight/measure column (e.g. Article NW (kg)) + if (!(header.includes('nw') || header.includes('gw') || header.includes('weight') || header.includes('kg'))) { + return val; + } } - const priceKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk']; - const isPriceCol = priceKeywords.some(kw => header.includes(kw)); - - // Format weight columns (NW = Net Weight, GW = Gross Weight, kg, etc.) - const isWeightCol = header.includes('nw') || header.includes('gw') || header.includes('weight') || header.includes('kg'); + const formatKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk', 'nw', 'gw', 'weight', 'kg']; + const shouldFormat = formatKeywords.some(kw => header.includes(kw)); if (typeof val === 'number') { return Number(val.toFixed(2)); @@ -174,7 +173,7 @@ export default function App() { if (typeof val === 'string') { const normalized = val.trim().replace(',', '.'); const num = parseFloat(normalized); - if (!isNaN(num) && (isPriceCol || isWeightCol || val.includes('.') || val.includes(','))) { + if (!isNaN(num) && (shouldFormat || val.includes('.') || val.includes(','))) { return num.toFixed(2); } } diff --git a/src/components/MatrixView.tsx b/src/components/MatrixView.tsx index 717c1be..3aa0215 100644 --- a/src/components/MatrixView.tsx +++ b/src/components/MatrixView.tsx @@ -22,16 +22,15 @@ export function MatrixView({ data, headers }: MatrixViewProps) { const h = header.toLowerCase(); // Do NOT format columns that are clearly IDs, barcodes, or codes - if (h.includes('id') || h.includes('no') || h.includes('code') || h.includes('art.') || h.includes('barcode') || h.includes('article')) { + // But allow if it's a weight/measure column (e.g. Article NW (kg)) + if ((h.includes('id') || h.includes('no') || h.includes('code') || h.includes('art.') || h.includes('barcode') || h.includes('article')) && + !(h.includes('nw') || h.includes('gw') || h.includes('weight') || h.includes('kg'))) { return val; } - // List of keywords that typically indicate a price or numeric value to format - const priceKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk']; - const isPriceCol = priceKeywords.some(kw => h.includes(kw)); - - // Format weight columns (NW = Net Weight, GW = Gross Weight, kg, etc.) - const isWeightCol = h.includes('nw') || h.includes('gw') || h.includes('weight') || h.includes('kg'); + // List of keywords that typically indicate a price, measure or numeric value to format + const formatKeywords = ['price', 'eur', 'cost', 'msrp', 'net', 'gross', 'netto', 'brutto', 'pp', 'pph', 'uvp', 'vpe', 'stk', 'nw', 'gw', 'weight', 'kg']; + const shouldFormat = formatKeywords.some(kw => h.includes(kw)); // Handle numbers if (typeof val === 'number') { @@ -45,8 +44,8 @@ export function MatrixView({ data, headers }: MatrixViewProps) { const num = parseFloat(normalized); if (!isNaN(num)) { - // Format if it's a price column, weight column, OR if it already has a decimal separator (.) - if (isPriceCol || isWeightCol || val.includes('.') || val.includes(',')) { + // Format if header contains keywords OR if it already looks like a decimal + if (shouldFormat || val.includes('.') || val.includes(',')) { return num.toFixed(2); } }