From 47551df2f95e892fad01abf40c42c4d9c181bec8 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 4 Jan 2021 12:21:30 +0100
Subject: [PATCH 1/9] Add CountMethodRadios and CardCountMethod enum

---
 ts/graphs/CountMethodRadios.svelte | 19 +++++++++++++++++++
 ts/graphs/graph-helpers.ts         |  6 ++++++
 2 files changed, 25 insertions(+)
 create mode 100644 ts/graphs/CountMethodRadios.svelte

diff --git a/ts/graphs/CountMethodRadios.svelte b/ts/graphs/CountMethodRadios.svelte
new file mode 100644
index 000000000..cbb3c1304
--- /dev/null
+++ b/ts/graphs/CountMethodRadios.svelte
@@ -0,0 +1,19 @@
+<script lang="typescript">
+    import type { I18n } from "anki/i18n";
+    import { CardCountMethod } from "./graph-helpers";
+
+    export let i18n: I18n;
+    export let cardCountMethod: CardCountMethod;
+
+    const byType = "By card type";
+    const byQueue = "By scheduling Queue";
+</script>
+
+<label>
+    <input type="radio" bind:group={cardCountMethod} value={CardCountMethod.ByType} />
+    {byType}
+</label>
+<label>
+    <input type="radio" bind:group={cardCountMethod} value={CardCountMethod.ByQueue} />
+    {byQueue}
+</label>
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index bed36f6d1..121809042 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -33,6 +33,12 @@ export enum GraphRange {
     AllTime = 3,
 }
 
+// how card should be counted
+export enum CardCountMethod {
+    ByType = 0,
+    ByQueue = 1,
+}
+
 export interface GraphsContext {
     cards: pb.BackendProto.Card[];
     revlog: pb.BackendProto.RevlogEntry[];

From ecbb08e4c51313eac9345216f064de2126fb8c54 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 4 Jan 2021 14:04:51 +0100
Subject: [PATCH 2/9] Add gatherByQueue and gatherByCtype methods

---
 ts/graphs/CardCounts.svelte        | 11 +++-
 ts/graphs/CountMethodRadios.svelte |  3 +-
 ts/graphs/card-counts.ts           | 82 +++++++++++++++++++++++-------
 ts/lib/cards.ts                    |  7 +++
 4 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index b31794c22..9af5137d5 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -1,13 +1,15 @@
 <script lang="typescript">
-    import { defaultGraphBounds } from "./graph-helpers";
+    import { CardCountMethod, defaultGraphBounds } from "./graph-helpers";
     import { gatherData, renderCards } from "./card-counts";
     import type { GraphData, TableDatum } from "./card-counts";
     import type pb from "anki/backend_proto";
     import type { I18n } from "anki/i18n";
+    import CountMethodRadios from './CountMethodRadios.svelte';
 
     export let sourceData: pb.BackendProto.GraphsOut;
     export let i18n: I18n;
 
+    let cardCountMethod = CardCountMethod.ByType;
     let svg = null as HTMLElement | SVGElement | null;
 
     let bounds = defaultGraphBounds();
@@ -16,8 +18,9 @@
 
     let graphData = (null as unknown) as GraphData;
     let tableData = (null as unknown) as TableDatum[];
+
     $: {
-        graphData = gatherData(sourceData, i18n);
+        graphData = gatherData(sourceData, cardCountMethod, i18n);
         tableData = renderCards(svg as any, bounds, graphData);
     }
 
@@ -52,6 +55,10 @@
 <div class="graph" id="graph-card-counts">
     <h1>{graphData.title}</h1>
 
+    <div class="range-box-inner">
+        <CountMethodRadios bind:cardCountMethod {i18n} />
+    </div>
+
     <div class="counts-outer">
         <svg
             bind:this={svg}
diff --git a/ts/graphs/CountMethodRadios.svelte b/ts/graphs/CountMethodRadios.svelte
index cbb3c1304..727c4dce7 100644
--- a/ts/graphs/CountMethodRadios.svelte
+++ b/ts/graphs/CountMethodRadios.svelte
@@ -6,7 +6,8 @@
     export let cardCountMethod: CardCountMethod;
 
     const byType = "By card type";
-    const byQueue = "By scheduling Queue";
+    const byQueue = "By scheduling queue";
+    const all = i18n.tr(i18n.TR.STATISTICS_RANGE_ALL_TIME);
 </script>
 
 <label>
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index ff86a774d..0b4b3c724 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { CardQueue } from "anki/cards";
+import { CardQueue, CardType } from "anki/cards";
 import type pb from "anki/backend_proto";
 import { schemeGreens, schemeBlues } from "d3-scale-chromatic";
 import "d3-transition";
@@ -15,6 +15,7 @@ import { scaleLinear } from "d3-scale";
 import { pie, arc } from "d3-shape";
 import { interpolate } from "d3-interpolate";
 import type { GraphBounds } from "./graph-helpers";
+import { CardCountMethod } from "./graph-helpers";
 import { cumsum } from "d3-array";
 import type { I18n } from "anki/i18n";
 
@@ -25,29 +26,25 @@ export interface GraphData {
     totalCards: number;
 }
 
-export function gatherData(data: pb.BackendProto.GraphsOut, i18n: I18n): GraphData {
-    const totalCards = data.cards.length;
+function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
     let newCards = 0;
-    let young = 0;
-    let mature = 0;
+    let learn = 0;
+    let review = 0;
     let suspended = 0;
     let buried = 0;
 
-    for (const card of data.cards as pb.BackendProto.Card[]) {
+    for (const card of cards as pb.BackendProto.Card[]) {
         switch (card.queue) {
             case CardQueue.New:
                 newCards += 1;
                 break;
             case CardQueue.Review:
-                if (card.interval >= 21) {
-                    mature += 1;
-                    break;
-                }
-            // young falls through
+                review += 1;
+                break
             case CardQueue.Learn:
             case CardQueue.DayLearn:
             case CardQueue.PreviewRepeat:
-                young += 1;
+                learn += 1;
                 break;
             case CardQueue.Suspended:
                 suspended += 1;
@@ -59,14 +56,63 @@ export function gatherData(data: pb.BackendProto.GraphsOut, i18n: I18n): GraphDa
         }
     }
 
-    const counts = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards] as Count,
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young] as Count,
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature] as Count,
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended] as Count,
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried] as Count,
+    const counts: Count[] = [
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
+        ["Learning", learn],
+        ["Review", review],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried],
     ];
 
