GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Use firstWeekday config in graphs data

Browse source
This commit is contained in:
Henrik Giesel 2021-01-18 23:23:55 +01:00
parent 04e606bf4b
commit 4a733de94e
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ts/graphs/calendar.ts
View file

@ -13,12 +13,14 @@ import { select, mouse } from "d3-selection";
import { scaleLinear, scaleSequential } from "d3-scale"; import { scaleLinear, scaleSequential } from "d3-scale";
import { showTooltip, hideTooltip } from "./tooltip"; import { showTooltip, hideTooltip } from "./tooltip";
import { GraphBounds, setDataAvailable, RevlogRange } from "./graph-helpers"; import { GraphBounds, setDataAvailable, RevlogRange } from "./graph-helpers";
import { timeDay, timeYear, timeWeek } from "d3-time"; import { timeDay, timeYear, timeSunday, timeMonday, timeFriday, timeSaturday } from "d3-time";
import type { CountableTimeInterval } from "d3-time";
import type { I18n } from "anki/i18n"; import type { I18n } from "anki/i18n";
export interface GraphData { export interface GraphData {
// indexed by day, where day is relative to today // indexed by day, where day is relative to today
reviewCount: Map<number, number>; reviewCount: Map<number, number>;
timeFunction: CountableTimeInterval,
} }
interface DayDatum { interface DayDatum {
@ -45,7 +47,15 @@ export function gatherData(data: pb.BackendProto.GraphsOut): GraphData {
reviewCount.set(day, count + 1); reviewCount.set(day, count + 1);
} }
return { reviewCount }; let timeFunction = data.firstWeekday === 1
? timeMonday
: data.firstWeekday === 5
? timeFriday
: data.firstWeekday === 6
? timeSaturday
: timeSunday;
return { reviewCount, timeFunction };
} }
export function renderCalendar( export function renderCalendar(
@ -73,8 +83,8 @@ export function renderCalendar(
if (date.getFullYear() != targetYear) { if (date.getFullYear() != targetYear) {
continue; continue;
} }
const weekNumber = timeWeek.count(timeYear(date), date); const weekNumber = sourceData.timeFunction.count(timeYear(date), date);
const weekDay = timeDay.count(timeWeek(date), date); const weekDay = timeDay.count(sourceData.timeFunction(date), date);
const yearDay = timeDay.count(timeYear(date), date); const yearDay = timeDay.count(timeYear(date), date);
dayMap.set(yearDay, { day, count, weekNumber, weekDay, date } as DayDatum); dayMap.set(yearDay, { day, count, weekNumber, weekDay, date } as DayDatum);
if (count > maxCount) { if (count > maxCount) {
@ -105,8 +115,8 @@ export function renderCalendar(
} }
const yearDay = timeDay.count(timeYear(date), date); const yearDay = timeDay.count(timeYear(date), date);
if (!dayMap.has(yearDay)) { if (!dayMap.has(yearDay)) {
const weekNumber = timeWeek.count(timeYear(date), date); const weekNumber = sourceData.timeFunction.count(timeYear(date), date);
const weekDay = timeDay.count(timeWeek(date), date); const weekDay = timeDay.count(sourceData.timeFunction(date), date);
dayMap.set(yearDay, { dayMap.set(yearDay, {
day: yearDay, day: yearDay,
count: 0, count: 0,