impr: floor accuracy intead of rounding when not showing decimal places

monkeytypegame · Feb 24, 2024 · 17e12be · 17e12be
1 parent 91c30cd
commit 17e12be
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 8 deletions.
diff --git a/frontend/__tests__/utils/format.spec.ts b/frontend/__tests__/utils/format.spec.ts
@@ -90,6 +90,13 @@ describe("format.ts", () => {
       expect(format.typingSpeed(null, { suffix: " raw" })).toEqual("-");
       expect(format.typingSpeed(undefined, { suffix: " raw" })).toEqual("-");
     });
+
+    it("should format with rounding", () => {
+      const format = getInstance({ alwaysShowDecimalPlaces: false });
+      expect(format.typingSpeed(80.25)).toEqual("80");
+      expect(format.typingSpeed(80.25, { rounding: Math.ceil })).toEqual("81");
+      expect(format.typingSpeed(80.75, { rounding: Math.floor })).toEqual("80");
+    });
   });
   describe("percentage", () => {
     it("should format with decimalPlaces from configuration", () => {
@@ -142,6 +149,13 @@ describe("format.ts", () => {
       expect(format.percentage(null, { suffix: " raw" })).toEqual("-");
       expect(format.percentage(undefined, { suffix: " raw" })).toEqual("-");
     });
+
+    it("should format with rounding", () => {
+      const format = getInstance({ alwaysShowDecimalPlaces: false });
+      expect(format.percentage(80.25)).toEqual("80%");
+      expect(format.percentage(80.25, { rounding: Math.ceil })).toEqual("81%");
+      expect(format.percentage(80.75, { rounding: Math.floor })).toEqual("80%");
+    });
   });
   describe("decimals", () => {
     it("should format with decimalPlaces from configuration", () => {
@@ -192,6 +206,13 @@ describe("format.ts", () => {
       expect(format.decimals(null, { suffix: " raw" })).toEqual("-");
       expect(format.decimals(undefined, { suffix: " raw" })).toEqual("-");
     });
+
+    it("should format with rounding", () => {
+      const format = getInstance({ alwaysShowDecimalPlaces: false });
+      expect(format.decimals(80.25)).toEqual("80");
+      expect(format.decimals(80.25, { rounding: Math.ceil })).toEqual("81");
+      expect(format.decimals(80.75, { rounding: Math.floor })).toEqual("80");
+    });
   });
 });
 

diff --git a/frontend/src/ts/account/pb-tables.ts b/frontend/src/ts/account/pb-tables.ts
@@ -156,6 +156,7 @@ function buildPbHtml(
       })}</div>
       <div class="acc">${Format.percentage(pbData.acc, {
         showDecimalPlaces: false,
+        rounding: Math.floor,
       })}</div>
     </div>
     <div class="fullTest">
@@ -164,7 +165,10 @@ function buildPbHtml(
         suffix: ` ${speedUnit}`,
       })}</div>
       <div>${Format.typingSpeed(pbData.raw, { suffix: " raw" })}</div>
-      <div>${Format.percentage(pbData.acc, { suffix: " acc" })}</div>
+      <div>${Format.percentage(pbData.acc, {
+        suffix: " acc",
+        rounding: Math.floor,
+      })}</div>
       <div>${Format.percentage(pbData.consistency, {
         suffix: " con",
       })}</div>

diff --git a/frontend/src/ts/elements/modes-notice.ts b/frontend/src/ts/elements/modes-notice.ts
@@ -158,7 +158,7 @@ export async function update(): Promise<void> {
         : "";
 
       const avgAccText = ["acc", "both"].includes(Config.showAverage)
-        ? Format.percentage(avgAcc, { suffix: " acc" })
+        ? Format.percentage(avgAcc, { suffix: " acc", rounding: Math.floor })
         : "";
 
       const text = `${avgWPMText} ${avgAccText}`.trim();

diff --git a/frontend/src/ts/pages/account.ts b/frontend/src/ts/pages/account.ts
@@ -881,9 +881,15 @@ async function fillContent(): Promise<void> {
   $(".pageAccount .highestWpm .mode").html(topMode);
   $(".pageAccount .testsTaken .val").text(testCount);
 
-  $(".pageAccount .highestAcc .val").text(Format.percentage(topAcc));
-  $(".pageAccount .avgAcc .val").text(Format.percentage(totalAcc / testCount));
-  $(".pageAccount .avgAcc10 .val").text(Format.percentage(totalAcc10 / last10));
+  $(".pageAccount .highestAcc .val").text(
+    Format.percentage(topAcc, { rounding: Math.floor })
+  );
+  $(".pageAccount .avgAcc .val").text(
+    Format.percentage(totalAcc / testCount, { rounding: Math.floor })
+  );
+  $(".pageAccount .avgAcc10 .val").text(
+    Format.percentage(totalAcc10 / last10, { rounding: Math.floor })
+  );
 
   if (totalCons === 0 || totalCons === undefined) {
     $(".pageAccount .avgCons .val").text("-");

diff --git a/frontend/src/ts/popups/pb-tables-popup.ts b/frontend/src/ts/popups/pb-tables-popup.ts
@@ -63,7 +63,9 @@ function update(mode: SharedTypes.Config.Mode): void {
         <td>
           ${Format.typingSpeed(pb.wpm)}
           <br />
-          <span class="sub">${Format.percentage(pb.acc)}</span>
+          <span class="sub">${Format.percentage(pb.acc, {
+            rounding: Math.floor,
+          })}</span>
         </td>
         <td>
           ${Format.typingSpeed(pb.raw)}

diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
@@ -228,7 +228,9 @@ function updateWpmAndAcc(): void {
   }
   $("#result .stats .raw .bottom").text(Format.typingSpeed(result.rawWpm));
   $("#result .stats .acc .bottom").text(
-    result.acc === 100 ? "100%" : Format.percentage(result.acc)
+    result.acc === 100
+      ? "100%"
+      : Format.percentage(result.acc, { rounding: Math.floor })
   );
 
   if (Config.alwaysShowDecimalPlaces) {

diff --git a/frontend/src/ts/utils/format.ts b/frontend/src/ts/utils/format.ts
@@ -6,12 +6,14 @@ export type FormatOptions = {
   showDecimalPlaces?: boolean;
   suffix?: string;
   fallback?: string;
+  rounding?: (val: number) => number;
 };
 
 const FORMAT_DEFAULT_OPTIONS: FormatOptions = {
   suffix: "",
   fallback: "-",
   showDecimalPlaces: undefined,
+  rounding: Math.round,
 };
 
 export class Formatting {
@@ -60,7 +62,7 @@ export class Formatting {
     ) {
       return Misc.roundTo2(value).toFixed(2) + suffix;
     }
-    return Math.round(value).toString() + suffix;
+    return (formatOptions.rounding ?? Math.round)(value).toString() + suffix;
   }
 }