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
@@ -10368,6 +10368,90 @@
<folder_node>
<name>lbr_types</name>
<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>
<name>LAA</name>
<definition_loaded>false</definition_loaded>
@@ -10557,6 +10641,27 @@
</translation>
</translations>
</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>
</folder_node>
<concept_node>
@@ -10919,6 +11024,27 @@
</translation>
</translations>
</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>
<name>PAE</name>
<definition_loaded>false</definition_loaded>
@@ -11003,6 +11129,27 @@
</translation>
</translations>
</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>
<name>PAS</name>
<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",
key: "part_qty",
},
{
title: t("joblines.fields.total"),
dataIndex: "total",
key: "total",
sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
sortOrder:
state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
ellipsis: true,
render: (text, record) => (
<CurrencyFormatter>
{record.act_price * record.part_qty}
</CurrencyFormatter>
),
},
// {
// title: t("joblines.fields.total"),
// dataIndex: "total",
// key: "total",
// sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
// sortOrder:
// state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
// ellipsis: true,
// render: (text, record) => (
// <CurrencyFormatter>
// {record.act_price * record.part_qty}
// </CurrencyFormatter>
// ),
// },
{
title: t("joblines.fields.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]);
return (
<Form
onFinish={handleFinish}
initialValues={jobLine}
layout="vertical"
autoComplete="off"
form={form}
<Modal
title={
jobLine && jobLine.id
? t("joblines.labels.edit")
: t("joblines.labels.new")
}
forceRender
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
>
<Modal
title={
jobLine && jobLine.id
? t("joblines.labels.edit")
: t("joblines.labels.new")
}
visible={visible}
width="60%"
okText={t("general.actions.save")}
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
onCancel={handleCancel}
<Form
onFinish={handleFinish}
initialValues={jobLine}
layout="vertical"
autoComplete="off"
form={form}
>
<LayoutFormRow grow>
<Form.Item
@@ -58,7 +59,7 @@ export default function JobLinesUpsertModalComponent({
</LayoutFormRow>
<LayoutFormRow grow>
<Form.Item label={t("joblines.fields.part_type")} name="part_type">
<Select>
<Select allowClear>
<Select.Option value="PAA">
{t("joblines.fields.part_types.PAA")}
</Select.Option>
@@ -68,13 +69,22 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="PAL">
{t("joblines.fields.part_types.PAL")}
</Select.Option>
<Select.Option value="PAM">
{t("joblines.fields.part_types.PAM")}
</Select.Option>
<Select.Option value="PAS">
{t("joblines.fields.part_types.PAS")}
</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>
</Form.Item>
<Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
<Select>
<Select allowClear>
<Select.Option value="LAA">
{t("joblines.fields.lbr_types.LAA")}
</Select.Option>
@@ -84,6 +94,9 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAD">
{t("joblines.fields.lbr_types.LAD")}
</Select.Option>
<Select.Option value="LAE">
{t("joblines.fields.lbr_types.LAE")}
</Select.Option>
<Select.Option value="LAF">
{t("joblines.fields.lbr_types.LAF")}
</Select.Option>
@@ -99,6 +112,21 @@ export default function JobLinesUpsertModalComponent({
<Select.Option value="LAS">
{t("joblines.fields.lbr_types.LAS")}
</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>
</Form.Item>
</LayoutFormRow>
@@ -139,7 +167,7 @@ export default function JobLinesUpsertModalComponent({
<InputCurrency precision={2} min={0} />
</Form.Item>
</LayoutFormRow>
</Modal>
</Form>
</Form>
</Modal>
);
}

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

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

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

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

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

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