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

2
client/src/pages/jobs-all/jobs-all.container.jsx
View File

@@ -34,7 +34,7 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
limit: 25,
order: sortcolumn && [
{
[sortcolumn || "est_number"]: sortorder
[sortcolumn || "created_at"]: sortorder
? sortorder === "descend"
? "desc"
: "asc"

4
client/src/pages/jobs-create/jobs-create.component.jsx
View File

@@ -81,9 +81,7 @@ export default function JobsCreateComponent({ form }) {
<Result
status="success"
title={t("jobs.successes.creatednoclick")}
subTitle={t("jobs.successes.created_subtitle", {
est_number: state.newJobEstNum,
})}
subTitle={t("jobs.successes.created_subtitle")}
extra={[
<Link to={`/manage/jobs/${state.newJobId}`} key="gotojob">
<Button type="primary">{t("jobs.actions.gotojob")}</Button>

1
client/src/pages/jobs-create/jobs-create.container.jsx
View File

@@ -68,7 +68,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
created: true,
error: null,
newJobId: resp.data.insert_jobs.returning[0].id,
newJobEstNum: resp.data.insert_jobs.returning[0].est_number,
});
})
.catch((error) => {

25
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -47,9 +47,8 @@ function JobsDetailPageContainer({
? t("titles.app")
: t("titles.jobsdetail", {
ro_number:
data.jobs_by_pk && data.jobs_by_pk.converted
? data.jobs_by_pk && data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk && data.jobs_by_pk.est_number}`,
(data.jobs_by_pk && data.jobs_by_pk.ro_number) ||
t("general.labels.na"),
});
setBreadcrumbs([
{ link: "/manage/jobs", label: t("titles.bc.jobs") },
@@ -57,12 +56,8 @@ function JobsDetailPageContainer({
link: `/manage/jobs/${jobId}`,
label: t("titles.bc.jobs-detail", {
number:
(data &&
data.jobs_by_pk &&
(data.jobs_by_pk && data.jobs_by_pk.converted
? data && data.jobs_by_pk && data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk && data.jobs_by_pk.est_number}`)) ||
"",
(data && data.jobs_by_pk && data.jobs_by_pk.ro_number) ||
t("general.labels.na"),
}),
},
]);
@@ -74,13 +69,11 @@ function JobsDetailPageContainer({
CreateRecentItem(
jobId,
"job",
`${
data.jobs_by_pk.ro_number
? data.jobs_by_pk.ro_number
: data.jobs_by_pk.est_number
} | ${data.jobs_by_pk.ownr_fn || ""} ${
data.jobs_by_pk.ownr_ln || ""
} ${data.jobs_by_pk.ownr_co_nm || ""}`,
`${data.jobs_by_pk.ro_number || t("general.labels.na")} | ${
data.jobs_by_pk.ownr_fn || ""
} ${data.jobs_by_pk.ownr_ln || ""} ${
data.jobs_by_pk.ownr_co_nm || ""
}`,
`/manage/jobs/${jobId}`
)
);

2
client/src/pages/jobs-intake/jobs-intake.page.container.jsx
View File

@@ -48,7 +48,7 @@ export function JobsIntakeContainer({
number:
data &&
((data.jobs_by_pk && data.jobs_by_pk.ro_number) ||
data.jobs_by_pk.est_number),
t("general.labels.na")),
}),
},
{

17
client/src/pages/parts-queue/parts-queue.page.component.jsx
View File

@@ -81,22 +81,11 @@ export function PartsQueuePageComponent({ 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",