+    return counts;
+}
+
+function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
+    let newCards = 0;
+    let learn = 0;
+    let young = 0;
+    let mature = 0;
+    let relearn = 0;
+
+    for (const card of cards as pb.BackendProto.Card[]) {
+        switch (card.ctype) {
+            case CardType.New:
+                newCards += 1;
+                break;
+            case CardType.Learn:
+                learn += 1;
+                break;
+            case CardType.Review:
+                if (card.interval < 21) {
+                    young += 1;
+                }
+                else {
+                    mature += 1;
+                }
+                break
+            case CardType.Relearn:
+                relearn += 1;
+                break
+        }
+    }
+
+    const counts: Count[] = [
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
+        ["Learning", learn],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature],
+        ["Relearning", relearn],
+    ];
+
+    return counts;
+}
+
+export function gatherData(data: pb.BackendProto.GraphsOut, method: CardCountMethod, i18n: I18n): GraphData {
+    const totalCards = data.cards.length;
+    const counts = method === CardCountMethod.ByType
+        ?  gatherByCtype(data.cards, i18n)
+        :  gatherByQueue(data.cards, i18n);
+
     return {
         title: i18n.tr(i18n.TR.STATISTICS_COUNTS_TITLE),
         counts,
diff --git a/ts/lib/cards.ts b/ts/lib/cards.ts
index b97e63e0d..6bc398ea5 100644
--- a/ts/lib/cards.ts
+++ b/ts/lib/cards.ts
@@ -1,6 +1,13 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
+export enum CardType {
+    New = 0,
+    Learn = 1,
+    Review = 2,
+    Relearn = 3,
+}
+
 export enum CardQueue {
     /// due is the order cards are shown in
     New = 0,

From 9e0984fee1edd9f13df353955e346ec28c3b3689 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 4 Jan 2021 15:14:50 +0100
Subject: [PATCH 3/9] Refresh colours on Card Count Pies

---
 ts/graphs/card-counts.ts | 75 ++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 0b4b3c724..9d2d655c7 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -8,7 +8,7 @@
 
 import { CardQueue, CardType } from "anki/cards";
 import type pb from "anki/backend_proto";
-import { schemeGreens, schemeBlues } from "d3-scale-chromatic";
+import { schemeGreens, schemeBlues, schemeOranges} from "d3-scale-chromatic";
 import "d3-transition";
 import { select } from "d3-selection";
 import { scaleLinear } from "d3-scale";
@@ -19,13 +19,24 @@ import { CardCountMethod } from "./graph-helpers";
 import { cumsum } from "d3-array";
 import type { I18n } from "anki/i18n";
 
-type Count = [string, number];
+type Count = [string, number, string];
 export interface GraphData {
     title: string;
     counts: Count[];
     totalCards: number;
 }
 
+const barColours = {
+    new: schemeBlues[5][2],
+    review: schemeGreens[5][2],
+    young: schemeGreens[5][2],
+    mature: schemeGreens[5][3],
+    learn: schemeOranges[5][2],
+    relearn: schemeOranges[5][3],
+    suspended: "#FFDC41",
+    buried: "grey",
+}
+
 function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
     let newCards = 0;
     let learn = 0;
@@ -57,11 +68,11 @@ function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
     }
 
     const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
-        ["Learning", learn],
-        ["Review", review],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, barColours.new],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
+        ["Review", review, barColours.review],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended, barColours.suspended],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried, barColours.buried],
     ];
 
     return counts;
