fix: keep med detail stock and package values consistent (#249)
This commit is contained in:
@@ -215,10 +215,8 @@ export function MedDetailModal({
|
||||
const currentFullBlisters = Math.max(0, stock.fullBlisters);
|
||||
const currentPartialPills = Math.max(0, stock.openBlisterPills);
|
||||
const currentLoosePills = Math.max(0, stock.loosePills);
|
||||
const pillsPerPack = Math.max(1, selectedMed.blistersPerPack * selectedMed.pillsPerBlister);
|
||||
const remainingPacks = Math.max(0, Math.ceil(Math.max(0, currentStock) / pillsPerPack));
|
||||
const stockDisplayTotal =
|
||||
selectedMed.packageType === "bottle" ? (selectedMed.totalPills ?? packageSize) : Math.max(0, currentStock);
|
||||
selectedMed.packageType === "bottle" ? (selectedMed.totalPills ?? packageSize) : Math.max(0, structuralMax);
|
||||
const maxPartialPills = Math.min(
|
||||
Math.max(0, selectedMed.pillsPerBlister),
|
||||
Math.max(0, structuralMax - Math.max(0, editStockFullBlisters) * selectedMed.pillsPerBlister)
|
||||
@@ -763,7 +761,7 @@ export function MedDetailModal({
|
||||
<>
|
||||
<div className="med-detail-item">
|
||||
<span className="med-detail-label">{t("modal.packs")}</span>
|
||||
<span className="med-detail-value">{remainingPacks}</span>
|
||||
<span className="med-detail-value">{selectedMed.packCount}</span>
|
||||
</div>
|
||||
<div className="med-detail-item">
|
||||
<span className="med-detail-label">{t("modal.blistersPerPack")}</span>
|
||||
@@ -971,44 +969,45 @@ export function MedDetailModal({
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{/* Footer */}
|
||||
<div className="med-detail-footer">
|
||||
<button onClick={onClose}>{t("common.close")}</button>
|
||||
<div className="footer-actions">
|
||||
<button className="success" onClick={onOpenRefillModal}>
|
||||
{t("refill.button")}
|
||||
</div>
|
||||
|
||||
{/* Footer */}
|
||||
<div className="med-detail-footer">
|
||||
<button onClick={onClose}>{t("common.close")}</button>
|
||||
<div className="footer-actions">
|
||||
<button className="success" onClick={onOpenRefillModal}>
|
||||
{t("refill.button")}
|
||||
</button>
|
||||
{onOpenMedicationEdit && (
|
||||
<button
|
||||
className="info icon-only tooltip-trigger"
|
||||
onClick={onOpenMedicationEdit}
|
||||
aria-label={t("common.edit")}
|
||||
data-tooltip={t("common.edit")}
|
||||
>
|
||||
<Pencil size={18} aria-hidden="true" />
|
||||
</button>
|
||||
{onOpenMedicationEdit && (
|
||||
<button
|
||||
className="info icon-only tooltip-trigger"
|
||||
onClick={onOpenMedicationEdit}
|
||||
aria-label={t("common.edit")}
|
||||
data-tooltip={t("common.edit")}
|
||||
>
|
||||
<Pencil size={18} aria-hidden="true" />
|
||||
</button>
|
||||
)}
|
||||
{onOpenEditStockModal && (
|
||||
<button
|
||||
className="icon-stock-correction icon-only tooltip-trigger"
|
||||
onClick={onOpenEditStockModal}
|
||||
aria-label={t("editStock.buttonLabel")}
|
||||
data-tooltip={t("editStock.buttonLabel")}
|
||||
>
|
||||
<FilePenLine size={18} aria-hidden="true" />
|
||||
</button>
|
||||
)}
|
||||
{selectedMed.blisters.length > 0 && (
|
||||
<button
|
||||
className="secondary icon-only tooltip-trigger"
|
||||
onClick={() => generateICS(selectedMed)}
|
||||
aria-label={t("modal.exportTooltip")}
|
||||
data-tooltip={t("modal.exportTooltip")}
|
||||
>
|
||||
<Calendar size={18} aria-hidden="true" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{onOpenEditStockModal && (
|
||||
<button
|
||||
className="icon-stock-correction icon-only tooltip-trigger"
|
||||
onClick={onOpenEditStockModal}
|
||||
aria-label={t("editStock.buttonLabel")}
|
||||
data-tooltip={t("editStock.buttonLabel")}
|
||||
>
|
||||
<FilePenLine size={18} aria-hidden="true" />
|
||||
</button>
|
||||
)}
|
||||
{selectedMed.blisters.length > 0 && (
|
||||
<button
|
||||
className="secondary icon-only tooltip-trigger"
|
||||
onClick={() => generateICS(selectedMed)}
|
||||
aria-label={t("modal.exportTooltip")}
|
||||
data-tooltip={t("modal.exportTooltip")}
|
||||
>
|
||||
<Calendar size={18} aria-hidden="true" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -4684,7 +4684,7 @@ button.has-validation-error {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
padding-bottom: calc(1rem + env(safe-area-inset-bottom, 0px));
|
||||
margin: 0 -2rem;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Mobile devices can report wide CSS viewports (e.g., 768px in device emulation).
|
||||
@@ -4912,7 +4912,7 @@ button.has-validation-error {
|
||||
justify-content: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.75rem;
|
||||
margin: 0 -1.5rem;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.med-detail-footer > button {
|
||||
@@ -4969,9 +4969,8 @@ button.has-validation-error {
|
||||
margin: 0;
|
||||
padding-left: 1rem;
|
||||
padding-right: 1rem;
|
||||
position: sticky;
|
||||
bottom: 0;
|
||||
z-index: 5;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -216,6 +216,32 @@ describe("MedDetailModal", () => {
|
||||
const body = document.querySelector(".med-detail-body");
|
||||
expect(body).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("shows configured pack count in package details, independent from current stock", () => {
|
||||
const medWithConfiguredPacks: Medication = {
|
||||
...mockMedication,
|
||||
packCount: 11,
|
||||
blistersPerPack: 5,
|
||||
pillsPerBlister: 5,
|
||||
};
|
||||
|
||||
const lowCurrentStockCoverage: Coverage = {
|
||||
...mockCoverage,
|
||||
medsLeft: 47,
|
||||
};
|
||||
|
||||
render(
|
||||
<MedDetailModal
|
||||
{...defaultProps}
|
||||
selectedMed={medWithConfiguredPacks}
|
||||
coverage={{ all: [lowCurrentStockCoverage] }}
|
||||
/>
|
||||
);
|
||||
|
||||
const packsLabel = screen.getByText(/modal\.packs/i);
|
||||
const packsValue = packsLabel.closest(".med-detail-item")?.querySelector(".med-detail-value");
|
||||
expect(packsValue?.textContent).toBe("11");
|
||||
});
|
||||
});
|
||||
|
||||
describe("MedDetailModal without coverage", () => {
|
||||
@@ -744,7 +770,7 @@ describe("MedDetailModal stock overflow warning", () => {
|
||||
vi.clearAllMocks();
|
||||
});
|
||||
|
||||
it("does not show overflow warning icon with live stock denominator", () => {
|
||||
it("shows overflow warning icon when stock exceeds blister package capacity", () => {
|
||||
const overflowCoverage: Coverage = {
|
||||
name: "Test Med",
|
||||
medsLeft: 49,
|
||||
@@ -756,9 +782,9 @@ describe("MedDetailModal stock overflow warning", () => {
|
||||
|
||||
render(<MedDetailModal {...defaultProps} coverage={{ all: [overflowCoverage] }} />);
|
||||
|
||||
// Live denominator uses current stock, so overflow warning is not shown in detail row.
|
||||
// For blister meds, denominator is package capacity (not current stock), so overflow is shown.
|
||||
const warningIcon = document.querySelector(".info-tooltip.tooltip-align-left.warning-text");
|
||||
expect(warningIcon).not.toBeInTheDocument();
|
||||
expect(warningIcon).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("does not show warning icon when stock is within package capacity", () => {
|
||||
|
||||
Reference in New Issue
Block a user