diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 7fb5b9a..cd632e1 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -34,6 +34,11 @@ function getMedTotal(med: Medication): number { return med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0); } +// Helper to get the base package size (without stockAdjustment) +function getPackageSize(med: Medication): number { + return med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets; +} + type PlannerRow = { medicationId: number; medicationName: string; @@ -2206,7 +2211,7 @@ function AppContent() { {t('medications.details.pillsPerBlister')}: {med.pillsPerBlister} {t('medications.details.loose')}: {med.looseTablets} -
{t('medications.details.total')}: {getMedTotal(med)} {t('common.pills')}
+
{t('medications.details.total')}: {getPackageSize(med)} {t('common.pills')}
@@ -3327,15 +3332,15 @@ function AppContent() {

{t('modal.stockInfo')}

{(() => { const medCoverage = coverage.all.find(c => c.name === selectedMed.name); - const totalStock = getMedTotal(selectedMed); - const currentStock = medCoverage ? Math.round(medCoverage.medsLeft) : totalStock; + const packageSize = getPackageSize(selectedMed); + const currentStock = medCoverage ? Math.round(medCoverage.medsLeft) : getMedTotal(selectedMed); const status = medCoverage ? getStockStatus(medCoverage.daysLeft, medCoverage.medsLeft, settings) : null; const textClass = status?.className === "danger" ? "danger-text" : status?.className === "warning" ? "warning-text" : "success-text"; const stock = getBlisterStock( currentStock, selectedMed.pillsPerBlister, selectedMed.looseTablets, - totalStock + packageSize ); return (
@@ -3349,7 +3354,7 @@ function AppContent() {
{t('modal.currentStock')} - {currentStock} / {totalStock} + {currentStock} / {packageSize}
);