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

Added labor type and part types to dropdowns on line upsert modal. BOD-412

Browse Source
This commit is contained in:
Patrick Fic
2020-09-16 14:22:39 -07:00
parent 7140d541d5
commit 41432864e8
6 changed files with 236 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -10368,6 +10368,90 @@
<folder_node> <folder_node>
<name>lbr_types</name> <name>lbr_types</name>
<children> <children>
<concept_node>
<name>LA1</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>LA2</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>LA3</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>LA4</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>LAA</name> <name>LAA</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -10557,6 +10641,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>LAU</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>
<concept_node> <concept_node>
@@ -10919,6 +11024,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>PAC</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>PAE</name> <name>PAE</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -11003,6 +11129,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>PAR</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>PAS</name> <name>PAS</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

28
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -139,20 +139,20 @@ export function JobLinesComponent({
dataIndex: "part_qty", dataIndex: "part_qty",
key: "part_qty", key: "part_qty",
}, },
{ // {
title: t("joblines.fields.total"), // title: t("joblines.fields.total"),
dataIndex: "total", // dataIndex: "total",
key: "total", // key: "total",
sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty, // sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
sortOrder: // sortOrder:
state.sortedInfo.columnKey === "total" && state.sortedInfo.order, // state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
ellipsis: true, // ellipsis: true,
render: (text, record) => ( // render: (text, record) => (
<CurrencyFormatter> // <CurrencyFormatter>
{record.act_price * record.part_qty} // {record.act_price * record.part_qty}
</CurrencyFormatter> // </CurrencyFormatter>
), // ),
}, // },
{ {
title: t("joblines.fields.mod_lbr_ty"), title: t("joblines.fields.mod_lbr_ty"),
dataIndex: "mod_lbr_ty", dataIndex: "mod_lbr_ty",

72
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
View File

@@ -19,25 +19,26 @@ export default function JobLinesUpsertModalComponent({
}, [visible, form]); }, [visible, form]);
return ( return (
<Form <Modal
onFinish={handleFinish} title={
initialValues={jobLine} jobLine && jobLine.id
layout="vertical" ? t("joblines.labels.edit")
autoComplete="off" : t("joblines.labels.new")
form={form} }
forceRender
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
> >
<Modal <Form
title={ onFinish={handleFinish}
jobLine && jobLine.id initialValues={jobLine}
? t("joblines.labels.edit") layout="vertical"
: t("joblines.labels.new") autoComplete="off"
} form={form}
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
> >
<LayoutFormRow grow> <LayoutFormRow grow>
<Form.Item <Form.Item
@@ -58,7 +59,7 @@ export default function JobLinesUpsertModalComponent({
</LayoutFormRow> </LayoutFormRow>
<LayoutFormRow grow> <LayoutFormRow grow>
<Form.Item label={t("joblines.fields.part_type")} name="part_type"> <Form.Item label={t("joblines.fields.part_type")} name="part_type">
<Select> <Select allowClear>
<Select.Option value="PAA"> <Select.Option value="PAA">
{t("joblines.fields.part_types.PAA")} {t("joblines.fields.part_types.PAA")}
</Select.Option> </Select.Option>
@@ -68,13 +69,22 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="PAL"> <Select.Option value="PAL">
{t("joblines.fields.part_types.PAL")} {t("joblines.fields.part_types.PAL")}
</Select.Option> </Select.Option>
<Select.Option value="PAM">
{t("joblines.fields.part_types.PAM")}
</Select.Option>
<Select.Option value="PAS"> <Select.Option value="PAS">
{t("joblines.fields.part_types.PAS")} {t("joblines.fields.part_types.PAS")}
</Select.Option> </Select.Option>
<Select.Option value="PAR">
{t("joblines.fields.part_types.PAR")}
</Select.Option>
<Select.Option value="PAC">
{t("joblines.fields.part_types.PAC")}
</Select.Option>
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty"> <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
<Select> <Select allowClear>
<Select.Option value="LAA"> <Select.Option value="LAA">
{t("joblines.fields.lbr_types.LAA")} {t("joblines.fields.lbr_types.LAA")}
</Select.Option> </Select.Option>
@@ -84,6 +94,9 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAD"> <Select.Option value="LAD">
{t("joblines.fields.lbr_types.LAD")} {t("joblines.fields.lbr_types.LAD")}
</Select.Option> </Select.Option>
<Select.Option value="LAE">
{t("joblines.fields.lbr_types.LAE")}
</Select.Option>
<Select.Option value="LAF"> <Select.Option value="LAF">
{t("joblines.fields.lbr_types.LAF")} {t("joblines.fields.lbr_types.LAF")}
</Select.Option> </Select.Option>
@@ -99,6 +112,21 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAS"> <Select.Option value="LAS">
{t("joblines.fields.lbr_types.LAS")} {t("joblines.fields.lbr_types.LAS")}
</Select.Option> </Select.Option>
<Select.Option value="LAU">
{t("joblines.fields.lbr_types.LAU")}
</Select.Option>
<Select.Option value="LA1">
{t("joblines.fields.lbr_types.LA1")}
</Select.Option>
<Select.Option value="LA2">
{t("joblines.fields.lbr_types.LA2")}
</Select.Option>
<Select.Option value="LA3">
{t("joblines.fields.lbr_types.LA3")}
</Select.Option>
<Select.Option value="LA4">
{t("joblines.fields.lbr_types.LA4")}
</Select.Option>
</Select> </Select>
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
@@ -139,7 +167,7 @@ export default function JobLinesUpsertModalComponent({
<InputCurrency precision={2} min={0} /> <InputCurrency precision={2} min={0} />
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
</Modal> </Form>
</Form> </Modal>
); );
} }

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

@@ -691,6 +691,10 @@
"act_price": "Actual Price", "act_price": "Actual Price",
"db_price": "Database Price", "db_price": "Database Price",
"lbr_types": { "lbr_types": {
"LA1": "LA1",
"LA2": "LA2",
"LA3": "LA3",
"LA4": "LA4",
"LAA": "Aluminum", "LAA": "Aluminum",
"LAB": "Body", "LAB": "Body",
"LAD": "Diagnostic", "LAD": "Diagnostic",
@@ -699,7 +703,8 @@
"LAG": "Glass", "LAG": "Glass",
"LAM": "Mechanical", "LAM": "Mechanical",
"LAR": "Refinish", "LAR": "Refinish",
"LAS": "Structural" "LAS": "Structural",
"LAU": "User Defined"
}, },
"line_desc": "Line Desc.", "line_desc": "Line Desc.",
"line_ind": "S#", "line_ind": "S#",
@@ -719,10 +724,12 @@
"CCF": "CC Refuel", "CCF": "CC Refuel",
"CCM": "CC Mileage", "CCM": "CC Mileage",
"PAA": "Aftermarket", "PAA": "Aftermarket",
"PAC": "Rechromed",
"PAE": "Existing", "PAE": "Existing",
"PAL": "LKQ", "PAL": "LKQ",
"PAM": "Remanufactured", "PAM": "Remanufactured",
"PAN": "New/OEM", "PAN": "New/OEM",
"PAR": "Recored",
"PAS": "Sublet", "PAS": "Sublet",
"PASL": "Sublet" "PASL": "Sublet"
}, },

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

