From a80dd12caae3ab62e51593473a87b456e6bb1e61 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 6 Aug 2020 10:43:47 -0700
Subject: [PATCH] Added required fields for job creation BOD-57

---
 .../jobs-create-jobs-info.component.jsx       | 180 +++++++++++-------
 .../jobs-create-owner-info.new.component.jsx  |  59 ++++--
 2 files changed, 151 insertions(+), 88 deletions(-)

diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index e99038af2..0da84ac0c 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -1,7 +1,7 @@
 import { Collapse, Form, Input, InputNumber, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import FormDatePicker from '../form-date-picker/form-date-picker.component';
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
@@ -11,135 +11,163 @@ export default function JobsCreateJobsInfo({ form }) {
   const { getFieldValue } = form;
   return (
     <div>
-      <Collapse defaultActiveKey='insurance'>
+      <Collapse defaultActiveKey="insurance">
         <Collapse.Panel
-          key='insurance'
-          header={t("menus.jobsdetail.insurance")}>
+          key="insurance"
+          header={t("menus.jobsdetail.insurance")}
+        >
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.ins_co_id")} name='ins_co_id'>
+            <Form.Item label={t("jobs.fields.ins_co_id")} name="ins_co_id">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.policy_no")} name='policy_no'>
+            <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.clm_no")} name='clm_no'>
+            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.regie_number")}
-              name='regie_number'>
+              name="regie_number"
+            >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.loss_date")} name='loss_date'>
+            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
               <FormDatePicker />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_co_nm")} name='ins_co_nm'>
+            <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_addr1")} name='ins_addr1'>
+            <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_city")} name='ins_city'>
+            <Form.Item label={t("jobs.fields.ins_city")} name="ins_city">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_ct_ln")} name='ins_ct_ln'>
+            <Form.Item label={t("jobs.fields.ins_ct_ln")} name="ins_ct_ln">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_ct_fn")} name='ins_ct_fn'>
+            <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ins_ph1")} name='ins_ph1'>
+            <Form.Item label={t("jobs.fields.ins_ph1")} name="ins_ph1">
               <FormItemPhone customInput={Input} />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.ins_ea")}
-              name='ins_ea'
+              name="ins_ea"
               rules={[
                 {
                   type: "email",
                   message: "This is not a valid email address.",
                 },
-              ]}>
+              ]}
+            >
               <FormItemEmail email={getFieldValue("ins_ea")} />
             </Form.Item>
             Appraiser Info
-            <Form.Item label={t("jobs.fields.est_co_nm")} name='est_co_nm'>
+            <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.est_ct_fn")} name='est_ct_fn'>
+            <Form.Item
+              label={t("jobs.fields.est_ct_fn")}
+              name="est_ct_fn"
+              rules={[
+                {
+                  required: true,
+                  message: t("general.validation.required"),
+                },
+              ]}
+            >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.est_ct_ln")} name='est_ct_ln'>
+            <Form.Item
+              label={t("jobs.fields.est_ct_ln")}
+              name="est_ct_ln"
+              rules={[
+                {
+                  required: true,
+                  message: t("general.validation.required"),
+                },
+              ]}
+            >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.pay_date")} name='pay_date'>
+            <Form.Item label={t("jobs.fields.pay_date")} name="pay_date">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.est_ph1")} name='est_ph1'>
+            <Form.Item label={t("jobs.fields.est_ph1")} name="est_ph1">
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.est_ea")}
-              name='est_ea'
+              name="est_ea"
               rules={[
                 {
                   type: "email",
                   message: "This is not a valid email address.",
                 },
-              ]}>
+              ]}
+            >
               <FormItemEmail email={getFieldValue("est_ea")} />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.selling_dealer")}
-              name='selling_dealer'>
+              name="selling_dealer"
+            >
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.servicing_dealer")}
-              name='servicing_dealer'>
+              name="servicing_dealer"
+            >
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.selling_dealer_contact")}
-              name='selling_dealer_contact'>
+              name="selling_dealer_contact"
+            >
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.servicing_dealer_contact")}
-              name='servicing_dealer_contact'>
+              name="servicing_dealer_contact"
+            >
               <Input />
             </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>
-        <Collapse.Panel key='claim' header={t("menus.jobsdetail.claimdetail")}>
+        <Collapse.Panel key="claim" header={t("menus.jobsdetail.claimdetail")}>
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.csr")} name='csr'>
+            <Form.Item label={t("jobs.fields.csr")} name="csr">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.loss_desc")} name='loss_desc'>
+            <Form.Item label={t("jobs.fields.loss_desc")} name="loss_desc">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ponumber")} name='po_number'>
+            <Form.Item label={t("jobs.fields.ponumber")} name="po_number">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.unitnumber")} name='unit_number'>
+            <Form.Item label={t("jobs.fields.unitnumber")} name="unit_number">
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.specialcoveragepolicy")}
-              valuePropName='checked'
-              name='special_coverage_policy'>
+              valuePropName="checked"
+              name="special_coverage_policy"
+            >
               <Switch />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.kmin")} name='kmin'>
+            <Form.Item label={t("jobs.fields.kmin")} name="kmin">
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.kmout")} name='kmout'>
+            <Form.Item label={t("jobs.fields.kmout")} name="kmout">
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.referralsource")}
-              name='referral_source'>
+              name="referral_source"
+            >
               <Input />
             </Form.Item>
           </LayoutFormRow>
@@ -153,120 +181,128 @@ export default function JobsCreateJobsInfo({ form }) {
           }
         </Collapse.Panel>
         <Collapse.Panel
