From aa4b4998fa3ffe7c4526eb3edbfed63f7d7242a9 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 5 Sep 2024 16:18:49 -0700 Subject: [PATCH] IO-2904 Production Board Visual Subtotal Signed-off-by: Allan Carr --- .../production-board-kanban-card.component.jsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx index 798f7f7ec..77e7f3c0d 100644 --- a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx @@ -6,11 +6,11 @@ import { PauseCircleOutlined } from "@ant-design/icons"; import { Card, Col, Row, Space, Tooltip } from "antd"; +import Dinero from "dinero.js"; import React, { useMemo } from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; import { DateTimeFormatter } from "../../utils/DateFormatter"; -import Dinero from "dinero.js"; import ProductionAlert from "../production-list-columns/production-list-columns.alert.component"; import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component"; @@ -18,8 +18,8 @@ import ProductionSubletsManageComponent from "../production-sublets-manage/produ import dayjs from "../../utils/day"; -import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component"; +import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; const cardColor = (ssbuckets, totalHrs) => { const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs)); @@ -213,21 +213,13 @@ const EstimatorToolTip = ({ metadata, cardSettings }) => { }; const SubtotalTooltip = ({ metadata, cardSettings, t }) => { - const amount = metadata?.job_totals?.totals?.subtotal?.amount; - const dineroAmount = amount ? Dinero({ amount: parseInt(amount * 100) }).toFormat("0,0.00") : null; + const dineroAmount = Dinero(metadata?.job_totals?.totals?.subtotal ?? Dinero()).toFormat(); return ( cardSettings?.subtotal && ( - - {!!amount ? ( - {`${t("production.statistics.currency_symbol")}${dineroAmount}`} - ) : ( -   - )} + + {dineroAmount} )