impr(account): add restarts per test and highest wpm to activity graph

Author: Miodec

frontend/src/ts/controllers/chart-controller.ts

@@ -298,6 +298,8 @@ export type OtherChartData = {
 export type ActivityChartDataPoint = {
   x: number;
   y: number;
+  maxWpm?: number;
+  restarts?: number;
   amount?: number;
   avgWpm?: number;
   avgAcc?: number;
@@ -722,7 +724,11 @@ export const accountActivity = new ChartWithUpdateColors<
                 true
               )}\nTests Completed: ${
                 resultData.amount
-              }\nAverage ${Config.typingSpeedUnit.toUpperCase()}: ${Numbers.roundTo2(
+              }\nRestarts per test: ${Numbers.roundTo2(
+                (resultData.restarts ?? 0) / (resultData.amount ?? 0)
+              )}\nHighest ${Config.typingSpeedUnit.toUpperCase()}: ${Numbers.roundTo2(
+                typingSpeedUnit.fromWpm(resultData.maxWpm ?? 0)
+              )}\nAverage ${Config.typingSpeedUnit.toUpperCase()}: ${Numbers.roundTo2(
                 typingSpeedUnit.fromWpm(resultData.avgWpm ?? 0)
               )}\nAverage Accuracy: ${Numbers.roundTo2(
                 resultData.avgAcc ?? 0

frontend/src/ts/pages/account.ts

@@ -264,8 +264,10 @@ async function fillContent(): Promise<void> {
   type ActivityChartData = Record<
     number,
     {
+      restarts: number;
       amount: number;
       time: number;
+      maxWpm: number;
       totalWpm: number;
       totalAcc: number;
       totalCon: number;
@@ -523,20 +525,26 @@ async function fillContent(): Promise<void> {
 
     if (dataForTimestamp !== undefined) {
       dataForTimestamp.amount++;
+      dataForTimestamp.restarts += result.restartCount ?? 0;
       dataForTimestamp.time +=
         result.testDuration +
         (result.incompleteTestSeconds ?? 0) -
         (result.afkDuration ?? 0);
+      if (result.wpm > dataForTimestamp.maxWpm) {
+        dataForTimestamp.maxWpm = result.wpm;
+      }
       dataForTimestamp.totalWpm += result.wpm;
       dataForTimestamp.totalAcc += result.acc;
       dataForTimestamp.totalCon += result.consistency ?? 0;
     } else {
       activityChartData[resultTimestamp] = {
         amount: 1,
+        restarts: result.restartCount ?? 0,
         time:
           result.testDuration +
           (result.incompleteTestSeconds ?? 0) -
           (result.afkDuration ?? 0),
+        maxWpm: result.wpm,
         totalWpm: result.wpm,
         totalAcc: result.acc,
         totalCon: result.consistency ?? 0,
@@ -685,6 +693,8 @@ async function fillContent(): Promise<void> {
       x: dateInt,
       y: dataPoint.time / 60,
       amount: dataPoint.amount,
+      restarts: dataPoint.restarts,
+      maxWpm: Numbers.roundTo2(typingSpeedUnit.fromWpm(dataPoint.maxWpm)),
       avgWpm: Numbers.roundTo2(dataPoint.totalWpm / dataPoint.amount),
       avgAcc: Numbers.roundTo2(dataPoint.totalAcc / dataPoint.amount),
       avgCon: Numbers.roundTo2(dataPoint.totalCon / dataPoint.amount),