switch added/future range based on revlog selection

Neither depends on the revlog, but that may not be obvious to the user.
This commit is contained in:
Damien Elmes 2020-06-29 15:30:56 +10:00
parent 330ddeb313
commit bf0ebfac96
3 changed files with 32 additions and 5 deletions

View file

@ -1,4 +1,5 @@
<script lang="typescript"> <script lang="typescript">
import { RevlogRange } from "./graphs";
import { timeSpan, MONTH, YEAR } from "../time"; import { timeSpan, MONTH, YEAR } from "../time";
import { I18n } from "../i18n"; import { I18n } from "../i18n";
import { HistogramData } from "./histogram-graph"; import { HistogramData } from "./histogram-graph";
@ -8,10 +9,23 @@
export let sourceData: pb.BackendProto.GraphsOut | null = null; export let sourceData: pb.BackendProto.GraphsOut | null = null;
export let i18n: I18n; export let i18n: I18n;
export let revlogRange: RevlogRange;
let svg = null as HTMLElement | SVGElement | null; let svg = null as HTMLElement | SVGElement | null;
let histogramData = null as HistogramData | null; let histogramData = null as HistogramData | null;
let range = AddedRange.Month; let range: AddedRange;
$: switch (revlogRange as RevlogRange) {
case RevlogRange.Month:
range = AddedRange.Month;
break;
case RevlogRange.Year:
range = AddedRange.Year;
break;
case RevlogRange.All:
range = AddedRange.AllTime;
break;
}
let addedData: GraphData | null = null; let addedData: GraphData | null = null;
$: if (sourceData) { $: if (sourceData) {

View file

@ -2,7 +2,7 @@
import { timeSpan, MONTH, YEAR } from "../time"; import { timeSpan, MONTH, YEAR } from "../time";
import { I18n } from "../i18n"; import { I18n } from "../i18n";
import { HistogramData } from "./histogram-graph"; import { HistogramData } from "./histogram-graph";
import { defaultGraphBounds } from "./graphs"; import { defaultGraphBounds, RevlogRange } from "./graphs";
import { import {
gatherData, gatherData,
renderFutureDue, renderFutureDue,
@ -15,12 +15,25 @@
export let sourceData: pb.BackendProto.GraphsOut | null = null; export let sourceData: pb.BackendProto.GraphsOut | null = null;
export let i18n: I18n; export let i18n: I18n;
export let revlogRange: RevlogRange;
let graphData = null as GraphData | null; let graphData = null as GraphData | null;
let histogramData = null as HistogramData | null; let histogramData = null as HistogramData | null;
let backlog: boolean = true; let backlog: boolean = true;
let svg = null as HTMLElement | SVGElement | null; let svg = null as HTMLElement | SVGElement | null;
let range = FutureDueRange.Month; let range: FutureDueRange;
$: switch (revlogRange as RevlogRange) {
case RevlogRange.Month:
range = FutureDueRange.Month;
break;
case RevlogRange.Year:
range = FutureDueRange.Year;
break;
case RevlogRange.All:
range = FutureDueRange.AllTime;
break;
}
$: if (sourceData) { $: if (sourceData) {
graphData = gatherData(sourceData); graphData = gatherData(sourceData);

View file

@ -141,10 +141,10 @@
<TodayStats {sourceData} {i18n} /> <TodayStats {sourceData} {i18n} />
<CardCounts {sourceData} {i18n} /> <CardCounts {sourceData} {i18n} />
<FutureDue {sourceData} {i18n} /> <FutureDue {sourceData} {revlogRange} {i18n} />
<ReviewsGraph {sourceData} {revlogRange} {i18n} /> <ReviewsGraph {sourceData} {revlogRange} {i18n} />
<IntervalsGraph {sourceData} {i18n} /> <IntervalsGraph {sourceData} {i18n} />
<EaseGraph {sourceData} {i18n} /> <EaseGraph {sourceData} {i18n} />
<HourGraph {sourceData} {i18n} /> <HourGraph {sourceData} {i18n} />
<ButtonsGraph {sourceData} {i18n} /> <ButtonsGraph {sourceData} {i18n} />
<AddedGraph {sourceData} {i18n} /> <AddedGraph {sourceData} {revlogRange} {i18n} />