@@ -691,6 +691,10 @@
"act_price": "Precio actual", "act_price": "Precio actual",
"db_price": "Precio de base de datos", "db_price": "Precio de base de datos",
"lbr_types": { "lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
"LA4": "",
"LAA": "", "LAA": "",
"LAB": "", "LAB": "",
"LAD": "", "LAD": "",
@@ -699,7 +703,8 @@
"LAG": "", "LAG": "",
"LAM": "", "LAM": "",
"LAR": "", "LAR": "",
"LAS": "" "LAS": "",
"LAU": ""
}, },
"line_desc": "Descripción de línea", "line_desc": "Descripción de línea",
"line_ind": "S#", "line_ind": "S#",
@@ -719,10 +724,12 @@
"CCF": "", "CCF": "",
"CCM": "", "CCM": "",
"PAA": "", "PAA": "",
"PAC": "",
"PAE": "", "PAE": "",
"PAL": "", "PAL": "",
"PAM": "", "PAM": "",
"PAN": "", "PAN": "",
"PAR": "",
"PAS": "", "PAS": "",
"PASL": "" "PASL": ""
}, },

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

@@ -691,6 +691,10 @@
"act_price": "Prix actuel", "act_price": "Prix actuel",
"db_price": "Prix de la base de données", "db_price": "Prix de la base de données",
"lbr_types": { "lbr_types": {
"LA1": "",
"LA2": "",
"LA3": "",
"LA4": "",
"LAA": "", "LAA": "",
"LAB": "", "LAB": "",
"LAD": "", "LAD": "",
@@ -699,7 +703,8 @@
"LAG": "", "LAG": "",
"LAM": "", "LAM": "",
"LAR": "", "LAR": "",
"LAS": "" "LAS": "",
"LAU": ""
}, },
"line_desc": "Description de la ligne", "line_desc": "Description de la ligne",
"line_ind": "S#", "line_ind": "S#",
@@ -719,10 +724,12 @@
"CCF": "", "CCF": "",
"CCM": "", "CCM": "",
"PAA": "", "PAA": "",
"PAC": "",
"PAE": "", "PAE": "",
"PAL": "", "PAL": "",
"PAM": "", "PAM": "",
"PAN": "", "PAN": "",
"PAR": "",
"PAS": "", "PAS": "",
"PASL": "" "PASL": ""
}, },