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 c5b0c850f9 into 62252f7216

Browse source
This commit is contained in:
Selina 2025-12-17 07:15:02 -08:00 committed by GitHub
commit 657b2f3b0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 3 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>
Selina <selinakwokhiulam@gmail.com>
******************** ********************

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

@ -7,9 +7,10 @@
import type { GraphsResponse } from "@generated/anki/stats_pb"; import type { GraphsResponse } from "@generated/anki/stats_pb";
import * as tr from "@generated/ftl"; import * as tr from "@generated/ftl";
import { localizedNumber } from "@tslib/i18n"; import { localizedDate, localizedNumber } from "@tslib/i18n";
import { dayLabel, timeSpan, TimespanUnit } from "@tslib/time"; import { dayLabel, timeSpan, TimespanUnit } from "@tslib/time";
import type { Bin, ScaleSequential } from "d3"; import type { Bin, ScaleSequential } from "d3";
import { timeDay, timeHour } from "d3";
import { import {
area, area,
axisBottom, axisBottom,
@ -47,12 +48,17 @@ export interface GraphData {
// indexed by day, where day is relative to today // indexed by day, where day is relative to today
reviewCount: Map<number, Reviews>; reviewCount: Map<number, Reviews>;
reviewTime: Map<number, Reviews>; reviewTime: Map<number, Reviews>;
rolloverHour: number;
} }
type BinType = Bin<Map<number, Reviews[]>, number>; type BinType = Bin<Map<number, Reviews[]>, number>;
export function gatherData(data: GraphsResponse): GraphData { export function gatherData(data: GraphsResponse): GraphData {
return { reviewCount: numericMap(data.reviews!.count), reviewTime: numericMap(data.reviews!.time) }; return {
reviewCount: numericMap(data.reviews!.count),
reviewTime: numericMap(data.reviews!.time),
rolloverHour: data.rolloverHour,
};
} }
enum BinIndex { enum BinIndex {
@ -212,10 +218,41 @@ export function renderReviews(
} }
function tooltipText(d: BinType, cumulative: number): string { function tooltipText(d: BinType, cumulative: number): string {
let dateStr: string;
const now = new Date();
if (d.x1! - d.x0! > 1) {
// range (year)
let startDate = timeDay.offset(now, Math.floor(d.x0!));
startDate = timeHour.offset(startDate, -sourceData.rolloverHour);
let endDate = timeDay.offset(now, Math.floor(d.x1!) - 1);
endDate = timeHour.offset(endDate, -sourceData.rolloverHour);
const startDateStr = localizedDate(startDate, {
year: "numeric",
month: "short",
day: "numeric",
});
const endDateStr = localizedDate(endDate, {
year: "numeric",
month: "short",
day: "numeric",
});
dateStr = startDateStr + " - " + endDateStr;
} else {
// 1 month, 3 months
let date = timeDay.offset(now, Math.floor(d.x0!));
date = timeHour.offset(date, -sourceData.rolloverHour);
dateStr = localizedDate(date, {
weekday: "long",
year: "numeric",
month: "long",
day: "numeric",
});
}
const day = dayLabel(d.x0!, d.x1!); const day = dayLabel(d.x0!, d.x1!);
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 colspan="2">${dateStr}<td></tr><tr><td>${day}</td><td align=end>${dayTotal}</td></tr>`;
const lines: [BinIndex | null, string][] = [ const lines: [BinIndex | null, string][] = [
[BinIndex.Filtered, tr.statisticsCountsFilteredCards()], [BinIndex.Filtered, tr.statisticsCountsFilteredCards()],
[BinIndex.Learn, tr.statisticsCountsLearningCards()], [BinIndex.Learn, tr.statisticsCountsLearningCards()],