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

IO-1741 IO-2147 IO-1933 Bug fixes for multiple tickets.

Browse Source
This commit is contained in:
Patrick Fic
2023-04-27 10:20:46 -07:00
parent 4c2d4e20a6
commit e387abcd14
10 changed files with 165 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
View File

@@ -82,7 +82,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
>
<CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
</Form.Item>
<Space align="end">
<Space align="center">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} min={0} />
</Form.Item>

1
client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
View File

@@ -86,6 +86,7 @@ export function NoteUpsertModalContainer({
{ ...values, jobid: jobId, created_by: currentUser.email },
],
},
refetchQueries: ["QUERY_NOTES_BY_JOB_PK"],
});
if (AdditionalNoteInserts.length > 0) {

4
client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
View File

@@ -82,13 +82,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
setVisible(false);
setNoteUpsertContext({
context: {
jobId: record.jobId,
jobId: record.id,
text: note,
},
});
}}
>
Save to Job Notes
{t("notes.actions.savetojobnotes")}
</Button>
</Space>
</div>

21
client/src/components/tech-job-statistics/tech-job-statistics.component.jsx
View File

@@ -10,7 +10,7 @@ import { connect } from "react-redux";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
const { Title } = Typography;
const mapStateToProps = createStructuredSelector({
@@ -19,6 +19,7 @@ const mapStateToProps = createStructuredSelector({
const mapDispatchToProps = (dispatch) => ({});
const TechJobStatistics = ({ technician }) => {
const { t } = useTranslation();
const searchParams = queryString.parse(useLocation().search);
const { start, end } = searchParams;
@@ -78,21 +79,21 @@ const TechJobStatistics = ({ technician }) => {
if (error) return <AlertComponent message={error.message} type="error" />;
return (
<Card title="Productive Hours Statistics">
<Card title={t("scoreboard.labels.productivestatistics")}>
<Space size={100}>
<Col>
<Title level={5}>This Week</Title>
<Title level={5}>{t("scoreboard.labels.thisweek")}</Title>
<Space size={20}>
<Statistic
title="Productive Hours"
title={t("timetickets.fields.productivehrs")}
value={totals.week.productivehrs.toFixed(2)}
/>
<Statistic
title="Actual Hours"
title={t("timetickets.fields.actualhrs")}
value={totals.week.actualhrs.toFixed(2)}
/>
<Statistic
title="Efficiency %"
title={t("timetickets.labels.efficiency")}
value={
totals.week.actualhrs
? `${(
@@ -105,18 +106,18 @@ const TechJobStatistics = ({ technician }) => {
</Space>
</Col>
<Col>
<Title level={5}>This Month</Title>
<Title level={5}>{t("scoreboard.labels.thismonth")}</Title>
<Space size={20}>
<Statistic
title="Productive Hours"
title={t("timetickets.fields.productivehrs")}
value={totals.month.productivehrs.toFixed(2)}
/>
<Statistic
title="Actual Hours"
title={t("timetickets.fields.actualhrs")}
value={totals.month.actualhrs.toFixed(2)}
/>
<Statistic
title="Efficiency %"
title={t("timetickets.labels.efficiency")}
value={
totals.month.actualhrs
? `${(