From d4753c0754d91732c7f1dbb6d1d0b27c33520d6a Mon Sep 17 00:00:00 2001 From: James Pattinson Date: Sun, 12 Apr 2026 06:31:03 -0400 Subject: [PATCH] Ship it --- frontend/app.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/app.js b/frontend/app.js index 2874cf8..2c1b830 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -1540,12 +1540,19 @@ function renderDrugs() { ${drug.variants.map(variant => { const variantIsLowStock = variant.quantity <= variant.low_stock_threshold; const variantExpanded = expandedVariants.has(variant.id); + const expiredQuantity = (variant.batches || []) + .filter(batch => Number(batch.quantity) > 0 && isBatchExpired(batch)) + .reduce((sum, batch) => sum + Number(batch.quantity || 0), 0); + const inDateQuantity = Math.max(0, Number(variant.quantity || 0) - expiredQuantity); + const quantityDisplay = expiredQuantity > 0 + ? `${formatDisplayNumber(inDateQuantity)} ${escapeHtml(variant.unit)} (${formatDisplayNumber(expiredQuantity)} expired)` + : `${formatDisplayNumber(variant.quantity)} ${escapeHtml(variant.unit)}`; return `
${escapeHtml(drug.name)} ${escapeHtml(variant.strength)}
-
${variant.quantity} ${escapeHtml(variant.unit)}
+
${quantityDisplay}