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

128
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project be_version="2.7.1" version="1.2"> <babeledit_project version="1.2" be_version="2.7.1">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -8906,6 +8906,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>use_paint_scale_data</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>uselocalmediaserver</name> <name>uselocalmediaserver</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -16339,6 +16360,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>excel</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>exceptiontitle</name> <name>exceptiontitle</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -33467,6 +33509,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>savetojobnotes</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>
@@ -37589,6 +37652,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>dms_posting_sheet</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>envelope_return_address</name> <name>envelope_return_address</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -41242,6 +41326,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>exported_gsr_by_ro</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>exported_gsr_by_ro_labor</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gsr_by_atp</name> <name>gsr_by_atp</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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} /> <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
</Form.Item> </Form.Item>
<Space align="end"> <Space align="center">
<Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt"> <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
<CurrencyInput disabled={jobRO} min={0} /> <CurrencyInput disabled={jobRO} min={0} />
</Form.Item> </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 }, { ...values, jobid: jobId, created_by: currentUser.email },
], ],
}, },
refetchQueries: ["QUERY_NOTES_BY_JOB_PK"],
}); });
if (AdditionalNoteInserts.length > 0) { 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); setVisible(false);
setNoteUpsertContext({ setNoteUpsertContext({
context: { context: {
jobId: record.jobId, jobId: record.id,
text: note, text: note,
}, },
}); });
}} }}
> >
Save to Job Notes {t("notes.actions.savetojobnotes")}
</Button> </Button>
</Space> </Space>
</div> </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 AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import { useMemo } from "react"; import { useMemo } from "react";
import { useTranslation } from "react-i18next";
const { Title } = Typography; const { Title } = Typography;
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -19,6 +19,7 @@ const mapStateToProps = createStructuredSelector({
const mapDispatchToProps = (dispatch) => ({}); const mapDispatchToProps = (dispatch) => ({});
const TechJobStatistics = ({ technician }) => { const TechJobStatistics = ({ technician }) => {
const { t } = useTranslation();
const searchParams = queryString.parse(useLocation().search); const searchParams = queryString.parse(useLocation().search);
const { start, end } = searchParams; const { start, end } = searchParams;
@@ -78,21 +79,21 @@ const TechJobStatistics = ({ technician }) => {
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;
return ( return (
<Card title="Productive Hours Statistics"> <Card title={t("scoreboard.labels.productivestatistics")}>
<Space size={100}> <Space size={100}>
<Col> <Col>
<Title level={5}>This Week</Title> <Title level={5}>{t("scoreboard.labels.thisweek")}</Title>
<Space size={20}> <Space size={20}>
<Statistic <Statistic
title="Productive Hours" title={t("timetickets.fields.productivehrs")}
value={totals.week.productivehrs.toFixed(2)} value={totals.week.productivehrs.toFixed(2)}
/> />
<Statistic <Statistic
title="Actual Hours" title={t("timetickets.fields.actualhrs")}
value={totals.week.actualhrs.toFixed(2)} value={totals.week.actualhrs.toFixed(2)}
/> />
<Statistic <Statistic
title="Efficiency %" title={t("timetickets.labels.efficiency")}
value={ value={
totals.week.actualhrs totals.week.actualhrs
? `${( ? `${(
@@ -105,18 +106,18 @@ const TechJobStatistics = ({ technician }) => {
</Space> </Space>
</Col> </Col>
<Col> <Col>
<Title level={5}>This Month</Title> <Title level={5}>{t("scoreboard.labels.thismonth")}</Title>
<Space size={20}> <Space size={20}>
<Statistic <Statistic
title="Productive Hours" title={t("timetickets.fields.productivehrs")}
value={totals.month.productivehrs.toFixed(2)} value={totals.month.productivehrs.toFixed(2)}
/> />
<Statistic <Statistic
title="Actual Hours" title={t("timetickets.fields.actualhrs")}
value={totals.month.actualhrs.toFixed(2)} value={totals.month.actualhrs.toFixed(2)}
/> />
<Statistic <Statistic
title="Efficiency %" title={t("timetickets.labels.efficiency")}
value={ value={
totals.month.actualhrs totals.month.actualhrs
? `${( ? `${(

12
client/src/graphql/notes.queries.js
View File

@@ -4,7 +4,15 @@ export const INSERT_NEW_NOTE = gql`
mutation INSERT_NEW_NOTE($noteInput: [notes_insert_input!]!) { mutation INSERT_NEW_NOTE($noteInput: [notes_insert_input!]!) {
insert_notes(objects: $noteInput) { insert_notes(objects: $noteInput) {
returning { returning {
created_at
created_by
critical
id id
jobid
private
text
updated_at
audit
} }
} }
} }
@@ -15,8 +23,8 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
jobs_by_pk(id: $id) { jobs_by_pk(id: $id) {
id id
ro_number ro_number
vehicle{ vehicle {
jobs{ jobs {
id id
ro_number ro_number
status status

8
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -52,6 +52,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
import { insertAuditTrail } from "../../redux/application/application.actions"; import { insertAuditTrail } from "../../redux/application/application.actions";
import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container"; import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import UndefinedToNull from "../../utils/undefinedtonull"; import UndefinedToNull from "../../utils/undefinedtonull";
import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -97,7 +98,11 @@ export function JobsDetailPage({
variables: { variables: {
jobId: job.id, jobId: job.id,
job: { job: {
...UndefinedToNull(values, ["alt_transport", "category", "referral_source"]), ...UndefinedToNull(values, [
"alt_transport",
"category",
"referral_source",
]),
parts_tax_rates: { parts_tax_rates: {
...job.parts_tax_rates, ...job.parts_tax_rates,
...values.parts_tax_rates, ...values.parts_tax_rates,
@@ -231,6 +236,7 @@ export function JobsDetailPage({
<ScheduleJobModalContainer /> <ScheduleJobModalContainer />
<JobReconciliationModal /> <JobReconciliationModal />
<JobLineUpsertModalContainer /> <JobLineUpsertModalContainer />
<NoteUpsertModalComponent />
<Form <Form
form={form} form={form}
name="JobDetailForm" name="JobDetailForm"

3
client/src/translations/en_us/common.json
View File

@@ -1962,7 +1962,8 @@
"actions": "Actions", "actions": "Actions",
"deletenote": "Delete Note", "deletenote": "Delete Note",
"edit": "Edit Note", "edit": "Edit Note",
"new": "New Note" "new": "New Note",
"savetojobnotes": "Save to Job Notes"
}, },
"errors": { "errors": {
"inserting": "Error inserting note. {{error}}" "inserting": "Error inserting note. {{error}}"

3
client/src/translations/es/common.json
View File

@@ -1962,7 +1962,8 @@
"actions": "Comportamiento", "actions": "Comportamiento",
"deletenote": "Borrar nota", "deletenote": "Borrar nota",
"edit": "Editar nota", "edit": "Editar nota",
"new": "Nueva nota" "new": "Nueva nota",
"savetojobnotes": ""
}, },
"errors": { "errors": {
"inserting": "" "inserting": ""

3
client/src/translations/fr/common.json
View File

@@ -1962,7 +1962,8 @@
"actions": "actes", "actions": "actes",
"deletenote": "Supprimer la note", "deletenote": "Supprimer la note",
"edit": "Note éditée", "edit": "Note éditée",
"new": "Nouvelle note" "new": "Nouvelle note",
"savetojobnotes": ""
}, },
"errors": { "errors": {
"inserting": "" "inserting": ""