admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2021-08-20 (pull request #182)

Browse Source 
release/2021-08-20

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-08-18 20:29:06 +00:00
parent 0d12ab36a9 ba5400d04a
commit 5f7b780195
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
View File

@@ -150,7 +150,7 @@ export function JobsCloseExportButton({
} }
if (setSelectedJobs) { if (setSelectedJobs) {
setSelectedJobs((selectedJobs) => { setSelectedJobs((selectedJobs) => {
return selectedJobs.filter((i) => i.id !== jobId); return selectedJobs.filter((i) => i !== jobId);
}); });
} }
} }

2
client/src/components/payable-export-button/payable-export-button.component.jsx
View File

@@ -145,7 +145,7 @@ export function PayableExportButton({
} }
if (setSelectedBills) { if (setSelectedBills) {
setSelectedBills((selectedBills) => { setSelectedBills((selectedBills) => {
return selectedBills.filter((i) => i.id !== billId); return selectedBills.filter((i) => i !== billId);
}); });
} }
} }

2
client/src/components/payment-export-button/payment-export-button.component.jsx
View File

@@ -145,7 +145,7 @@ export function PaymentExportButton({
if (setSelectedPayments) { if (setSelectedPayments) {
setSelectedPayments((selectedBills) => { setSelectedPayments((selectedBills) => {
return selectedBills.filter((i) => i.id !== paymentId); return selectedBills.filter((i) => i !== paymentId);
}); });
} }
} }

8
client/src/components/scoreboard-chart/scoreboard-chart.component.jsx
View File

@@ -53,18 +53,20 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
const theValue = { const theValue = {
date: moment(val).format("D dd"), date: moment(val).format("D dd"),
paintHrs: _.round(dayhrs.painthrs, 1), paintHrs: _.round(dayhrs.painthrs, 1),
bodyHrs: _.round(dayhrs.bodyhrs), bodyHrs: _.round(dayhrs.bodyhrs, 1),
accTargetHrs: _.round( accTargetHrs: _.round(
Utils.AsOfDateTargetHours( Utils.AsOfDateTargetHours(
bodyshop.scoreboard_target.dailyBodyTarget + bodyshop.scoreboard_target.dailyBodyTarget +
bodyshop.scoreboard_target.dailyPaintTarget, bodyshop.scoreboard_target.dailyPaintTarget,
val val
) ),
1
), ),
accHrs: _.round( accHrs: _.round(
acc.length > 0 acc.length > 0
? acc[acc.length - 1].accHrs + dayhrs.painthrs + dayhrs.bodyhrs ? acc[acc.length - 1].accHrs + dayhrs.painthrs + dayhrs.bodyhrs
: dayhrs.painthrs + dayhrs.bodyhrs : dayhrs.painthrs + dayhrs.bodyhrs,
1
), ),
}; };

9
client/src/components/time-ticket-list/time-ticket-list.component.jsx
View File

@@ -1,9 +1,10 @@
import { Card, Space, Table } from "antd";
import { EditFilled } from "@ant-design/icons"; import { EditFilled } from "@ant-design/icons";
import { Card, Space, Table } from "antd";
import moment from "moment"; import moment from "moment";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { import {
selectAuthLevel, selectAuthLevel,
@@ -16,8 +17,6 @@ import RbacWrapper, {
HasRbacAccess, HasRbacAccess,
} from "../rbac-wrapper/rbac-wrapper.component"; } from "../rbac-wrapper/rbac-wrapper.component";
import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.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({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
authLevel: selectAuthLevel, authLevel: selectAuthLevel,
@@ -269,10 +268,10 @@ export function TimeTicketList({
<Table.Summary.Cell /> <Table.Summary.Cell />
<Table.Summary.Cell /> <Table.Summary.Cell />
<Table.Summary.Cell> <Table.Summary.Cell>
{_.round(totals.productivehrs, 1)} {totals.productivehrs.toFixed(1)}
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell>
{_.round(totals.actualhrs, 1)} {totals.actualhrs.toFixed(1)}
</Table.Summary.Cell> </Table.Summary.Cell>
<Table.Summary.Cell> <Table.Summary.Cell>
{totals.actualhrs === 0 || !totals.actualhrs {totals.actualhrs === 0 || !totals.actualhrs