GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-07 02:53:54 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

bin labels and totals correct for year, review

Browse source
This commit is contained in:
junlu592 2025-12-01 13:16:47 +01:00
parent 2da59a4768
commit 8a8f07c3c3
2 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ts/lib/tslib/time.ts
View file

@ -170,20 +170,37 @@ export function dayLabel(daysStart: number, daysEnd: number): string {
} else {
return tr.statisticsDaysAgoSingle({ days: -daysStart });
}
} else {
// range
if (daysStart >= 0) {
return tr.statisticsInDaysRange({
daysStart,
daysEnd: daysEnd - 1,
});
} else {
return tr.statisticsDaysAgoRange({
daysStart: Math.abs(daysEnd - 1),
daysEnd: -daysStart,
});
// range
if (daysStart >= 0) {
return tr.statisticsInDaysRange({
daysStart,
daysEnd: daysEnd - 1,
});
} else {
// For bins that cross or end at day 0, we need special handling
if (daysEnd > 0) {
// Bin crosses day 0: show from 0 to the oldest day (exclusive of endDay)
// If bin is [-5, 1), we want "0-4 days ago"
return tr.statisticsDaysAgoRange({
daysStart: 0,
daysEnd: -daysStart - 1,
});
} else {
// Bin is entirely in the past: show from newest to oldest
// For a bin [startDay, endDay), to show consecutive ranges like "0-4", "5-9", "10-14",
// we use endDay as the start of the range
// The bin width is daysEnd - daysStart, so daysEnd = daysStart + (width - 1)
// Example: bin [-10, -5) has width 5, should show "5-9 days ago"
const binWidth = Math.abs(daysEnd - daysStart);
const daysStartAbs = Math.abs(daysEnd);
return tr.statisticsDaysAgoRange({
daysStart: daysStartAbs,
daysEnd: daysStartAbs + binWidth - 1,
});
}
}
}
}
}
/** Helper for converting Unix timestamps to date strings. */

4
ts/routes/graphs/reviews.ts
View file

@ -237,7 +237,9 @@ export function renderReviews(
function tooltipText(d: BinType, cumulative: number): string {
const startDay = Math.floor(d.x0!);
const endDay = Math.ceil(d.x1!);
// If bin ends at 0, treat it as including day 0 (so use 1 as endDay for dayLabel)
// For negative bins, use the bin end directly (dayLabel will handle the conversion)
const endDay = d.x1! === 0 ? 1 : d.x1! < 0 ? d.x1! : Math.ceil(d.x1!);
const day = dayLabel(startDay, endDay);
const totals = totalsForBin(d);
const dayTotal = valueLabel(sum(totals));