From c9f9ae532e63b0b072a6012f1d067e28d48bafeb Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 4 Aug 2020 15:15:57 +1000
Subject: [PATCH] textual data for forecast

Also stick to exact xMax, so we match the old graphs.
---
 ts/src/stats/FutureDue.svelte | 12 ++++++--
 ts/src/stats/future-due.ts    | 55 ++++++++++++++++++++++++-----------
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ts/src/stats/FutureDue.svelte b/ts/src/stats/FutureDue.svelte
index ec7bbf507..8fba07e51 100644
--- a/ts/src/stats/FutureDue.svelte
+++ b/ts/src/stats/FutureDue.svelte
@@ -1,17 +1,19 @@
 <script lang="typescript">
     import { I18n } from "../i18n";
     import { HistogramData } from "./histogram-graph";
-    import { GraphRange, RevlogRange } from "./graphs";
+    import { GraphRange, RevlogRange, TableDatum } from "./graphs";
     import { gatherData, GraphData, buildHistogram } from "./future-due";
     import pb from "../backend/proto";
     import HistogramGraph from "./HistogramGraph.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
+    import TableData from "./TableData.svelte";
 
     export let sourceData: pb.BackendProto.GraphsOut | null = null;
     export let i18n: I18n;
 
     let graphData = null as GraphData | null;
     let histogramData = null as HistogramData | null;
+    let tableData: TableDatum[] = [] as any;
     let backlog: boolean = true;
     let graphRange: GraphRange = GraphRange.Month;
 
@@ -20,7 +22,12 @@
     }
 
     $: if (graphData) {
-        histogramData = buildHistogram(graphData, graphRange, backlog, i18n);
+        [histogramData, tableData] = buildHistogram(
+            graphData,
+            graphRange,
+            backlog,
+            i18n
+        );
     }
 
     const title = i18n.tr(i18n.TR.STATISTICS_FUTURE_DUE_TITLE);
@@ -44,4 +51,5 @@
 
     <HistogramGraph data={histogramData} {i18n} />
 
+    <TableData {i18n} {tableData} />
 </div>
diff --git a/ts/src/stats/future-due.ts b/ts/src/stats/future-due.ts
index d6d3b190e..bf5764d74 100644
--- a/ts/src/stats/future-due.ts
+++ b/ts/src/stats/future-due.ts
@@ -14,7 +14,7 @@ import { HistogramData } from "./histogram-graph";
 import { interpolateGreens } from "d3-scale-chromatic";
 import { dayLabel } from "../time";
 import { I18n } from "../i18n";
-import { GraphRange } from "./graphs";
+import { GraphRange, TableDatum } from "./graphs";
 
 export interface GraphData {
     dueCounts: Map<number, number>;
@@ -60,11 +60,11 @@ export function buildHistogram(
     range: GraphRange,
     backlog: boolean,
     i18n: I18n
-): HistogramData | null {
+): [HistogramData | null, TableDatum[]] {
     // get min/max
     const data = sourceData.dueCounts;
     if (!data) {
-        return null;
+        return [null, []];
     }
 
     const [xMinOrig, origXMax] = extent<number>(data.keys());
@@ -88,12 +88,10 @@ export function buildHistogram(
         case GraphRange.AllTime:
             break;
     }
-    xMax = xMax! + 1;
-
     // cap bars to available range
     const desiredBars = Math.min(70, xMax! - xMin!);
 
-    const x = scaleLinear().domain([xMin!, xMax!]).nice();
+    const x = scaleLinear().domain([xMin!, xMax!]);
     const bins = histogram()
         .value((m) => {
             return m[0];
@@ -103,13 +101,13 @@ export function buildHistogram(
 
     // empty graph?
     if (!sum(bins, (bin) => bin.length)) {
-        return null;
+        return [null, []];
     }
 
     const adjustedRange = scaleLinear().range([0.8, 0.3]);
     const colourScale = scaleSequential((n) =>
         interpolateGreens(adjustedRange(n))
-    ).domain([xMin!, xMax]);
+    ).domain([xMin!, xMax!]);
 
     const total = sum(bins as any, binValue);
 
@@ -129,13 +127,36 @@ export function buildHistogram(
         return `${days}:<br>${cards}<br>${totalLabel}: ${cumulative}`;
     }
 
-    return {
-        scale: x,
-        bins,
-        total,
-        hoverText,
-        showArea: true,
-        colourScale,
-        binValue,
-    };
+    const periodDays = xMax! - xMin!;
+    const tableData = [
+        {
+            label: i18n.tr(i18n.TR.STATISTICS_TOTAL),
+            value: i18n.tr(i18n.TR.STATISTICS_REVIEWS, { reviews: total }),
+        },
+        {
+            label: i18n.tr(i18n.TR.STATISTICS_AVERAGE),
+            value: i18n.tr(i18n.TR.STATISTICS_REVIEWS_PER_DAY, {
+                count: Math.round(total / periodDays),
+            }),
+        },
+        {
+            label: i18n.tr(i18n.TR.STATISTICS_DUE_TOMORROW),
+            value: i18n.tr(i18n.TR.STATISTICS_REVIEWS, {
+                reviews: sourceData.dueCounts.get(1) ?? 0,
+            }),
+        },
+    ];
+
+    return [
+        {
+            scale: x,
+            bins,
+            total,
+            hoverText,
+            showArea: true,
+            colourScale,
+            binValue,
+        },
+        tableData,
+    ];
 }