@@ -97,11 +108,11 @@ function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
     }
 
     const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
-        ["Learning", learn],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature],
-        ["Relearning", relearn],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, barColours.new],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young, barColours.young],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature, barColours.mature],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn, barColours.relearn],
     ];
 
     return counts;
@@ -128,27 +139,11 @@ interface Reviews {
     early: number;
 }
 
-function barColour(idx: number): string {
-    switch (idx) {
-        case 0:
-            return schemeBlues[5][2];
-        case 1:
-            return schemeGreens[5][2];
-        case 2:
-            return schemeGreens[5][3];
-        case 3:
-            return "#FFDC41";
-        case 4:
-        default:
-            return "grey";
-    }
-}
-
 export interface SummedDatum {
     label: string;
     // count of this particular item
     count: number;
-    idx: number;
+    colour: string;
     // running total
     total: number;
 }
@@ -165,12 +160,13 @@ export function renderCards(
     bounds: GraphBounds,
     sourceData: GraphData
 ): TableDatum[] {
-    const summed = cumsum(sourceData.counts, (d) => d[1]);
+    const summed = cumsum(sourceData.counts, (d: Count) => d[1]);
     const data = Array.from(summed).map((n, idx) => {
         const count = sourceData.counts[idx];
         return {
             label: count[0],
             count: count[1],
+            colour: count[2],
             idx,
             total: n,
         } as SummedDatum;
@@ -181,7 +177,7 @@ export function renderCards(
     const x = scaleLinear().domain([0, xMax]);
     const svg = select(svgElem);
     const paths = svg.select(".counts");
-    const pieData = pie()(sourceData.counts.map((d) => d[1]));
+    const pieData = pie()(sourceData.counts.map((d: Count) => d[1]));
     const radius = bounds.height / 2 - bounds.marginTop - bounds.marginBottom;
     const arcGen = arc().innerRadius(0).outerRadius(radius);
     const trans = svg.transition().duration(600) as any;
@@ -194,16 +190,21 @@ export function renderCards(
             (enter) =>
                 enter
                     .append("path")
-                    .attr("fill", function (d, i) {
-                        return barColour(i);
+                    .attr("fill", (_d, i) => {
+                        return data[i].colour;
                     })
                     .attr("d", arcGen as any),
             function (update) {
                 return update.call((d) =>
-                    d.transition(trans).attrTween("d", (d) => {
+                    d
+                    .transition(trans)
+                    .attr("fill", (_d, i) => {
+                        return data[i].colour;
+                    })
+                    .attrTween("d", (d) => {
                         const interpolator = interpolate(
                             { startAngle: 0, endAngle: 0 },
-                            d
+                            d,
                         );
                         return (t): string => arcGen(interpolator(t) as any) as string;
                     })
@@ -213,13 +214,13 @@ export function renderCards(
 
     x.range([bounds.marginLeft, bounds.width - bounds.marginRight]);
 
-    const tableData = data.map((d, idx) => {
+    const tableData = data.map((d) => {
         const percent = ((d.count / xMax) * 100).toFixed(1);
         return {
             label: d.label,
             count: d.count,
             percent: `${percent}%`,
-            colour: barColour(idx),
+            colour: d.colour,
         } as TableDatum;
     });
 

From 2ae09ae39e8bb737b6b4a7e51295db92ee120619 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Mon, 4 Jan 2021 15:36:15 +0100
Subject: [PATCH 4/9] Satisfy formatter

---
 ts/graphs/CardCounts.svelte |  2 +-
 ts/graphs/card-counts.ts    | 61 ++++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index 9af5137d5..d343d021f 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -4,7 +4,7 @@
     import type { GraphData, TableDatum } from "./card-counts";
     import type pb from "anki/backend_proto";
     import type { I18n } from "anki/i18n";
-    import CountMethodRadios from './CountMethodRadios.svelte';
+    import CountMethodRadios from "./CountMethodRadios.svelte";
 
     export let sourceData: pb.BackendProto.GraphsOut;
     export let i18n: I18n;
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 9d2d655c7..b70cde5a5 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -8,7 +8,7 @@
 
 import { CardQueue, CardType } from "anki/cards";
 import type pb from "anki/backend_proto";
-import { schemeGreens, schemeBlues, schemeOranges} from "d3-scale-chromatic";
+import { schemeGreens, schemeBlues, schemeOranges } from "d3-scale-chromatic";
 import "d3-transition";
 import { select } from "d3-selection";
 import { scaleLinear } from "d3-scale";
@@ -35,7 +35,7 @@ const barColours = {
     relearn: schemeOranges[5][3],
     suspended: "#FFDC41",
     buried: "grey",
-}
+};
 
 function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
     let newCards = 0;
@@ -51,7 +51,7 @@ function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
                 break;
             case CardQueue.Review:
                 review += 1;
-                break
+                break;
             case CardQueue.Learn:
             case CardQueue.DayLearn:
             case CardQueue.PreviewRepeat:
@@ -71,7 +71,11 @@ function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, barColours.new],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
         ["Review", review, barColours.review],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended, barColours.suspended],
+        [
+            i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS),
+            suspended,
+            barColours.suspended,
+        ],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried, barColours.buried],
     ];
 
@@ -96,14 +100,13 @@ function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
             case CardType.Review:
                 if (card.interval < 21) {
                     young += 1;
-                }
-                else {
+                } else {
                     mature += 1;
                 }
-                break
+                break;
             case CardType.Relearn:
                 relearn += 1;
-                break
+                break;
         }
     }
 
@@ -112,17 +115,26 @@ function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young, barColours.young],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature, barColours.mature],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn, barColours.relearn],
+        [
+            i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS),
+            relearn,
+            barColours.relearn,
+        ],
     ];
 
     return counts;
 }
 
