From bd8753789230976f683e97dbd535c296284a4809 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 31 Jul 2020 14:02:27 -0700
Subject: [PATCH] Added job line edit modal selects for fields and formatted
 BOD-203

---
 bodyshop_translations.babel                   |  26 ++++
 .../job-lines-upsert-modal.component.jsx      | 138 +++++++++++++-----
 client/src/translations/en_us/common.json     |   3 +
 client/src/translations/es/common.json        |   3 +
 client/src/translations/fr/common.json        |   3 +
 5 files changed, 139 insertions(+), 34 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 3559357f3..6c686d2fd 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -9316,6 +9316,32 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>validations</name>
+                                <children>
+                                    <concept_node>
+                                        <name>zeropriceexistingpart</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>
                         </children>
                     </folder_node>
                     <folder_node>
diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
index e0db322dd..f73f18596 100644
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx
@@ -1,7 +1,8 @@
-import { Form, Input, Modal } from "antd";
+import { Form, Input, Modal, Select, InputNumber } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import InputCurrency from "../form-items-formatted/currency-form-item.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function JobLinesUpsertModalComponent({
   visible,
@@ -21,6 +22,7 @@ export default function JobLinesUpsertModalComponent({
     <Form
       onFinish={handleFinish}
       initialValues={jobLine}
+      layout="vertical"
       autoComplete="off"
       form={form}
     >
@@ -31,44 +33,112 @@ export default function JobLinesUpsertModalComponent({
             : t("joblines.labels.new")
         }
         visible={visible}
+        width="60%"
         okText={t("general.actions.save")}
         onOk={() => form.submit()}
         okButtonProps={{ loading: loading }}
         onCancel={handleCancel}
       >
-        <Form.Item
-          label={t("joblines.fields.line_desc")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-          name="line_desc"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
-          <Input />
-        </Form.Item>
-        <Form.Item label={t("joblines.fields.part_type")} name="part_type">
-          <Input />
-        </Form.Item>
-        <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("joblines.fields.op_code_desc")}
-          name="op_code_desc"
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item label={t("joblines.fields.mod_lb_hrs")} name="mod_lb_hrs">
-          <InputCurrency />
-        </Form.Item>
-        <Form.Item label={t("joblines.fields.act_price")} name="act_price">
-          <InputCurrency />
-        </Form.Item>
+        <LayoutFormRow grow>
+          <Form.Item
+            label={t("joblines.fields.line_desc")}
+            rules={[
+              {
+                required: true,
+                message: t("general.validation.required"),
+              },
+            ]}
+            name="line_desc"
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
+            <Input />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow grow>
+          <Form.Item label={t("joblines.fields.part_type")} name="part_type">
+            <Select>
+              <Select.Option value="PAA">
+                {t("joblines.fields.part_types.PAA")}
+              </Select.Option>
+              <Select.Option value="PAE">
+                {t("joblines.fields.part_types.PAE")}
+              </Select.Option>
+              <Select.Option value="PAL">
+                {t("joblines.fields.part_types.PAL")}
+              </Select.Option>
+              <Select.Option value="PAS">
+                {t("joblines.fields.part_types.PAS")}
+              </Select.Option>
+            </Select>
+          </Form.Item>
+          <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
+            <Select>
+              <Select.Option value="LAA">
+                {t("joblines.fields.lbr_types.LAA")}
+              </Select.Option>
+              <Select.Option value="LAB">
+                {t("joblines.fields.lbr_types.LAB")}
+              </Select.Option>
+              <Select.Option value="LAD">
+                {t("joblines.fields.lbr_types.LAD")}
+              </Select.Option>
+              <Select.Option value="LAF">
+                {t("joblines.fields.lbr_types.LAF")}
+              </Select.Option>
+              <Select.Option value="LAG">
+                {t("joblines.fields.lbr_types.LAG")}
+              </Select.Option>
+              <Select.Option value="LAM">
+                {t("joblines.fields.lbr_types.LAM")}
+              </Select.Option>
+              <Select.Option value="LAR">
+                {t("joblines.fields.lbr_types.LAR")}
+              </Select.Option>
+              <Select.Option value="LAS">
+                {t("joblines.fields.lbr_types.LAS")}
+              </Select.Option>
+            </Select>
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow grow>
+          <Form.Item
+            label={t("joblines.fields.op_code_desc")}
+            name="op_code_desc"
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item label={t("joblines.fields.mod_lb_hrs")} name="mod_lb_hrs">
+            <InputCurrency />
+          </Form.Item>
+        </LayoutFormRow>
+        <LayoutFormRow grow>
+          <Form.Item label={t("joblines.fields.part_qty")} name="part_qty">
+            <InputNumber precision={0} min={0} />
+          </Form.Item>
+          <Form.Item label={t("joblines.fields.db_price")} name="db_price">
+            <InputCurrency precision={2} min={0} />
+          </Form.Item>
+          <Form.Item
+            label={t("joblines.fields.act_price")}
+            name="act_price"
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!value || getFieldValue("part_type") !== "PAE") {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("joblines.validations.zeropriceexistingpart")
+                  );
+                },
+              }),
+            ]}
+          >
+            <InputCurrency precision={2} min={0} />
+          </Form.Item>
+        </LayoutFormRow>
       </Modal>
     </Form>
   );
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 79f5251e1..3142651c0 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -610,6 +610,9 @@
 				"created": "Job line created successfully.",
 				"saved": "Job line saved.",
 				"updated": "Job line updated successfully."
+			},
+			"validations": {
+				"zeropriceexistingpart": "This line cannot have any price since it uses an existing part."
 			}
 		},
 		"jobs": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index cca495fa5..4e788de76 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -610,6 +610,9 @@
 				"created": "",
 				"saved": "",
 				"updated": ""
+			},
+			"validations": {
+				"zeropriceexistingpart": ""
 			}
 		},
 		"jobs": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a37cc0218..b974656d3 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -610,6 +610,9 @@
 				"created": "",
 				"saved": "",
 				"updated": ""
+			},
+			"validations": {
+				"zeropriceexistingpart": ""
 			}
 		},
 		"jobs": {