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

Removed Est_number from Job. Potential Breaking changes. IO-553

Browse Source
This commit is contained in:
Patrick Fic
2021-01-07 15:25:32 -08:00
parent 3da3fb96e2
commit 0c83a62dd2
64 changed files with 1730 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
View File

@@ -2,12 +2,12 @@ import { Input, Table } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { logImEXEvent } from "../../firebase/firebase.utils";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import PaymentExportButton from "../payment-export-button/payment-export-button.component";
import { PaymentsExportAllButton } from "../payments-export-all-button/payments-export-all-button.component";
import { logImEXEvent } from "../../firebase/firebase.utils";
export default function AccountingPayablesTableComponent({
loading,
@@ -37,19 +37,7 @@ export default function AccountingPayablesTableComponent({
<Link to={"/manage/jobs/" + record.job.id}>{record.job.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.job.est_number - b.job.est_number,
sortOrder:
state.sortedInfo.columnKey === "est_number" && state.sortedInfo.order,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>
{record.job.est_number}
</Link>
),
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",

20
client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
View File

@@ -1,11 +1,11 @@
import { Input, Table, Button } from "antd";
import { Button, Input, Table } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { logImEXEvent } from "../../firebase/firebase.utils";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { alphaSort } from "../../utils/sorters";
import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { JobsExportAllButton } from "../jobs-export-all-button/jobs-export-all-button.component";
export default function AccountingReceivablesTableComponent({ loading, jobs }) {
@@ -34,17 +34,7 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
<Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.est_number - b.est_number,
sortOrder:
state.sortedInfo.columnKey === "est_number" && state.sortedInfo.order,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
),
},
{
title: t("jobs.fields.status"),
dataIndex: "status",
@@ -156,10 +146,6 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
.toString()
.toLowerCase()
.includes(state.search.toLowerCase()) ||
(v.est_number || "")
.toString()
.toLowerCase()
.includes(state.search.toLowerCase()) ||
(v.ownr_fn || "")
.toLowerCase()
.includes(state.search.toLowerCase()) ||

12
client/src/components/contract-jobs/contract-jobs.component.jsx
View File

@@ -23,17 +23,13 @@ export default function ContractsJobsComponent({
dataIndex: "ro_number",
key: "ro_number",
width: "8%",
sorter: (a, b) =>
alphaSort(
a.ro_number ? a.ro_number : "EST-" + a.est_number,
b.ro_number ? b.ro_number : "EST-" + b.est_number
),
sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
sortOrder:
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
render: (text, record) => (
<span>
{record.ro_number ? record.ro_number : "EST-" + record.est_number}
{record.ro_number ? record.ro_number : t("general.labels.na")}
</span>
),
},
@@ -135,10 +131,6 @@ export default function ContractsJobsComponent({
? data
: data.filter(
(j) =>
(j.est_number || "")
.toString()
.toLowerCase()
.includes(state.search.toLowerCase()) ||
(j.ro_number || "")
.toString()
.toLowerCase()

14
client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx
View File

@@ -31,21 +31,9 @@ export default function CsiResponseListPaginated({
sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>{record.job.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
width: "8%",
sorter: (a, b) => a.job.est_number - b.job.est_number,
sortOrder: sortcolumn === "est_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>
{record.job.est_number}
{record.job.ro_number || t("general.labels.na")}
</Link>
),
},

6
client/src/components/global-search/global-search.component.jsx
View File

@@ -48,11 +48,7 @@ export default function GlobalSearch() {
<Link to={`/manage/jobs/${job.id}`}>
<div className="imex-flex-row">
<span className="imex-flex-row__margin-large">
<strong>
{job.ro_number
? `${job.ro_number || ""} / ${job.est_number || ""}`
: `${job.est_number || ""}`}
</strong>
<strong>{job.ro_number || t("general.labels.na")}</strong>
</span>
<span className="imex-flex-row__margin-large">{`${

8
client/src/components/job-detail-cards/job-detail-cards.component.jsx
View File

@@ -1,6 +1,6 @@
import { PrinterFilled } from "@ant-design/icons";
import { useQuery } from "@apollo/react-hooks";
import { Button, Col, Drawer, Grid, PageHeader, Row, Tag, Space } from "antd";
import { Button, Col, Drawer, Grid, PageHeader, Row, Space, Tag } from "antd";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -101,11 +101,7 @@ export function JobDetailCards({ setPrintCenterContext }) {
]}
title={
<Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
{data.jobs_by_pk.ro_number
? `${t("jobs.fields.ro_number")} ${data.jobs_by_pk.ro_number}`
: `${t("jobs.fields.est_number")} ${
data.jobs_by_pk.est_number
}`}
{data.jobs_by_pk.ro_number || t("general.labels.na")}
</Link>
}
subTitle={data.jobs_by_pk.status}

11
client/src/components/job-search-select/job-search-select.component.jsx
View File

@@ -3,12 +3,12 @@ import { useLazyQuery } from "@apollo/react-hooks";
import { Empty, Select } from "antd";
import _ from "lodash";
import React, { forwardRef, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import {
SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE,
SEARCH_JOBS_FOR_AUTOCOMPLETE,
SEARCH_JOBS_FOR_AUTOCOMPLETE
} from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
const { Option } = Select;
const JobSearchSelect = (
@@ -22,6 +22,7 @@ const JobSearchSelect = (
},
ref
) => {
const { t } = useTranslation();
const [callSearch, { loading, error, data }] = useLazyQuery(
SEARCH_JOBS_FOR_AUTOCOMPLETE,
{
@@ -100,9 +101,9 @@ const JobSearchSelect = (
{theOptions
? theOptions.map((o) => (
<Option key={o.id} value={o.id}>
{`${
o.ro_number ? `RO ${o.ro_number}` : `EST ${o.est_number}`
} | ${o.ownr_ln || ""} ${o.ownr_fn || ""} ${
{`${o.ro_number || t("general.labels.na")} | ${
o.ownr_ln || ""
} ${o.ownr_fn || ""} ${
o.ownr_co_nm ? ` ${o.ownr_co_num}` : ""
}| ${o.v_model_yr || ""} ${o.v_make_desc || ""} ${
o.v_model_desc || ""

9
client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx
View File

@@ -63,12 +63,9 @@ export default function JobsAvailableSupplementComponent({
sortOrder:
state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
render: (text, record) => (
<div>{`${(record.job && record.job.est_number) || ""}${
(record.job &&
record.job.ro_number &&
` / ${record.job.ro_number}`) ||
""
}`}</div>
<div>
{(record.job && record.job_ro_number) || t("general.labels.na")}
</div>
),
},
{

6
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -71,11 +71,7 @@ export function JobsDetailHeader({
return (
<PageHeader
title={
job.ro_number
? `${t("jobs.fields.ro_number")} ${job.ro_number}`
: `${t("jobs.fields.est_number")} ${job.est_number}`
}
title={job.ro_number || t("general.labels.na")}
subTitle={job.status}
tags={[
<OwnerTagPopoverComponent key="owner" job={job} />,

2
client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
View File

@@ -27,7 +27,7 @@ export default function JobsFindModalComponent({
render: (text, record) => (
<span>
<Link to={"/manage/jobs/" + record.id}>
{record.ro_number ? record.ro_number : "EST-" + record.est_number}
{record.ro_number || t("general.labels.na")}
</Link>
</span>
),

4
client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
View File

@@ -45,10 +45,6 @@ export default connect(
(j.ro_number || "")
.toLowerCase()
.includes(modalSearch.toLowerCase()) ||
(j.est_number || "")
.toString()
.toLowerCase()
.includes(modalSearch.toLowerCase()) ||
(j.ownr_fn || "")
.toLowerCase()
.includes(modalSearch.toLowerCase()) ||

15
client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
View File

@@ -25,21 +25,12 @@ export default function JobsList({ refetch, loading, jobs, total }) {
sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
<Link to={"/manage/jobs/" + record.id}>
{record.ro_number || t("general.labels.na")}
</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
width: "8%",
sorter: (a, b) => a.est_number - b.est_number,
sortOrder: sortcolumn === "est_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
),
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",

17
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -99,22 +99,11 @@ export function JobsList({ bodyshop }) {
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
<Link to={"/manage/jobs/" + record.id}>
{record.ro_number || t("general.labels.na")}
</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.est_number - b.est_number,
sortOrder:
state.sortedInfo.columnKey === "est_number" && state.sortedInfo.order,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
),
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",

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

@@ -23,7 +23,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
ellipsis: true,
render: (text, record) => (
<Link to={`/manage/jobs/${record.id}`}>
{record.ro_number ? record.ro_number : `EST ${record.est_number}`}
{record.ro_number || t("general.labels.na")}
</Link>
),
},

13
client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
View File

@@ -30,22 +30,13 @@ export default function PaymentsListPaginated({
key: "ro_number",
sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>{record.job.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.job.est_number - b.job.est_number,
sortOrder: sortcolumn === "est_number" && sortorder,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>
{record.job.est_number}
{record.job.ro_number || t("general.labels.na")}
</Link>
),
},
{
title: t("jobs.fields.owner"),
dataIndex: "owner",

4
client/src/components/print-center-item/print-center-item.component.jsx
View File

@@ -5,9 +5,7 @@ import { createStructuredSelector } from "reselect";
import { setEmailOptions } from "../../redux/email/email.actions";
import { selectPrintCenter } from "../../redux/modals/modals.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import RenderTemplate, {
displayTemplateInWindow,
} from "../../utils/RenderTemplate";
import RenderTemplate from "../../utils/RenderTemplate";
const mapStateToProps = createStructuredSelector({
printCenterModal: selectPrintCenter,
bodyshop: selectBodyshop,

6
client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
View File

@@ -26,9 +26,9 @@ export default function ProductionBoardCard(card) {
className="react-kanban-card imex-kanban-card tight-antd-rows"
style={{ margin: ".2rem 0rem" }}
size="small"
title={`${card.ro_number || card.est_number} - ${card.v_model_yr} ${
card.v_make_desc || ""
} ${card.v_model_desc || ""}`}
title={`${card.ro_number || t("general.labels.na")} - ${
card.v_model_yr
} ${card.v_make_desc || ""} ${card.v_model_desc || ""}`}
>
<Row>
<Col span={24}>

4
client/src/components/production-board-kanban/production-board-kanban.utils.js
View File

@@ -91,10 +91,6 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
const CheckSearch = (search, job) => {
return (
(job.ro_number || "").toLowerCase().includes(search.toLowerCase()) ||
(job.est_number || "")
.toString()
.toLowerCase()
.includes(search.toLowerCase()) ||
(job.ownr_fn || "").toLowerCase().includes(search.toLowerCase()) ||
(job.ownr_co_nm || "").toLowerCase().includes(search.toLowerCase()) ||
(job.ownr_ln || "").toLowerCase().includes(search.toLowerCase()) ||

2
client/src/components/schedule-event/schedule-event.component.jsx
View File

@@ -114,7 +114,7 @@ export function ScheduleEventComponent({
const RegularEvent = event.isintake ? (
<div style={{ display: "flex", flexWrap: "wrap" }}>
<strong style={{ margin: ".1rem" }}>{`${
event.job.ro_number || event.job.est_number
event.job.ro_number || t("general.labels.na")
}`}</strong>
<div style={{ margin: ".1rem" }}>{`${
(event.job && event.job.ownr_fn) || ""

11
client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
View File

@@ -14,20 +14,13 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
title: t("jobs.fields.ro_number"),
dataIndex: "ro_number",
key: "ro_number",
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>{record.job.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
render: (text, record) => (
<Link to={"/manage/jobs/" + record.job.id}>
{record.job.est_number}
{record.job.ro_number || t("general.labels.na")}
</Link>
),
},
{
title: t("scoreboard.fields.date"),
dataIndex: "date",

2
client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx
View File

@@ -58,7 +58,7 @@ export function TechClockedInList({ technician }) {
<Card
title={
<Link to={`/tech/joblookup?selected=${ticket.job.id}`}>
{`${ticket.job.ro_number || ticket.job.est_number} ${
{`${ticket.job.ro_number || t("general.labels.na")} ${
ticket.job.ownr_fn || ""
} ${ticket.job.ownr_ln || ""} ${
ticket.job.ownr_co_nm || ""

4
client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
View File

@@ -94,9 +94,7 @@ export function JobDetailCards({ setPrintCenterContext }) {
<Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
{data.jobs_by_pk.ro_number
? `${t("jobs.fields.ro_number")} ${data.jobs_by_pk.ro_number}`
: `${t("jobs.fields.est_number")} ${
data.jobs_by_pk.est_number
}`}
: t("general.labels.na")}
</Link>
}
subTitle={data.jobs_by_pk.status}

16
client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
View File

@@ -43,10 +43,6 @@ export function TechLookupJobsList({ bodyshop }) {
? data.jobs
: data.jobs.filter(
(j) =>
(j.est_number || "")
.toString()
.toLowerCase()
.includes(searchText.toLowerCase()) ||
(j.ro_number || "")
.toString()
.toLowerCase()
@@ -103,18 +99,6 @@ export function TechLookupJobsList({ bodyshop }) {
<Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
),
},
{
title: t("jobs.fields.est_number"),
dataIndex: "est_number",
key: "est_number",
sorter: (a, b) => a.est_number - b.est_number,
sortOrder:
state.sortedInfo.columnKey === "est_number" && state.sortedInfo.order,
render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}>{record.est_number}</Link>
),
},
{
title: t("jobs.fields.owner"),

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

@@ -24,7 +24,7 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
ellipsis: true,
render: (text, record) => (
<Link to={`/manage/jobs/${record.id}`}>
{record.ro_number ? record.ro_number : `EST ${record.est_number}`}
{record.ro_number || t("general.labels.na")}
</Link>
),
},