-export function gatherData(data: pb.BackendProto.GraphsOut, method: CardCountMethod, i18n: I18n): GraphData {
+export function gatherData(
+    data: pb.BackendProto.GraphsOut,
+    method: CardCountMethod,
+    i18n: I18n
+): GraphData {
     const totalCards = data.cards.length;
-    const counts = method === CardCountMethod.ByType
-        ?  gatherByCtype(data.cards, i18n)
-        :  gatherByQueue(data.cards, i18n);
+    const counts =
+        method === CardCountMethod.ByType
+            ? gatherByCtype(data.cards, i18n)
+            : gatherByQueue(data.cards, i18n);
 
     return {
         title: i18n.tr(i18n.TR.STATISTICS_COUNTS_TITLE),
@@ -197,17 +209,18 @@ export function renderCards(
             function (update) {
                 return update.call((d) =>
                     d
-                    .transition(trans)
-                    .attr("fill", (_d, i) => {
-                        return data[i].colour;
-                    })
-                    .attrTween("d", (d) => {
-                        const interpolator = interpolate(
-                            { startAngle: 0, endAngle: 0 },
-                            d,
-                        );
-                        return (t): string => arcGen(interpolator(t) as any) as string;
-                    })
+                        .transition(trans)
+                        .attr("fill", (_d, i) => {
+                            return data[i].colour;
+                        })
+                        .attrTween("d", (d) => {
+                            const interpolator = interpolate(
+                                { startAngle: 0, endAngle: 0 },
+                                d
+                            );
+                            return (t): string =>
+                                arcGen(interpolator(t) as any) as string;
+                        })
                 );
             }
         );

From 681d82f5ccf7e8df4ec4651d89fb1069356cb4d9 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 5 Jan 2021 16:13:06 +0100
Subject: [PATCH 5/9] Replace CountMethodRadios with SeparateInactiveCheckbox
 method

* cards will still be mostly counted by ctype rather than queue
* if the user wants to include inactive cards buried and suspended will
  be first filtered out, before the rest is counted by ctype
---
 ts/graphs/CardCounts.svelte               |  10 +-
 ts/graphs/CountMethodRadios.svelte        |  20 ----
 ts/graphs/SeparateInactiveCheckbox.svelte |  14 +++
 ts/graphs/card-counts.ts                  | 124 +++++++---------------
 ts/graphs/graph-helpers.ts                |   6 --
 5 files changed, 60 insertions(+), 114 deletions(-)
 delete mode 100644 ts/graphs/CountMethodRadios.svelte
 create mode 100644 ts/graphs/SeparateInactiveCheckbox.svelte

diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index d343d021f..51b405389 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -1,15 +1,15 @@
 <script lang="typescript">
-    import { CardCountMethod, defaultGraphBounds } from "./graph-helpers";
+    import { defaultGraphBounds } from "./graph-helpers";
     import { gatherData, renderCards } from "./card-counts";
     import type { GraphData, TableDatum } from "./card-counts";
     import type pb from "anki/backend_proto";
     import type { I18n } from "anki/i18n";
-    import CountMethodRadios from "./CountMethodRadios.svelte";
+    import SeparateInactiveCheckbox from "./SeparateInactiveCheckbox.svelte";
 
     export let sourceData: pb.BackendProto.GraphsOut;
     export let i18n: I18n;
 
-    let cardCountMethod = CardCountMethod.ByType;
+    let separateInactive = false;
     let svg = null as HTMLElement | SVGElement | null;
 
     let bounds = defaultGraphBounds();
@@ -20,7 +20,7 @@
     let tableData = (null as unknown) as TableDatum[];
 
     $: {
-        graphData = gatherData(sourceData, cardCountMethod, i18n);
+        graphData = gatherData(sourceData, separateInactive, i18n);
         tableData = renderCards(svg as any, bounds, graphData);
     }
 
@@ -56,7 +56,7 @@
     <h1>{graphData.title}</h1>
 
     <div class="range-box-inner">
-        <CountMethodRadios bind:cardCountMethod {i18n} />
+        <SeparateInactiveCheckbox bind:separateInactive {i18n} />
     </div>
 
     <div class="counts-outer">
diff --git a/ts/graphs/CountMethodRadios.svelte b/ts/graphs/CountMethodRadios.svelte
deleted file mode 100644
index 727c4dce7..000000000
--- a/ts/graphs/CountMethodRadios.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="typescript">
-    import type { I18n } from "anki/i18n";
-    import { CardCountMethod } from "./graph-helpers";
-
-    export let i18n: I18n;
-    export let cardCountMethod: CardCountMethod;
-
-    const byType = "By card type";
-    const byQueue = "By scheduling queue";
-    const all = i18n.tr(i18n.TR.STATISTICS_RANGE_ALL_TIME);
-</script>
-
-<label>
-    <input type="radio" bind:group={cardCountMethod} value={CardCountMethod.ByType} />
-    {byType}
-</label>
-<label>
-    <input type="radio" bind:group={cardCountMethod} value={CardCountMethod.ByQueue} />
-    {byQueue}
-</label>
diff --git a/ts/graphs/SeparateInactiveCheckbox.svelte b/ts/graphs/SeparateInactiveCheckbox.svelte
new file mode 100644
index 000000000..6e1111ead
--- /dev/null
+++ b/ts/graphs/SeparateInactiveCheckbox.svelte
@@ -0,0 +1,14 @@
+<script lang="typescript">
+    import type { I18n } from "anki/i18n";
+
+    export let i18n: I18n;
+    export let separateInactive: bool = false;
+
+    const label = "Separate suspended/buried cards";
+    const all = i18n.tr(i18n.TR.STATISTICS_RANGE_ALL_TIME);
+</script>
+
+<label>
+    <input type="checkbox" bind:checked={separateInactive} />
+    {label}
+</label>
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index b70cde5a5..44542af25 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -15,81 +15,48 @@ import { scaleLinear } from "d3-scale";
 import { pie, arc } from "d3-shape";
 import { interpolate } from "d3-interpolate";
 import type { GraphBounds } from "./graph-helpers";
-import { CardCountMethod } from "./graph-helpers";
 import { cumsum } from "d3-array";
 import type { I18n } from "anki/i18n";
 
-type Count = [string, number, string];
+type Count = [string, number];
 export interface GraphData {
     title: string;
     counts: Count[];
     totalCards: number;
 }
 
-const barColours = {
-    new: schemeBlues[5][2],
-    review: schemeGreens[5][2],
-    young: schemeGreens[5][2],
-    mature: schemeGreens[5][3],
-    learn: schemeOranges[5][2],
-    relearn: schemeOranges[5][3],
-    suspended: "#FFDC41",
-    buried: "grey",
-};
+const barColours = [
+    schemeBlues[5][2] /* new */,
+    schemeOranges[5][2] /* learn */,
+    schemeOranges[5][3] /* relearn */,
+    schemeGreens[5][2] /* young */,
+    schemeGreens[5][3] /* mature */,
+    "#FFDC41" /* suspended */,
+    "grey" /* buried */,
+];
 
-function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
+function countCards(cards: pb.BackendProto.ICard[], separateInactive: boolean, i18n: I18n): Count[] {
     let newCards = 0;
     let learn = 0;
-    let review = 0;
+    let relearn = 0;
+    let young = 0;
+    let mature = 0;
     let suspended = 0;
     let buried = 0;
 
     for (const card of cards as pb.BackendProto.Card[]) {
-        switch (card.queue) {
-            case CardQueue.New:
-                newCards += 1;
-                break;
-            case CardQueue.Review:
-                review += 1;
-                break;
-            case CardQueue.Learn:
-            case CardQueue.DayLearn:
-            case CardQueue.PreviewRepeat:
-                learn += 1;
-                break;
-            case CardQueue.Suspended:
-                suspended += 1;
-                break;
-            case CardQueue.SchedBuried:
-            case CardQueue.UserBuried:
-                buried += 1;
-                break;
+        if (separateInactive) {
+            switch (card.queue) {
+                case CardQueue.Suspended:
+                    suspended += 1;
+                    continue;
+                case CardQueue.SchedBuried:
+                case CardQueue.UserBuried:
+                    buried += 1;
+                    continue;
+            }
         }
-    }
 
-    const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, barColours.new],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
-        ["Review", review, barColours.review],
-        [
-            i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS),
-            suspended,
-            barColours.suspended,
-        ],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried, barColours.buried],
-    ];
-
-    return counts;
-}
-
-function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
-    let newCards = 0;
-    let learn = 0;
-    let young = 0;
-    let mature = 0;
-    let relearn = 0;
-
-    for (const card of cards as pb.BackendProto.Card[]) {
         switch (card.ctype) {
             case CardType.New:
                 newCards += 1;
@@ -110,31 +77,28 @@ function gatherByCtype(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
         }
     }
 
+
     const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, barColours.new],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, barColours.learn],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young, barColours.young],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature, barColours.mature],
