diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx index 163abf19c..4febb86c0 100644 --- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx @@ -10,6 +10,7 @@ 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"; @@ -192,6 +193,47 @@ const ActualInToolTip = ({ metadata, cardSettings }) => ); +const EstimatorToolTip = ({ metadata, cardSettings }) => { + return ( + cardSettings?.estimator && ( + + + {metadata.est_ct_fn && metadata.est_ct_ln ? ( + E: {`${metadata.est_ct_fn} ${metadata.est_ct_ln}`} + ) : ( +   + )} + + + ) + ); +}; + +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; + + return ( + cardSettings?.subtotal && ( + + + {!!amount ? ( + {`${t("production.statistics.currency_symbol")}${dineroAmount}`} + ) : ( +   + )} + + + ) + ); +}; + const ScheduledCompletionToolTip = ({ metadata, cardSettings, pastDueAlert }) => cardSettings?.scheduled_completion && ( @@ -292,7 +334,9 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe cardSettings?.ats || cardSettings?.sublets || cardSettings?.production_note || - cardSettings?.partsstatus + cardSettings?.partsstatus || + cardSettings?.estimator || + cardSettings?.subtotal ); }, [cardSettings]); @@ -348,6 +392,8 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe employee_refinish={employee_refinish} employee_csr={employee_csr} /> + + diff --git a/client/src/components/production-board-kanban/settings/InformationSettings.jsx b/client/src/components/production-board-kanban/settings/InformationSettings.jsx index 3dd6d7975..c50f61697 100644 --- a/client/src/components/production-board-kanban/settings/InformationSettings.jsx +++ b/client/src/components/production-board-kanban/settings/InformationSettings.jsx @@ -16,7 +16,9 @@ const InformationSettings = ({ t }) => ( "ats", "production_note", "sublets", - "partsstatus" + "partsstatus", + "estimator", + "subtotal" ].map((item) => ( diff --git a/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx b/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx index 52e21cf97..28e476fad 100644 --- a/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx +++ b/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx @@ -17,7 +17,7 @@ const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChan return ( - + {(provided) => (
item.id), selectedMdInsCos: [], selectedEstimators: [] diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index d22f6d99d..71cd4eddf 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2813,6 +2813,8 @@ "ownr_nm": "Customer Name", "paintpriority": "P/P", "partsstatus": "Parts Status", + "estimator": "Estimator", + "subtotal": "Subtotal", "production_note": "Production Note", "refinishhours": "R", "scheduled_completion": "Scheduled Completion", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 045982664..54be939ef 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -2813,6 +2813,8 @@ "ownr_nm": "", "paintpriority": "", "partsstatus": "", + "estimator": "", + "subtotal": "", "production_note": "", "refinishhours": "", "scheduled_completion": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 0282b2b96..9f481b0c7 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -2813,6 +2813,8 @@ "ownr_nm": "", "paintpriority": "", "partsstatus": "", + "estimator": "", + "subtotal": "", "production_note": "", "refinishhours": "", "scheduled_completion": "",