From 77cb6a4accf71a2febc91f030f226b4fe06695cd Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 13 Jun 2022 08:58:33 -0700 Subject: [PATCH] IO-1911 Round TTSB to 1 decimal. --- .../scoreboard-timetickets.bar.component.jsx | 4 +--- .../scoreboard-timetickets.component.jsx | 20 ++++++++++++++++++- ...scoreboard-timetickets.stats.component.jsx | 10 +++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.bar.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.bar.component.jsx index fbf6da6d2..3ce77c42f 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.bar.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.bar.component.jsx @@ -1,12 +1,10 @@ import { Card } from "antd"; -import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { Bar, CartesianGrid, ComposedChart, - LabelList, Legend, ReferenceLine, ResponsiveContainer, @@ -69,7 +67,7 @@ export function ScoreboardTicketsBar({ data, bodyshop }) { // barSize={20} fill={data.colors[idx]} > - + {/* */} ))} diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index 35c8e2b8c..c681ee4ef 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -216,7 +216,10 @@ export default function ScoreboardTimeTickets() { ret2.push(r); }); - + roundObject(ret); + roundObject(totals); + roundObject(ret2); + console.log(ret); return { fixed: ret, timeperiod: { @@ -299,3 +302,18 @@ function getColorArray(num) { // } // return result; } + +function roundObject(inputObj) { + for (var key of Object.keys(inputObj)) { + if (typeof inputObj[key] === "number" && inputObj[key] !== 0) { + inputObj[key] = + inputObj[key] && inputObj[key].toFixed + ? inputObj[key].toFixed(1) + : inputObj[key]; //Math.round(inputObj[key] * 100) / 100; + } else if (Array.isArray(inputObj[key])) { + inputObj[key].forEach((item) => roundObject(item)); + } else if (typeof inputObj[key] === "object") { + roundObject(inputObj[key]); + } + } +} diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx index 3613ee435..72f1637b9 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx @@ -73,13 +73,13 @@ export function ScoreboardTicketsStats({ data, bodyshop }) { @@ -87,13 +87,13 @@ export function ScoreboardTicketsStats({ data, bodyshop }) { @@ -101,7 +101,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {