Skip to content

ENG-613 Add expiry date to supply delivery table #16479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 6 commits into
base: develop
Choose a base branch
from
+11 −2
Open

ENG-613 Add expiry date to supply delivery table #16479

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5199d33
Initial plan
Copilot Jun 25, 2026
b39df8d
fix: show expiry date in purchase delivery table
Copilot Jun 25, 2026
1069a54
fix: refine purchase delivery expiry rendering
Copilot Jun 25, 2026
e35e92b
fix: simplify expiry date rendering
Copilot Jun 25, 2026
1fc991d
fix: remove redundant delivery fallbacks
Copilot Jun 25, 2026
f6e8cbd
fix: always show delivery expiry
Copilot Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@
return map;
}, [deliveries]);

const formatExpiryDate = (expiryDate?: string) => {
return expiryDate ? formatDate(new Date(expiryDate), "dd/MM/yyyy") : "-";
Comment on lines +168 to +169

@rithviknishad rithviknishad Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are rendering expiry date's MM and YYYY only so far everywhere in CARE. Shouldn't we follow the same pattern here as well?

};
Comment on lines +168 to +170

@greptile-apps greptile-apps Bot Jun 25, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Wrapping a date-only string like "2026-06-15" in new Date() causes the browser to interpret it as UTC midnight. In negative UTC-offset timezones (e.g. UTC−5) this renders as June 14, not June 15. Other places in the codebase that read product.expiration_date — InventoryList.tsx and StockLotSelector.tsx — pass the string directly to formatDate, which lets date-fns parse it as local time and avoids the off-by-one.

Suggested change
const formatExpiryDate = (expiryDate?: string) => {
return expiryDate ? formatDate(new Date(expiryDate), "dd/MM/yyyy") : "-";
};
const formatExpiryDate = (expiryDate?: string) => {
return expiryDate ? formatDate(expiryDate, "dd/MM/yyyy") : "-";
};

Comment on lines +168 to +170

return (
<Table>
<TableHeader>
Expand All @@ -185,6 +189,7 @@
<TableHead rowSpan={2}>{t("#")}</TableHead>
<TableHead rowSpan={2}>{t("item")}</TableHead>
<TableHead rowSpan={2}>{t("batch")}</TableHead>
<TableHead rowSpan={2}>{t("expiry")}</TableHead>
<TableHead rowSpan={2}>{t("requested_qty")}</TableHead>
{!internal && <TableHead rowSpan={2}>{t("pack_size")}</TableHead>}
{!internal && <TableHead rowSpan={2}>{t("pack_qty")}</TableHead>}
Expand Down Expand Up @@ -278,8 +283,12 @@
})()}
</TableCell>
<TableCell>
{delivery.supplied_inventory_item?.product?.batch?.lot_number ||
"-"}
{delivery.supplied_inventory_item?.product?.batch?.lot_number || "-"}

Check failure on line 286 in src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx

View workflow job for this annotation

GitHub Actions / lint 

Insert `⏎···············`
</TableCell>
<TableCell>
{formatExpiryDate(
delivery.supplied_inventory_item?.product?.expiration_date,
)}
</TableCell>
<TableCell>
{delivery.supply_request
Expand Down
Loading