Add gatherByQueue and gatherByCtype methods

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}

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>

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 {
+function gatherByQueue(cards: pb.BackendProto.ICard[], i18n: I18n): Count[] {
-    const totalCards = data.cards.length;
     let newCards = 0;
-    let young = 0;
+    let learn = 0;
-    let mature = 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) {
+                review += 1;
-                    mature += 1;
+                break
-                    break;
-                }
-            // young falls through
             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 = [
+    const counts: Count[] = [
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards] as Count,
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_NEW_CARDS), newCards],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_YOUNG_CARDS), young] as Count,
+        ["Learning", learn],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_MATURE_CARDS), mature] as Count,
+        ["Review", review],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended] as Count,
+        [i18n.tr(i18n.TR.STATISTICS_COUNTS_SUSPENDED_CARDS), suspended],
-        [i18n.tr(i18n.TR.STATISTICS_COUNTS_BURIED_CARDS), buried] as Count,
+        [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,

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,