-        [
-            i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS),
-            relearn,
-            barColours.relearn,
-        ],
-    ];
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried],
+    ]
+
 
     return counts;
 }
 
 export function gatherData(
     data: pb.BackendProto.GraphsOut,
-    method: CardCountMethod,
+    separateInactive: boolean,
     i18n: I18n
 ): GraphData {
     const totalCards = data.cards.length;
-    const counts =
-        method === CardCountMethod.ByType
-            ? gatherByCtype(data.cards, i18n)
-            : gatherByQueue(data.cards, i18n);
+    const counts = countCards(data.cards, separateInactive, i18n)
 
     return {
         title: i18n.tr(i18n.TR.STATISTICS_COUNTS_TITLE),
@@ -155,7 +119,6 @@ export interface SummedDatum {
     label: string;
     // count of this particular item
     count: number;
-    colour: string;
     // running total
     total: number;
 }
@@ -178,7 +141,6 @@ export function renderCards(
         return {
             label: count[0],
             count: count[1],
-            colour: count[2],
             idx,
             total: n,
         } as SummedDatum;
@@ -199,20 +161,16 @@ export function renderCards(
         .selectAll("path")
         .data(pieData)
         .join(
-            (enter) =>
-                enter
+            (enter) => enter
                     .append("path")
-                    .attr("fill", (_d, i) => {
-                        return data[i].colour;
+                    .attr("fill", (_d, idx) => {
+                        return barColours[idx];
                     })
                     .attr("d", arcGen as any),
             function (update) {
                 return update.call((d) =>
                     d
                         .transition(trans)
-                        .attr("fill", (_d, i) => {
-                            return data[i].colour;
-                        })
                         .attrTween("d", (d) => {
                             const interpolator = interpolate(
                                 { startAngle: 0, endAngle: 0 },
@@ -227,13 +185,13 @@ export function renderCards(
 
     x.range([bounds.marginLeft, bounds.width - bounds.marginRight]);
 
-    const tableData = data.map((d) => {
+    const tableData = data.map((d, idx) => {
         const percent = ((d.count / xMax) * 100).toFixed(1);
         return {
             label: d.label,
             count: d.count,
             percent: `${percent}%`,
-            colour: d.colour,
+            colour: barColours[idx],
         } as TableDatum;
     });
 
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index 121809042..bed36f6d1 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -33,12 +33,6 @@ export enum GraphRange {
     AllTime = 3,
 }
 
-// how card should be counted
-export enum CardCountMethod {
-    ByType = 0,
-    ByQueue = 1,
-}
-
 export interface GraphsContext {
     cards: pb.BackendProto.Card[];
     revlog: pb.BackendProto.RevlogEntry[];

From 15123915a0658304fe54ef2227459c14c1ab7352 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 5 Jan 2021 16:47:47 +0100
Subject: [PATCH 6/9] Make pie graphs display correctly when switching between
 categories

---
 ts/graphs/card-counts.ts | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 44542af25..bced16db4 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -18,7 +18,7 @@ import type { GraphBounds } from "./graph-helpers";
 import { cumsum } from "d3-array";
 import type { I18n } from "anki/i18n";
 
-type Count = [string, number];
+type Count = [string, number, boolean];
 export interface GraphData {
     title: string;
     counts: Count[];
@@ -79,16 +79,15 @@ function countCards(cards: pb.BackendProto.ICard[], separateInactive: boolean, i
 
 
     const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, true],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, true],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn, true],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young, true],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature, true],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended, separateInactive],
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried, separateInactive],
     ]
 
-
     return counts;
 }
 
@@ -119,6 +118,8 @@ export interface SummedDatum {
     label: string;
     // count of this particular item
     count: number;
+    // show up in the table
+    show: boolean,
     // running total
     total: number;
 }
@@ -141,6 +142,7 @@ export function renderCards(
         return {
             label: count[0],
             count: count[1],
+            show: count[2],
             idx,
             total: n,
         } as SummedDatum;
@@ -185,14 +187,17 @@ export function renderCards(
 
     x.range([bounds.marginLeft, bounds.width - bounds.marginRight]);
 
-    const tableData = data.map((d, idx) => {
+    // @ts-ignore
+    const tableData = data.flatMap((d: SummedDatum, idx: number) => {
         const percent = ((d.count / xMax) * 100).toFixed(1);
-        return {
-            label: d.label,
-            count: d.count,
-            percent: `${percent}%`,
-            colour: barColours[idx],
-        } as TableDatum;
+        return d.show
+            ? {
+                label: d.label,
+                count: d.count,
+                percent: `${percent}%`,
+                colour: barColours[idx],
+            } as TableDatum
+            : [];
     });
 
     return tableData;

From f5e90bb2497653e56ff60166c972112f8f080057 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 5 Jan 2021 17:15:47 +0100
Subject: [PATCH 7/9] Satisfy formatter

---
 ts/graphs/SeparateInactiveCheckbox.svelte |  7 +--
 ts/graphs/card-counts.ts                  | 54 ++++++++++++-----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ts/graphs/SeparateInactiveCheckbox.svelte b/ts/graphs/SeparateInactiveCheckbox.svelte
index 6e1111ead..46c8378e1 100644
--- a/ts/graphs/SeparateInactiveCheckbox.svelte
+++ b/ts/graphs/SeparateInactiveCheckbox.svelte
@@ -2,13 +2,10 @@
     import type { I18n } from "anki/i18n";
 
     export let i18n: I18n;
-    export let separateInactive: bool = false;
+    export let separateInactive: boolean = false;
 
     const label = "Separate suspended/buried cards";
     const all = i18n.tr(i18n.TR.STATISTICS_RANGE_ALL_TIME);
 </script>
 
-<label>
-    <input type="checkbox" bind:checked={separateInactive} />
-    {label}
-</label>
+<label> <input type="checkbox" bind:checked={separateInactive} /> {label} </label>
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index bced16db4..25c8f4a34 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -35,7 +35,11 @@ const barColours = [
     "grey" /* buried */,
 ];
 
-function countCards(cards: pb.BackendProto.ICard[], separateInactive: boolean, i18n: I18n): Count[] {
+function countCards(
+    cards: pb.BackendProto.ICard[],
+    separateInactive: boolean,
+    i18n: I18n
+): Count[] {
     let newCards = 0;
     let learn = 0;
     let relearn = 0;
@@ -77,16 +81,19 @@ function countCards(cards: pb.BackendProto.ICard[], separateInactive: boolean, i
         }
     }
 
-
     const counts: Count[] = [
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards, true],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_LEARNING_CARDS), learn, true],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_RELEARNING_CARDS), relearn, true],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young, true],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature, true],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended, separateInactive],
+        [
+            i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS),
+            suspended,
+            separateInactive,
+        ],
         [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried, separateInactive],
-    ]
+    ];
 
     return counts;
 }
@@ -97,7 +104,7 @@ export function gatherData(
     i18n: I18n
 ): GraphData {
     const totalCards = data.cards.length;
-    const counts = countCards(data.cards, separateInactive, i18n)
+    const counts = countCards(data.cards, separateInactive, i18n);
 
     return {
         title: i18n.tr(i18n.TR.STATISTICS_COUNTS_TITLE),
@@ -119,7 +126,7 @@ export interface SummedDatum {
     // count of this particular item
     count: number;
     // show up in the table
-    show: boolean,
+    show: boolean;
     // running total
     total: number;
 }
@@ -163,7 +170,8 @@ export function renderCards(
         .selectAll("path")
         .data(pieData)
         .join(
-            (enter) => enter
+            (enter) =>
+                enter
                     .append("path")
                     .attr("fill", (_d, idx) => {
                         return barColours[idx];
@@ -171,32 +179,28 @@ export function renderCards(
                     .attr("d", arcGen as any),
             function (update) {
                 return update.call((d) =>
-                    d
-                        .transition(trans)
-                        .attrTween("d", (d) => {
-                            const interpolator = interpolate(
-                                { startAngle: 0, endAngle: 0 },
-                                d
-                            );
-                            return (t): string =>
-                                arcGen(interpolator(t) as any) as string;
-                        })
+                    d.transition(trans).attrTween("d", (d) => {
+                        const interpolator = interpolate(
+                            { startAngle: 0, endAngle: 0 },
+                            d
+                        );
+                        return (t): string => arcGen(interpolator(t) as any) as string;
+                    })
                 );
             }
         );
 
     x.range([bounds.marginLeft, bounds.width - bounds.marginRight]);
 
-    // @ts-ignore
-    const tableData = data.flatMap((d: SummedDatum, idx: number) => {
+    const tableData = (data as any).flatMap((d: SummedDatum, idx: number) => {
         const percent = ((d.count / xMax) * 100).toFixed(1);
         return d.show
-            ? {
-                label: d.label,
-                count: d.count,
-                percent: `${percent}%`,
-                colour: barColours[idx],
-            } as TableDatum
+            ? ({
+                  label: d.label,
+                  count: d.count,
+                  percent: `${percent}%`,
+                  colour: barColours[idx],
+              } as TableDatum)
             : [];
     });
 

From ee94c7eb93b14542481eff0a7b6459fd068cf9bf Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 5 Jan 2021 19:13:57 +0100
Subject: [PATCH 8/9] Add label for SeparateInactiveCheckbox in ftl file

---
 ftl/core/statistics.ftl                   | 1 +
 ts/graphs/SeparateInactiveCheckbox.svelte | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftl/core/statistics.ftl b/ftl/core/statistics.ftl
index 685bcabe6..e03a332c2 100644
--- a/ftl/core/statistics.ftl
+++ b/ftl/core/statistics.ftl
@@ -87,6 +87,7 @@ statistics-counts-early-cards = Early
 statistics-counts-learning-cards = Learning
 statistics-counts-relearning-cards = Relearning
 statistics-counts-title = Card Counts
+statistics-counts-separate-suspended-buried-cards = Separate suspended / buried cards
 statistics-range-all-time = all
 statistics-range-1-year-history = last 12 months
 statistics-range-all-history = all history
diff --git a/ts/graphs/SeparateInactiveCheckbox.svelte b/ts/graphs/SeparateInactiveCheckbox.svelte
index 46c8378e1..58050420b 100644
--- a/ts/graphs/SeparateInactiveCheckbox.svelte
+++ b/ts/graphs/SeparateInactiveCheckbox.svelte
@@ -4,8 +4,7 @@
     export let i18n: I18n;
     export let separateInactive: boolean = false;
 
-    const label = "Separate suspended/buried cards";
-    const all = i18n.tr(i18n.TR.STATISTICS_RANGE_ALL_TIME);
+    const label = i18n.tr(i18n.TR.STATISTICS_COUNTS_SEPARATE_SUSPENDED_BURIED_CARDS);
 </script>
 
 <label> <input type="checkbox" bind:checked={separateInactive} /> {label} </label>

From 6c638b87f58ea47ce1dea2ef0193e94271079dcc Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 5 Jan 2021 19:37:14 +0100
Subject: [PATCH 9/9] Switch relearning cards to schemeReds

---
 ts/graphs/card-counts.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 25c8f4a34..7451466c1 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -8,7 +8,12 @@
 
 import { CardQueue, CardType } from "anki/cards";
 import type pb from "anki/backend_proto";
-import { schemeGreens, schemeBlues, schemeOranges } from "d3-scale-chromatic";
+import {
+    schemeGreens,
+    schemeBlues,
+    schemeOranges,
+    schemeReds,
+} from "d3-scale-chromatic";
 import "d3-transition";
 import { select } from "d3-selection";
 import { scaleLinear } from "d3-scale";
@@ -28,7 +33,7 @@ export interface GraphData {
 const barColours = [
     schemeBlues[5][2] /* new */,
     schemeOranges[5][2] /* learn */,
-    schemeOranges[5][3] /* relearn */,
+    schemeReds[5][2] /* relearn */,
     schemeGreens[5][2] /* young */,
     schemeGreens[5][3] /* mature */,
     "#FFDC41" /* suspended */,