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

Added validation on jobline upsert modal. BOD-399

Browse Source
This commit is contained in:
Patrick Fic
2020-09-16 14:34:43 -07:00
parent 41432864e8
commit 0185a0ab93
5 changed files with 74 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -11440,6 +11440,27 @@
<folder_node>
<name>validations</name>
<children>
<concept_node>
<name>hrsrequirediflbrtyp</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>zeropriceexistingpart</name>
<definition_loaded>false</definition_loaded>

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

@@ -137,12 +137,50 @@ export default function JobLinesUpsertModalComponent({
>
<Input />
</Form.Item>
<Form.Item label={t("joblines.fields.mod_lb_hrs")} name="mod_lb_hrs">
<Form.Item
label={t("joblines.fields.mod_lb_hrs")}
name="mod_lb_hrs"
rules={[
// {
// required: !!form.getFieldValue("mod_lbr_ty"),
// message: t("general.validation.required"),
// },
({ getFieldValue }) => ({
validator(rule, value) {
if (!!getFieldValue("mod_lbr_ty") === !!value) {
return Promise.resolve();
}
return Promise.reject(
t("joblines.validation.hrsrequirediflbrtyp")
);
},
}),
]}
>
<InputCurrency />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow grow>
<Form.Item label={t("joblines.fields.part_qty")} name="part_qty">
<Form.Item
label={t("joblines.fields.part_qty")}
name="part_qty"
rules={[
// {
// required: !!form.getFieldValue("mod_lbr_ty"),
// message: t("general.validation.required"),
// },
({ getFieldValue }) => ({
validator(rule, value) {
if (!!getFieldValue("part_type") === !!value) {
return Promise.resolve();
}
return Promise.reject(
t("joblines.validation.requiredifparttype")
);
},
}),
]}
>
<InputNumber precision={0} min={0} />
</Form.Item>
<Form.Item label={t("joblines.fields.db_price")} name="db_price">
@@ -162,6 +200,16 @@ export default function JobLinesUpsertModalComponent({
);
},
}),
({ getFieldValue }) => ({
validator(rule, value) {
if (!!getFieldValue("part_type") === !!value) {
return Promise.resolve();
}
return Promise.reject(
t("joblines.validation.requiredifparttype")
);
},
}),
]}
>
<InputCurrency precision={2} min={0} />

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

@@ -750,6 +750,7 @@
"updated": "Job line updated successfully."
},
"validations": {
"hrsrequirediflbrtyp": "Labor hours are required if a labor type is selected. Clear the labor type if there are no labor hours.",
"zeropriceexistingpart": "This line cannot have any price since it uses an existing part."
}
},

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

@@ -750,6 +750,7 @@
"updated": ""
},
"validations": {
"hrsrequirediflbrtyp": "",
"zeropriceexistingpart": ""
}
},

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

@@ -750,6 +750,7 @@
"updated": ""
},
"validations": {
"hrsrequirediflbrtyp": "",
"zeropriceexistingpart": ""
}
},