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

Added page for job closing BOD-131

Browse Source
This commit is contained in:
Patrick Fic
2020-05-15 16:43:27 -07:00
parent 58b4985319
commit 51ea04bf2c
15 changed files with 833 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
bodyshop_translations.babel
View File

@@ -1085,6 +1085,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>responsibilitycenter_accountname</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>responsibilitycenter_accountnumber</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>
<folder_node> <folder_node>
<name>responsibilitycenters</name> <name>responsibilitycenters</name>
<children> <children>
@@ -13662,6 +13704,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>jobs-close</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>jobs-detail</name> <name>jobs-detail</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -14105,6 +14168,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>jobs-close</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>jobs-create</name> <name>jobs-create</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/src/components/invoice-form/invoice-form.lines.component.jsx
View File

@@ -147,7 +147,7 @@ export default function InvoiceEnterModalLinesComponent({
> >
<Select style={{ width: "150px" }}> <Select style={{ width: "150px" }}>
{responsibilityCenters.costs.map((item) => ( {responsibilityCenters.costs.map((item) => (
<Select.Option key={item}>{item}</Select.Option> <Select.Option key={item.name}>{item.name}</Select.Option>
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>

35
client/src/components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component.jsx Normal file
View File

@@ -0,0 +1,35 @@
import React from "react";
export default function JobCloseLabMatAllocation({
labmatAllocations,
setLabmatAllocations,
}) {
console.log(
"JobCloseLabMatAllocation -> labmatAllocations",
labmatAllocations
);
return (
<div>
<table>
<thead>
<tr>
<th>Rate</th>
<th>Available</th>
</tr>
</thead>
<tbody>
{Object.keys(labmatAllocations).map((alloc) => (
<tr>
<td>{alloc}</td>
<td>
{
//labmatAllocations[alloc].total.toFormat()
}
</td>
</tr>
))}
</tbody>
</table>
</div>
);
}

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

@@ -64,10 +64,10 @@ export default function JobsList({
render: (text, record) => { render: (text, record) => {
return record.owner ? ( return record.owner ? (
<Link to={"/manage/owners/" + record.owner.id}> <Link to={"/manage/owners/" + record.owner.id}>
{`${record.ownr_fn} ${record.ownr_ln}`} {`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}
</Link> </Link>
) : ( ) : (
<span>{`${record.ownr_fn} ${record.ownr_ln}`}</span> <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}</span>
); );
}, },
}, },

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

@@ -32,37 +32,41 @@ export default withRouter(function JobsList({
title: t("jobs.fields.ro_number"), title: t("jobs.fields.ro_number"),
dataIndex: "ro_number", dataIndex: "ro_number",
key: "ro_number", key: "ro_number",
width: "8%", sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
sorter: (a, b) =>
alphaSort(
a.ro_number ? a.ro_number : a.est_number,
b.ro_number ? b.ro_number : b.est_number
),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
render: (text, record) => ( render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}> <Link to={"/manage/jobs/" + record.id}>{record.ro_number}</Link>
{record.ro_number ? record.ro_number : record.est_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"), title: t("jobs.fields.owner"),
dataIndex: "owner", dataIndex: "owner",
key: "owner", key: "owner",
ellipsis: true,
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln), sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
width: "25%",
sortOrder: sortOrder:
state.sortedInfo.columnKey === "owner" && state.sortedInfo.order, state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
render: (text, record) => { render: (text, record) => {
return record.owner ? ( return record.owner ? (
<Link to={"/manage/owners/" + record.owner.id}> <Link to={"/manage/owners/" + record.owner.id}>
{`${record.ownr_fn} ${record.ownr_ln}`} {`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}
</Link> </Link>
) : ( ) : (
<span>{`${record.ownr_fn} ${record.ownr_ln}`}</span> <span>{`${record.ownr_fn || ""} ${record.ownr_ln || ""}`}</span>
); );
}, },
}, },
@@ -70,7 +74,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.ownr_ph1"), title: t("jobs.fields.ownr_ph1"),
dataIndex: "ownr_ph1", dataIndex: "ownr_ph1",
key: "ownr_ph1", key: "ownr_ph1",
width: "12%",
ellipsis: true, ellipsis: true,
render: (text, record) => { render: (text, record) => {
return record.ownr_ph1 ? ( return record.ownr_ph1 ? (
@@ -85,8 +88,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.status"), title: t("jobs.fields.status"),
dataIndex: "status", dataIndex: "status",
key: "status", key: "status",
width: "10%",
ellipsis: true,
sorter: (a, b) => alphaSort(a.status, b.status), sorter: (a, b) => alphaSort(a.status, b.status),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "status" && state.sortedInfo.order, state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
@@ -99,7 +100,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.vehicle"), title: t("jobs.fields.vehicle"),
dataIndex: "vehicle", dataIndex: "vehicle",
key: "vehicle", key: "vehicle",
width: "15%",
ellipsis: true, ellipsis: true,
render: (text, record) => { render: (text, record) => {
return record.vehicleid ? ( return record.vehicleid ? (
@@ -119,8 +119,6 @@ export default withRouter(function JobsList({
title: t("vehicles.fields.plate_no"), title: t("vehicles.fields.plate_no"),
dataIndex: "plate_no", dataIndex: "plate_no",
key: "plate_no", key: "plate_no",
width: "8%",
ellipsis: true,
sorter: (a, b) => alphaSort(a.plate_no, b.plate_no), sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order, state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
@@ -132,7 +130,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.clm_no"), title: t("jobs.fields.clm_no"),
dataIndex: "clm_no", dataIndex: "clm_no",
key: "clm_no", key: "clm_no",
width: "12%",
ellipsis: true, ellipsis: true,
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder: sortOrder:
@@ -149,7 +146,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.clm_total"), title: t("jobs.fields.clm_total"),
dataIndex: "clm_total", dataIndex: "clm_total",
key: "clm_total", key: "clm_total",
width: "10%",
sorter: (a, b) => a.clm_total - b.clm_total, sorter: (a, b) => a.clm_total - b.clm_total,
sortOrder: sortOrder:
state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order, state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
@@ -165,7 +161,6 @@ export default withRouter(function JobsList({
title: t("jobs.fields.owner_owing"), title: t("jobs.fields.owner_owing"),
dataIndex: "owner_owing", dataIndex: "owner_owing",
key: "owner_owing", key: "owner_owing",
width: "8%",
render: (text, record) => ( render: (text, record) => (
<CurrencyFormatter>{record.owner_owing}</CurrencyFormatter> <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
), ),
@@ -210,10 +205,10 @@ export default withRouter(function JobsList({
</div> </div>
); );
}} }}
size="small" size='small'
pagination={{ position: "top" }} pagination={{ position: "top" }}
columns={columns.map((item) => ({ ...item }))} columns={columns.map((item) => ({ ...item }))}
rowKey="id" rowKey='id'
dataSource={jobs} dataSource={jobs}
rowSelection={{ rowSelection={{
onSelect: (record) => { onSelect: (record) => {

269
client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
View File

@@ -15,46 +15,79 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
const [options, setOptions] = useState( const [options, setOptions] = useState(
[ [
...(form.getFieldValue(["md_responsibility_centers", "costs"]) || []), ...(form
...(form.getFieldValue(["md_responsibility_centers", "profits"]) || []) .getFieldValue(["md_responsibility_centers", "costs"])
.map((i) => i.name) || []),
...(form
.getFieldValue(["md_responsibility_centers", "profits"])
.map((i) => i.name) || []),
] || [] ] || []
); );
const handleBlur = () => { const handleBlur = () => {
setOptions([ setOptions([
...(form.getFieldValue(["md_responsibility_centers", "costs"]) || []), ...(form
...(form.getFieldValue(["md_responsibility_centers", "profits"]) || []) .getFieldValue(["md_responsibility_centers", "costs"])
.map((i) => i.name) || []),
...(form
.getFieldValue(["md_responsibility_centers", "profits"])
.map((i) => i.name) || []),
]); ]);
}; };
return ( return (
<div> <div>
<strong>{t("bodyshop.labels.responsibilitycenters.title")}</strong> <strong>{t("bodyshop.labels.responsibilitycenters.title")}</strong>=
<Row> <div>
<Col span={8}>
<strong>{t("bodyshop.labels.responsibilitycenters.costs")}</strong> <strong>{t("bodyshop.labels.responsibilitycenters.costs")}</strong>
<Form.List name={["md_responsibility_centers", "costs"]}> <Form.List name={["md_responsibility_centers", "costs"]}>
{(fields, { add, remove }) => { {(fields, { add, remove }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
key={field.key}
style={{ padding: 0, margin: 2 }}
>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Form.Item <Form.Item
style={{ padding: 0, margin: 2 }} style={{ padding: 0, margin: 2 }}
label={t("bodyshop.fields.responsibilitycenter")} label={t("bodyshop.fields.responsibilitycenter")}
key={`${index}`} key={`${index}name`}
name={[field.name]} name={[field.name, "name"]}
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}>
> <Input onBlur={handleBlur} />
</Form.Item>
<Form.Item
style={{ padding: 0, margin: 2 }}
label={t(
"bodyshop.fields.responsibilitycenter_accountname"
)}
key={`${index}accountname`}
name={[field.name, "accountname"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}>
<Input onBlur={handleBlur} />
</Form.Item>
<Form.Item
style={{ padding: 0, margin: 2 }}
label={t(
"bodyshop.fields.responsibilitycenter_accountnumber"
)}
key={`${index}accountnumber`}
name={[field.name, "accountnumber"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}>
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<DeleteFilled <DeleteFilled
@@ -67,12 +100,11 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
))} ))}
<Form.Item> <Form.Item>
<Button <Button
type="dashed" type='dashed'
onClick={() => { onClick={() => {
add(); add();
}} }}
style={{ width: "100%" }} style={{ width: "100%" }}>
>
{t("bodyshop.actions.newstatus")} {t("bodyshop.actions.newstatus")}
</Button> </Button>
</Form.Item> </Form.Item>
@@ -80,32 +112,57 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
); );
}} }}
</Form.List> </Form.List>
</Col> </div>
<div>
<Col span={8}>
<strong>{t("bodyshop.labels.responsibilitycenters.profits")}</strong> <strong>{t("bodyshop.labels.responsibilitycenters.profits")}</strong>
<Form.List name={["md_responsibility_centers", "profits"]}> <Form.List name={["md_responsibility_centers", "profits"]}>
{(fields, { add, remove }) => { {(fields, { add, remove }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
key={field.key}
style={{ padding: 0, margin: 2 }}
>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Form.Item <Form.Item
style={{ padding: 0, margin: 2 }} style={{ padding: 0, margin: 2 }}
label={t("bodyshop.fields.responsibilitycenter")} label={t("bodyshop.fields.responsibilitycenter")}
key={`${index}`} key={`${index}name`}
name={[field.name]} name={[field.name, "name"]}
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}>
> <Input onBlur={handleBlur} />
</Form.Item>
<Form.Item
style={{ padding: 0, margin: 2 }}
label={t(
"bodyshop.fields.responsibilitycenter_accountname"
)}
key={`${index}accountname`}
name={[field.name, "accountname"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}>
<Input onBlur={handleBlur} />
</Form.Item>
<Form.Item
style={{ padding: 0, margin: 2 }}
label={t(
"bodyshop.fields.responsibilitycenter_accountnumber"
)}
key={`${index}accountnumber`}
name={[field.name, "accountnumber"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}>
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<DeleteFilled <DeleteFilled
@@ -118,12 +175,11 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
))} ))}
<Form.Item> <Form.Item>
<Button <Button
type="dashed" type='dashed'
onClick={() => { onClick={() => {
add(); add();
}} }}
style={{ width: "100%" }} style={{ width: "100%" }}>
>
{t("bodyshop.actions.newstatus")} {t("bodyshop.actions.newstatus")}
</Button> </Button>
</Form.Item> </Form.Item>
@@ -131,20 +187,18 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
); );
}} }}
</Form.List> </Form.List>
</Col> </div>
<div>
<Col span={8}>
<SelectorDiv> <SelectorDiv>
<Form.Item <Form.Item
label={t("bodyshop.fields.responsibilitycenters.atp")} label={t("bodyshop.fields.responsibilitycenters.atp")}
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "ATP"]} name={["md_responsibility_centers", "defaults", "ATP"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -156,11 +210,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAB"]} name={["md_responsibility_centers", "defaults", "LAB"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -172,11 +225,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAD"]} name={["md_responsibility_centers", "defaults", "LAD"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -188,11 +240,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAE"]} name={["md_responsibility_centers", "defaults", "LAE"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -204,11 +255,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAF"]} name={["md_responsibility_centers", "defaults", "LAF"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -220,11 +270,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAG"]} name={["md_responsibility_centers", "defaults", "LAG"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -236,11 +285,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAM"]} name={["md_responsibility_centers", "defaults", "LAM"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -252,11 +300,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAR"]} name={["md_responsibility_centers", "defaults", "LAR"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -268,11 +315,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAS"]} name={["md_responsibility_centers", "defaults", "LAS"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -284,11 +330,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "LAU"]} name={["md_responsibility_centers", "defaults", "LAU"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -300,11 +345,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAA"]} name={["md_responsibility_centers", "defaults", "PAA"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -316,11 +360,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAC"]} name={["md_responsibility_centers", "defaults", "PAC"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -332,11 +375,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAL"]} name={["md_responsibility_centers", "defaults", "PAL"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -348,11 +390,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAM"]} name={["md_responsibility_centers", "defaults", "PAM"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -364,11 +405,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAN"]} name={["md_responsibility_centers", "defaults", "PAN"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -380,11 +420,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAO"]} name={["md_responsibility_centers", "defaults", "PAO"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -396,11 +435,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAP"]} name={["md_responsibility_centers", "defaults", "PAP"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -412,11 +450,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "PAR"]} name={["md_responsibility_centers", "defaults", "PAR"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -428,11 +465,10 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
rules={[ rules={[
{ {
required: true, required: true,
message: t("general.validation.required") message: t("general.validation.required"),
} },
]} ]}
name={["md_responsibility_centers", "defaults", "TOW"]} name={["md_responsibility_centers", "defaults", "TOW"]}>
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -440,8 +476,7 @@ export default function ShopInfoResponsibilityCenterComponent({ form }) {
</Select> </Select>
</Form.Item> </Form.Item>
</SelectorDiv> </SelectorDiv>
</Col> </div>
</Row>
</div> </div>
); );
} }

2
client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
View File

@@ -107,7 +107,7 @@ export default function TimeTicketModalComponent({
}} }}
> >
{responsibilityCenters.costs.map((item) => ( {responsibilityCenters.costs.map((item) => (
<Select.Option key={item}>{item}</Select.Option> <Select.Option key={item.name}>{item.name}</Select.Option>
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>

2
client/src/components/vendors-form/vendors-form.component.jsx
View File

@@ -151,7 +151,7 @@ export default function VendorsFormComponent({
> >
<Select style={{ width: "150px" }}> <Select style={{ width: "150px" }}>
{responsibilityCenters.costs.map(item => ( {responsibilityCenters.costs.map(item => (
<Select.Option key={item}>{item}</Select.Option> <Select.Option key={item.name}>{item.name}</Select.Option>
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>

138
client/src/graphql/jobs.queries.js
View File

@@ -750,3 +750,141 @@ export const QUERY_ALL_JOBS_PAGINATED = gql`
} }
} }
`; `;
export const QUERY_JOB_CLOSE_DETAILS = gql`
query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
jobs_by_pk(id: $id) {
po_number
special_coverage_policy
scheduled_delivery
converted
est_number
ro_number
clm_total
inproduction
plate_no
v_vin
v_model_yr
v_model_desc
v_make_desc
v_color
ins_co_id
policy_no
loss_date
clm_no
area_of_damage
ins_co_nm
ins_addr1
ins_city
ins_ct_ln
ins_ct_fn
ins_ea
ins_ph1
est_co_nm
est_ct_fn
est_ct_ln
pay_date
est_ph1
est_ea
regie_number
scheduled_completion
id
ded_amt
ded_status
depreciation_taxes
federal_tax_payable
other_amount_payable
towing_payable
storage_payable
adjustment_bottom_line
federal_tax_rate
state_tax_rate
local_tax_rate
tax_tow_rt
tax_str_rt
tax_paint_mat_rt
tax_sub_rt
tax_lbr_rt
tax_levies_rt
parts_tax_rates
job_totals
ownr_fn
ownr_ln
ownr_ea
ownr_addr1
ownr_addr2
ownr_city
ownr_st
ownr_zip
ownr_ctry
ownr_ph1
owner {
id
ownr_fn
ownr_ln
ownr_ea
ownr_addr1
ownr_addr2
ownr_city
ownr_st
ownr_zip
ownr_ctry
ownr_ph1
}
labor_rate_desc
rate_atp
rate_la1
rate_la2
rate_la3
rate_la4
rate_laa
rate_lab
rate_lad
rate_lae
rate_laf
rate_lag
rate_lam
rate_lar
rate_las
rate_lau
rate_ma2s
rate_ma2t
rate_ma3s
rate_mabl
rate_macs
rate_mahw
rate_mapa
rate_mash
rate_matd
actual_completion
scheduled_delivery
actual_delivery
date_invoiced
date_closed
date_exported
status
owner_owing
joblines {
id
unq_seq
line_ind
tax_part
line_desc
prt_dsmk_p
prt_dsmk_m
part_type
oem_partno
db_price
act_price
part_qty
mod_lbr_ty
db_hrs
mod_lb_hrs
lbr_op
lbr_amt
op_code_desc
}
cieca_ttl
}
}
`;

31
client/src/pages/jobs-close/jobs-close.component.jsx Normal file
View File

@@ -0,0 +1,31 @@
import React, { useCallback, useState } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { CalculateJob } from "../../components/job-totals-table/job-totals.utility";
import JobsCloseLaborMaterialAllocation from "../../components/jobs-close-labmat-allocation/jobs-close-labmat-allocation.component";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop,
});
export function JobsCloseComponent({ job, bodyshop }) {
const CalcJobMemoized = useCallback(
() => CalculateJob(job, bodyshop.shoprates),
[job, bodyshop.shoprates]
);
const jobTotals = CalcJobMemoized();
const [labmatAllocations, setLabmatAllocations] = useState(jobTotals.rates);
return (
<div>
<JobsCloseLaborMaterialAllocation
labmatAllocations={labmatAllocations}
setLabmatAllocations={setLabmatAllocations}
/>
</div>
);
}
export default connect(mapStateToProps, null)(JobsCloseComponent);

53
client/src/pages/jobs-close/jobs-close.container.jsx Normal file
View File

@@ -0,0 +1,53 @@
import { useQuery } from "@apollo/react-hooks";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_JOB_CLOSE_DETAILS } from "../../graphql/jobs.queries";
import { setBreadcrumbs } from "../../redux/application/application.actions";
import JobsCloseComponent from "./jobs-close.component";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
});
export function JobsCloseContainer({ setBreadcrumbs }) {
const { jobId } = useParams();
const { loading, error, data } = useQuery(QUERY_JOB_CLOSE_DETAILS, {
variables: { id: jobId },
});
const { t } = useTranslation();
useEffect(() => {
document.title = t("titles.jobs-close", {
number: data ? data.jobs_by_pk.ro_number : null,
});
setBreadcrumbs([
{
link: `/manage/jobs/${jobId}/`,
label: t("titles.bc.jobs"),
},
{
link: `/manage/jobs/${jobId}/`,
label: t("titles.bc.jobs-detail", {
number: data ? data.jobs_by_pk.ro_number : null,
}),
},
{
link: `/manage/jobs/${jobId}/close`,
label: t("titles.bc.jobs-close"),
},
]);
}, [setBreadcrumbs, t, jobId, data]);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type='error' />;
return (
<div>
<JobsCloseComponent job={data ? data.jobs_by_pk : {}} />
</div>
);
}
export default connect(null, mapDispatchToProps)(JobsCloseContainer);

8
client/src/pages/manage/manage.page.component.jsx
View File

@@ -87,6 +87,7 @@ const JobIntake = lazy(() =>
import("../jobs-intake/jobs-intake.page.container") import("../jobs-intake/jobs-intake.page.container")
); );
const AllJobs = lazy(() => import("../jobs-all/jobs-all.container")); const AllJobs = lazy(() => import("../jobs-all/jobs-all.container"));
const JobsClose = lazy(() => import("../jobs-close/jobs-close.container"));
const { Header, Content, Footer } = Layout; const { Header, Content, Footer } = Layout;
@@ -125,7 +126,12 @@ export default function Manage({ match }) {
exact exact
path={`${match.path}/jobs/:jobId/intake`} path={`${match.path}/jobs/:jobId/intake`}
component={JobIntake} component={JobIntake}
/>{" "} />
<Route
exact
path={`${match.path}/jobs/:jobId/close`}
component={JobsClose}
/>
<Route <Route
exact exact
path={`${match.path}/jobs/all`} path={`${match.path}/jobs/all`}

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

@@ -86,6 +86,8 @@
"invoice_state_tax_rate": "Invoices - State Tax Rate %", "invoice_state_tax_rate": "Invoices - State Tax Rate %",
"logo_img_path": "Shop Logo", "logo_img_path": "Shop Logo",
"responsibilitycenter": "Responsibility Center", "responsibilitycenter": "Responsibility Center",
"responsibilitycenter_accountname": "Account Name",
"responsibilitycenter_accountnumber": "Account Number",
"responsibilitycenters": { "responsibilitycenters": {
"atp": "ATP", "atp": "ATP",
"lab": "Labor", "lab": "Labor",
@@ -884,6 +886,7 @@
"jobs": "Jobs", "jobs": "Jobs",
"jobs-active": "Active Jobs", "jobs-active": "Active Jobs",
"jobs-all": "All Jobs", "jobs-all": "All Jobs",
"jobs-close": "Close Job",
"jobs-detail": "Job {{number}}", "jobs-detail": "Job {{number}}",
"jobs-intake": "Intake", "jobs-intake": "Intake",
"jobs-new": "Create a New Job", "jobs-new": "Create a New Job",
@@ -906,6 +909,7 @@
"invoices-list": "Invoices | $t(titles.app)", "invoices-list": "Invoices | $t(titles.app)",
"jobs": "Active Jobs | $t(titles.app)", "jobs": "Active Jobs | $t(titles.app)",
"jobs-all": "All Jobs | $t(titles.app)", "jobs-all": "All Jobs | $t(titles.app)",
"jobs-close": "Close Job {{number}} | $t(titles.app)",
"jobs-create": "Create a New Job | $t(titles.app)", "jobs-create": "Create a New Job | $t(titles.app)",
"jobs-intake": "Intake | $t(titles.app)", "jobs-intake": "Intake | $t(titles.app)",
"jobsavailable": "Available Jobs | $t(titles.app)", "jobsavailable": "Available Jobs | $t(titles.app)",

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

@@ -86,6 +86,8 @@
"invoice_state_tax_rate": "", "invoice_state_tax_rate": "",
"logo_img_path": "", "logo_img_path": "",
"responsibilitycenter": "", "responsibilitycenter": "",
"responsibilitycenter_accountname": "",
"responsibilitycenter_accountnumber": "",
"responsibilitycenters": { "responsibilitycenters": {
"atp": "", "atp": "",
"lab": "", "lab": "",
@@ -884,6 +886,7 @@
"jobs": "", "jobs": "",
"jobs-active": "", "jobs-active": "",
"jobs-all": "", "jobs-all": "",
"jobs-close": "",
"jobs-detail": "", "jobs-detail": "",
"jobs-intake": "", "jobs-intake": "",
"jobs-new": "", "jobs-new": "",
@@ -906,6 +909,7 @@
"invoices-list": "", "invoices-list": "",
"jobs": "Todos los trabajos | $t(titles.app)", "jobs": "Todos los trabajos | $t(titles.app)",
"jobs-all": "", "jobs-all": "",
"jobs-close": "",
"jobs-create": "", "jobs-create": "",
"jobs-intake": "", "jobs-intake": "",
"jobsavailable": "Empleos disponibles | $t(titles.app)", "jobsavailable": "Empleos disponibles | $t(titles.app)",

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

@@ -86,6 +86,8 @@
"invoice_state_tax_rate": "", "invoice_state_tax_rate": "",
"logo_img_path": "", "logo_img_path": "",
"responsibilitycenter": "", "responsibilitycenter": "",
"responsibilitycenter_accountname": "",
"responsibilitycenter_accountnumber": "",
"responsibilitycenters": { "responsibilitycenters": {
"atp": "", "atp": "",
"lab": "", "lab": "",
@@ -884,6 +886,7 @@
"jobs": "", "jobs": "",
"jobs-active": "", "jobs-active": "",
"jobs-all": "", "jobs-all": "",
"jobs-close": "",
"jobs-detail": "", "jobs-detail": "",
"jobs-intake": "", "jobs-intake": "",
"jobs-new": "", "jobs-new": "",
@@ -906,6 +909,7 @@
"invoices-list": "", "invoices-list": "",
"jobs": "Tous les emplois | $t(titles.app)", "jobs": "Tous les emplois | $t(titles.app)",
"jobs-all": "", "jobs-all": "",
"jobs-close": "",
"jobs-create": "", "jobs-create": "",
"jobs-intake": "", "jobs-intake": "",
"jobsavailable": "Emplois disponibles | $t(titles.app)", "jobsavailable": "Emplois disponibles | $t(titles.app)",