-          key='financial'
-          header={t("menus.jobsdetail.financials")}>
+          key="financial"
+          header={t("menus.jobsdetail.financials")}
+        >
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
+            <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
+            <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
               <Input />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.depreciation_taxes")}
-              name='depreciation_taxes'>
+              name="depreciation_taxes"
+            >
               <InputNumber />
             </Form.Item>
             TODO This is equivalent of GST payable.
             <Form.Item
               label={t("jobs.fields.federal_tax_payable")}
-              name='federal_tax_payable'>
+              name="federal_tax_payable"
+            >
               <InputNumber />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.other_amount_payable")}
-              name='other_amount_payable'>
+              name="other_amount_payable"
+            >
               <InputNumber />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.towing_payable")}
-              name='towing_payable'>
+              name="towing_payable"
+            >
               <InputNumber />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.storage_payable")}
-              name='storage_payable'>
+              name="storage_payable"
+            >
               <InputNumber />
             </Form.Item>
             <Form.Item
               label={t("jobs.fields.adjustment_bottom_line")}
-              name='adjustment_bottom_line'>
+              name="adjustment_bottom_line"
+            >
               <InputNumber />
             </Form.Item>
             Totals Table
             <Form.Item
               label={t("jobs.fields.labor_rate_desc")}
-              name='labor_rate_desc'>
+              name="labor_rate_desc"
+            >
               <Input />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
+            <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
+            <Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
+            <Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
+            <Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
+            <Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
+            <Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
+            <Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
+            <Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
               <InputNumber />
             </Form.Item>
             Note //TODO Remove ATP rate?
-            <Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
+            <Form.Item label={t("jobs.fields.rate_atp")} name="rate_atp">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
+            <Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
+            <Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
+            <Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
+            <Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
+            <Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
+            <Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
+            <Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
+            <Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
+            <Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
+            <Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
+            <Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
+            <Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
+            <Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
               <InputNumber />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
+            <Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
               <InputNumber />
             </Form.Item>
           </LayoutFormRow>
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
index 2dfc4d4e4..8c97bf74d 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -24,19 +24,34 @@ export default function JobsCreateOwnerInfoNewComponent() {
               selectedid: null,
             },
           });
-        }}>
+        }}
+      >
         {t("jobs.labels.create.newowner")}
       </Checkbox>
 
       <LayoutFormRow header={t("owners.forms.name")} grow>
         <Form.Item
           label={t("owners.fields.ownr_ln")}
-          name={["owner", "data", "ownr_ln"]}>
+          name={["owner", "data", "ownr_ln"]}
+          rules={[
+            {
+              required: state.owner.new,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_fn")}
-          name={["owner", "data", "ownr_fn"]}>
+          name={["owner", "data", "ownr_fn"]}
+          rules={[
+            {
+              required: state.owner.new,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
@@ -44,12 +59,14 @@ export default function JobsCreateOwnerInfoNewComponent() {
       <LayoutFormRow grow>
         <Form.Item
           label={t("owners.fields.ownr_title")}
-          name={["owner", "data", "ownr_title"]}>
+          name={["owner", "data", "ownr_title"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_co_nm")}
-          name={["owner", "data", "ownr_co_nm"]}>
+          name={["owner", "data", "ownr_co_nm"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
@@ -57,12 +74,14 @@ export default function JobsCreateOwnerInfoNewComponent() {
       <LayoutFormRow header={t("owners.forms.address")} grow>
         <Form.Item
           label={t("owners.fields.ownr_addr1")}
-          name={["owner", "data", "ownr_addr1"]}>
+          name={["owner", "data", "ownr_addr1"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_addr2")}
-          name={["owner", "data", "ownr_addr2"]}>
+          name={["owner", "data", "ownr_addr2"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
@@ -70,24 +89,28 @@ export default function JobsCreateOwnerInfoNewComponent() {
       <LayoutFormRow grow>
         <Form.Item
           label={t("owners.fields.ownr_city")}
-          name={["owner", "data", "ownr_city"]}>
+          name={["owner", "data", "ownr_city"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_st")}
-          name={["owner", "data", "ownr_st"]}>
+          name={["owner", "data", "ownr_st"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
           label={t("owners.fields.ownr_zip")}
-          name={["owner", "data", "ownr_zip"]}>
+          name={["owner", "data", "ownr_zip"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_ctry")}
-          name={["owner", "data", "ownr_ctry"]}>
+          name={["owner", "data", "ownr_ctry"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
@@ -102,7 +125,8 @@ export default function JobsCreateOwnerInfoNewComponent() {
             },
           ]}
           name={["owner", "data", "ownr_ea"]}
-          shouldUpdate>
+          shouldUpdate
+        >
           {() => {
             return (
               <FormItemEmail
@@ -114,20 +138,23 @@ export default function JobsCreateOwnerInfoNewComponent() {
         </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_ph1")}
-          name={["owner", "data", "ownr_ph1"]}>
+          name={["owner", "data", "ownr_ph1"]}
+        >
           <FormItemPhone customInput={Input} disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
           label={t("owners.fields.preferred_contact")}
-          name={["owner", "data", "preferred_contact"]}>
+          name={["owner", "data", "preferred_contact"]}
+        >
           <Input disabled={!state.owner.new} />
         </Form.Item>
         <Form.Item
           label={t("owners.fields.allow_text_message")}
-          valuePropName='checked'
-          name={["owner", "data", "allow_text_message"]}>
+          valuePropName="checked"
+          name={["owner", "data", "allow_text_message"]}
+        >
           <Switch disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>