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

Merge 8ec68182af into 62252f7216

Browse source
This commit is contained in:
Junia Mannervik 2025-12-17 05:54:34 +08:00 committed by GitHub
commit 06f5639195
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CONTRIBUTORS
View file

@ -255,6 +255,7 @@ Ranjit Odedra <ranjitodedra.dev@gmail.com>
Eltaurus <https://github.com/Eltaurus-Lt> Eltaurus <https://github.com/Eltaurus-Lt>
jariji jariji
Francisco Esteva <fr.esteva@duocuc.cl> Francisco Esteva <fr.esteva@duocuc.cl>
Junia Mannervik <junia.mannervik@gmail.com>
******************** ********************

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

@ -109,19 +109,32 @@ export function renderReviews(
break; break;
} }
const desiredBars = Math.min(70, Math.abs(xMin!)); const desiredBars = Math.min(70, Math.abs(xMin!));
const unboundRange = range == GraphRange.AllTime;
const originalXMin = xMin!;
const x = scaleLinear().domain([xMin!, xMax]); // Create initial scale to determine tick spacing
if (range === GraphRange.AllTime) { let x = scaleLinear().domain([xMin!, xMax]);
x.nice(desiredBars); let thresholds = x.ticks(desiredBars);
// For unbound ranges, extend xMin backward so that the oldest bin has the same width as others
if (unboundRange && thresholds.length >= 2) {
const spacing = thresholds[1] - thresholds[0];
const partial = thresholds[0] - xMin!;
if (spacing > 0 && partial > 0 && partial < spacing) {
xMin = thresholds[0] - spacing;
x = scaleLinear().domain([xMin, xMax]);
thresholds = x.ticks(desiredBars);
}
}
// For Year & All Time, shift thresholds forward by one day to make first bin 0-4 instead of 0-5
if (range === GraphRange.Year || range === GraphRange.AllTime) {
thresholds = [...new Set(thresholds.map(t => Math.min(t + 1, 1)))].sort((a, b) => a - b);
} }
const sourceMap = showTime ? sourceData.reviewTime : sourceData.reviewCount; const sourceMap = showTime ? sourceData.reviewTime : sourceData.reviewCount;
const bins = bin() const bins = bin()
.value((m) => { .value((m) => m[0])
return m[0];
})
.domain(x.domain() as any) .domain(x.domain() as any)
.thresholds(x.ticks(desiredBars))(sourceMap.entries() as any); .thresholds(thresholds)(sourceMap.entries() as any);
// empty graph? // empty graph?
const totalDays = sum(bins, (bin) => bin.length); const totalDays = sum(bins, (bin) => bin.length);
@ -212,7 +225,13 @@ export function renderReviews(
} }
function tooltipText(d: BinType, cumulative: number): string { function tooltipText(d: BinType, cumulative: number): string {
const day = dayLabel(d.x0!, d.x1!); // Convert bin boundaries [x0, x1) for dayLabel
// If bin ends at 0, treat it as crossing zero so day 0 is included
// For the first (oldest) bin, use the original xMin to ensure labels match the intended range
const isFirstBin = bins.length > 0 && d.x0 === bins[0].x0;
const startDay = isFirstBin ? originalXMin : Math.floor(d.x0!);
const endDay = d.x1! === 0 ? 1 : d.x1!;
const day = dayLabel(startDay, endDay);
const totals = totalsForBin(d); const totals = totalsForBin(d);
const dayTotal = valueLabel(sum(totals)); const dayTotal = valueLabel(sum(totals));
let buf = `<table><tr><td>${day}</td><td align=end>${dayTotal}</td></tr>`; let buf = `<table><tr><td>${day}</td><td align=end>${dayTotal}</td></tr>`;
@ -327,7 +346,8 @@ export function renderReviews(
}) })
.on("mouseout", hideTooltip); .on("mouseout", hideTooltip);
const periodDays = -xMin + 1; // The xMin might be extended for bin alignment, so use the original xMin
const periodDays = -originalXMin + 1;
const studiedDays = sum(bins, (bin) => bin.length); const studiedDays = sum(bins, (bin) => bin.length);
const studiedPercent = (studiedDays / periodDays) * 100; const studiedPercent = (studiedDays / periodDays) * 100;
const total = yCumMax; const total = yCumMax;