diff --git a/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx b/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx index 1af5ec59c..f96b63903 100644 --- a/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban.statistics.jsx @@ -3,6 +3,7 @@ import { Card, Statistic } from "antd"; import { useTranslation } from "react-i18next"; import PropTypes from "prop-types"; import { defaultKanbanSettings, statisticsItems } from "./settings/defaultKanbanSettings.js"; +import Dinero from "dinero.js"; export const StatisticType = { HOURS: "hours", @@ -31,8 +32,33 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => { return items.reduce((acc, item) => acc + (item[key]?.aggregate?.sum?.[subKey] || 0), 0); }; + const sumDineroAmounts = (items, key, getAmountFn) => { + return items.reduce( + (acc, item) => { + const amount = getAmountFn(item, key); + const dineroAmount = Dinero(amount ?? 0); + return acc.add(dineroAmount); + }, + Dinero({ amount: 0 }) + ); + }; + const calculateTotalAmount = (items, key) => { - return items.reduce((acc, item) => acc + (item[key]?.totals?.subtotal?.amount || 0), 0); + return items.reduce((acc, item) => acc.add(Dinero(item[key]?.totals?.subtotal ?? Dinero())), Dinero({ amount: 0 })); + }; + + const calculateReducerTotalAmount = (lanes, key) => { + return lanes.reduce( + (acc, lane) => { + return acc.add( + lane.cards.reduce( + (laneAcc, card) => laneAcc.add(Dinero(card.metadata[key]?.totals?.subtotal ?? Dinero())), + Dinero({ amount: 0 }) + ) + ); + }, + Dinero({ amount: 0 }) + ); }; const calculateReducerTotal = (lanes, key, subKey) => { @@ -43,14 +69,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => { }, 0); }; - const calculateReducerTotalAmount = (lanes, key) => { - return lanes.reduce((acc, lane) => { - return ( - acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata[key]?.totals?.subtotal?.amount || 0), 0) - ); - }, 0); - }; - const formatValue = (value, type) => { if (type === StatisticType.JOBS) { return value.toFixed(0); @@ -87,9 +105,15 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => { const totalAmountInProduction = useMemo(() => { if (!cardSettings.totalAmountInProduction) return null; const total = calculateTotalAmount(data, "job_totals"); - return parseFloat(total.toFixed(2)); + return total.toFormat("$0,0.00"); }, [data, cardSettings.totalAmountInProduction]); + const totalAmountOnBoard = useMemo(() => { + if (!reducerData || !cardSettings.totalAmountOnBoard) return null; + const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals"); + return total.toFormat("$0,0.00"); + }, [reducerData, cardSettings.totalAmountOnBoard]); + const totalHrsOnBoard = useMemo(() => { if (!reducerData || !cardSettings.totalHrsOnBoard) return null; const total = @@ -118,12 +142,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => { [reducerData, cardSettings.jobsOnBoard] ); - const totalAmountOnBoard = useMemo(() => { - if (!reducerData || !cardSettings.totalAmountOnBoard) return null; - const total = calculateReducerTotalAmount(reducerData.lanes, "job_totals"); - return parseFloat(total.toFixed(2)); - }, [reducerData, cardSettings.totalAmountOnBoard]); - const tasksInProduction = useMemo(() => { if (!data || !cardSettings.tasksInProduction) return null; return data.reduce((acc, item) => acc + (item.tasks_aggregate?.aggregate?.count || 0), 0); @@ -191,7 +209,6 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {