diff --git a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx index d790328ff..c49c0f3fe 100644 --- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx +++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx @@ -150,7 +150,7 @@ export function JobsCloseExportButton({ } if (setSelectedJobs) { setSelectedJobs((selectedJobs) => { - return selectedJobs.filter((i) => i.id !== jobId); + return selectedJobs.filter((i) => i !== jobId); }); } } diff --git a/client/src/components/payable-export-button/payable-export-button.component.jsx b/client/src/components/payable-export-button/payable-export-button.component.jsx index a25361256..d531b308f 100644 --- a/client/src/components/payable-export-button/payable-export-button.component.jsx +++ b/client/src/components/payable-export-button/payable-export-button.component.jsx @@ -145,7 +145,7 @@ export function PayableExportButton({ } if (setSelectedBills) { setSelectedBills((selectedBills) => { - return selectedBills.filter((i) => i.id !== billId); + return selectedBills.filter((i) => i !== billId); }); } } diff --git a/client/src/components/payment-export-button/payment-export-button.component.jsx b/client/src/components/payment-export-button/payment-export-button.component.jsx index f05c839d2..e6fbacb1e 100644 --- a/client/src/components/payment-export-button/payment-export-button.component.jsx +++ b/client/src/components/payment-export-button/payment-export-button.component.jsx @@ -145,7 +145,7 @@ export function PaymentExportButton({ if (setSelectedPayments) { setSelectedPayments((selectedBills) => { - return selectedBills.filter((i) => i.id !== paymentId); + return selectedBills.filter((i) => i !== paymentId); }); } } diff --git a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx index 0c9d9bb7a..b39d70d5b 100644 --- a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx +++ b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx @@ -53,18 +53,20 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) { const theValue = { date: moment(val).format("D dd"), paintHrs: _.round(dayhrs.painthrs, 1), - bodyHrs: _.round(dayhrs.bodyhrs), + bodyHrs: _.round(dayhrs.bodyhrs, 1), accTargetHrs: _.round( Utils.AsOfDateTargetHours( bodyshop.scoreboard_target.dailyBodyTarget + bodyshop.scoreboard_target.dailyPaintTarget, val - ) + ), + 1 ), accHrs: _.round( acc.length > 0 ? acc[acc.length - 1].accHrs + dayhrs.painthrs + dayhrs.bodyhrs - : dayhrs.painthrs + dayhrs.bodyhrs + : dayhrs.painthrs + dayhrs.bodyhrs, + 1 ), }; diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 804f69fcf..46e9462c3 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -1,9 +1,10 @@ -import { Card, Space, Table } from "antd"; import { EditFilled } from "@ant-design/icons"; +import { Card, Space, Table } from "antd"; import moment from "moment"; import React, { useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; +import { Link } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import { selectAuthLevel, @@ -16,8 +17,6 @@ import RbacWrapper, { HasRbacAccess, } from "../rbac-wrapper/rbac-wrapper.component"; import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component"; -import { Link } from "react-router-dom"; -import _ from "lodash"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, authLevel: selectAuthLevel, @@ -269,10 +268,10 @@ export function TimeTicketList({ - {_.round(totals.productivehrs, 1)} + {totals.productivehrs.toFixed(1)} - {_.round(totals.actualhrs, 1)} + {totals.actualhrs.toFixed(1)} {totals.actualhrs === 0 || !totals.actualhrs