fix: align stock and refill semantics

Squash merge PR #474
2026-03-25 06:49:34 +01:00
parent 37fc2b8e66
commit 7059c25f1c
18 changed files with 1063 additions and 463 deletions
@@ -33,8 +33,10 @@ import {
 	DOSE_UNITS,
 	FIELD_LIMITS,
 	getMedDisplayName,
+	getMedTotal,
 	getPackageProfile,
 	getPackageSize,
+	getStockDisplayCapacity,
 	isAmountBasedPackageType,
 	isLiquidContainerPackageType,
 	isTubePackageType,
@@ -1392,23 +1394,35 @@ export function MedicationsPage() {
 												</div>
 											)}
 											<div className="med-total">
-												{t("medications.details.stock")}:{" "}
-												{coverageByMed[getMedDisplayName(med)]
-													? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
-													: getPackageSize(med)}{" "}
-												/ {getPackageSize(med)}
+												{(() => {
+													const stockDisplayCapacity = getStockDisplayCapacity(med);
+													const currentStock = coverageByMed[getMedDisplayName(med)]
+														? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
+														: getMedTotal(med);
+
+													return (
+														<>
+															{t("medications.details.stock")}: {currentStock} / {stockDisplayCapacity}
+														</>
+													);
+												})()}
 												{getMedicationStockSuffix(med)}
-												{(coverageByMed[getMedDisplayName(med)]
-													? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
-													: getPackageSize(med)) > getPackageSize(med) && (
-													<span
-														className="info-tooltip tooltip-align-left warning-text"
-														data-tooltip={t("tooltips.stockExceedsCapacity")}
-													>
-														{" "}
-														⚠️
-													</span>
-												)}
+												{(() => {
+													const stockDisplayCapacity = getStockDisplayCapacity(med);
+													const currentStock = coverageByMed[getMedDisplayName(med)]
+														? Math.round(coverageByMed[getMedDisplayName(med)].medsLeft)
+														: getMedTotal(med);
+
+													return currentStock > stockDisplayCapacity ? (
+														<span
+															className="info-tooltip tooltip-align-left warning-text"
+															data-tooltip={t("tooltips.stockExceedsCapacity")}
+														>
+															{" "}
+															⚠️
+														</span>
+													) : null;
+												})()}
 											</div>
 										</div>
 									</div>