From 987b40a085538059982f771c87b86f172f3b8b55 Mon Sep 17 00:00:00 2001
From: Jack <bartnikjack@gmail.com>
Date: Thu, 15 Jul 2021 02:17:44 +0100
Subject: [PATCH] fixed activity chart including afk time rounding up the label
 text

---
 src/js/account.js          | 15 ++++++++++-----
 src/js/chart-controller.js |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/js/account.js b/src/js/account.js
index 83e82577b..81d9797c2 100644
--- a/src/js/account.js
+++ b/src/js/account.js
@@ -66,7 +66,7 @@ export function getDataAndInit() {
         CloudFunctions.removeSmallTests({ uid: user.uid });
       }
       // if($(".pageAccount").hasClass('active')) update();
-      if($(".pageLogin").hasClass('active')) UI.changePage('account');
+      if ($(".pageLogin").hasClass("active")) UI.changePage("account");
       if (!UpdateConfig.changedBeforeDb) {
         if (Config.localStorageConfig === null) {
           AccountButton.loading(false);
@@ -145,7 +145,7 @@ export function getDataAndInit() {
       ResultTagsPopup.updateButtons();
       Settings.showAccountSection();
       UI.setPageTransition(false);
-      if($(".pageLoading").hasClass('active')) UI.changePage('');
+      if ($(".pageLoading").hasClass("active")) UI.changePage("");
     })
     .catch((e) => {
       AccountButton.loading(false);
@@ -503,12 +503,17 @@ export function update() {
       if (Object.keys(activityChartData).includes(String(resultDate))) {
         activityChartData[resultDate].amount++;
         activityChartData[resultDate].time +=
-          result.testDuration + result.incompleteTestSeconds;
+          result.testDuration +
+          result.incompleteTestSeconds -
+          result.afkDuration;
         activityChartData[resultDate].totalWpm += result.wpm;
       } else {
         activityChartData[resultDate] = {
           amount: 1,
-          time: result.testDuration + result.incompleteTestSeconds,
+          time:
+            result.testDuration +
+            result.incompleteTestSeconds -
+            result.afkDuration,
           totalWpm: result.wpm,
         };
       }
@@ -838,7 +843,7 @@ $(".pageAccount #accountHistoryChart").click((e) => {
   loadMoreLines(index);
   $([document.documentElement, document.body]).animate(
     {
-      scrollTop: $(`#result-${index}`).offset().top - ($(window).height()/2),
+      scrollTop: $(`#result-${index}`).offset().top - $(window).height() / 2,
     },
     500
   );
diff --git a/src/js/chart-controller.js b/src/js/chart-controller.js
index aab13592d..81535c0de 100644
--- a/src/js/chart-controller.js
+++ b/src/js/chart-controller.js
@@ -364,7 +364,8 @@ export let accountActivity = new Chart(
               data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
             if (tooltipItem.datasetIndex === 0) {
               return `Time Typing: ${Misc.secondsToString(
-                resultData.y
+                Math.round(resultData.y),
+                true
               )}\nTests Completed: ${resultData.amount}`;
             } else if (tooltipItem.datasetIndex === 1) {
               return `Average Wpm: ${Misc.roundTo2(resultData.y)}`;