Skip to content

Fix expressed feeds showing duration instead of ml amount #1

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

Closed
eddmann wants to merge 2 commits into from
Closed

Fix expressed feeds showing duration instead of ml amount #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad5764
Fix expressed feeds showing duration instead of ml amount
claude Mar 24, 2026
8430237
Sync ended_at with started_at when editing formula/expressed feeds
claude Mar 24, 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
6 changes: 4 additions & 2 deletions src/pages/Feed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,10 @@ export default function Feed() {
)}
</div>
<span className="text-[15px] font-semibold text-[var(--color-accent)] tabular-nums">
{entry.duration_seconds
? formatDuration(entry.duration_seconds)
{entry.type === "breast"
? entry.duration_seconds
? formatDuration(entry.duration_seconds)
: "-"
: entry.amount_ml
? `${entry.amount_ml}ml`
: "-"}
Expand Down
31 changes: 18 additions & 13 deletions worker/routes/feed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,24 @@ feed.put("/:id", zValidator("json", editSchema), async (c) => {
if (body.amount_ml !== undefined) updates.amount_ml = body.amount_ml;
if (body.notes !== undefined) updates.notes = body.notes;

// Recalculate duration if times changed (breast feeds)
const startedAt = (updates.started_at as string) ?? entry.started_at;
const endedAt = (updates.ended_at as string) ?? entry.ended_at;
if (
(body.started_at !== undefined || body.ended_at !== undefined) &&
endedAt
) {
const pauses: Pause[] = JSON.parse(entry.pauses);
updates.duration_seconds = calculateElapsedSeconds(
startedAt,
pauses,
endedAt,
);
if (entry.type === "breast") {
// Recalculate duration if times changed
const startedAt = (updates.started_at as string) ?? entry.started_at;
const endedAt = (updates.ended_at as string) ?? entry.ended_at;
if (
(body.started_at !== undefined || body.ended_at !== undefined) &&
endedAt
) {
const pauses: Pause[] = JSON.parse(entry.pauses);
updates.duration_seconds = calculateElapsedSeconds(
startedAt,
pauses,
endedAt,
);
}
} else if (body.started_at !== undefined) {
// Formula/expressed are instant events — keep ended_at in sync
updates.ended_at = body.started_at;
}

await repo.update(id, updates);
Expand Down