- Merge Release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -19,10 +19,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_ln")}
           name={["owner", "data", "ownr_ln"]}
           rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
               //message: t("general.validation.required"),
-            },
+            }),
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -31,10 +34,13 @@ export default function JobsCreateOwnerInfoNewComponent() {
           label={t("owners.fields.ownr_fn")}
           name={["owner", "data", "ownr_fn"]}
           rules={[
-            {
-              required: state.owner.new,
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+                  getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
               //message: t("general.validation.required"),
-            },
+            }),
           ]}
         >
           <Input disabled={!state.owner.new} />
@@ -51,6 +57,17 @@ export default function JobsCreateOwnerInfoNewComponent() {
         <Form.Item
           label={t("owners.fields.ownr_co_nm")}
           name={["owner", "data", "ownr_co_nm"]}
+          rules={[
+            ({ getFieldValue }) => ({
+              required:
+                state.owner.new &&
+                (!getFieldValue(["owner", "data", "ownr_ln"]) ||
+                  !getFieldValue(["owner", "data", "ownr_fn"]) ||
+                  getFieldValue(["owner", "data", "ownr_ln"]) === "" ||
+                  getFieldValue(["owner", "data", "ownr_fn"]) === ""),
+              //message: t("general.validation.required"),
+            }),
+          ]}
         >
           <Input disabled={!state.owner.new} />
         </Form.Item>

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -215,6 +215,7 @@ export function ScheduleJobModalContainer({
       okButtonProps={{
         loading: loading,
       }}
+      closable={false}
     >
       <Form
         form={form}

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -166,9 +166,6 @@ export function TechClockOffButton({
                       },
                       ({ getFieldValue }) => ({
                         validator(rule, value) {
-                          console.log(
-                            bodyshop.tt_enforce_hours_for_tech_console
-                          );
                           if (!bodyshop.tt_enforce_hours_for_tech_console) {
                             return Promise.resolve();
                           }

client/src/components/tech-login/tech-login.component.jsx

@@ -1,84 +1,85 @@
-import { Button, Form, Input } from "antd";
+import {Button, Form, Input} from "antd";
 import React, {useEffect} from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { techLoginStart } from "../../redux/tech/tech.actions";
-import {
-  selectLoginError,
-  selectLoginLoading,
-  selectTechnician,
-} from "../../redux/tech/tech.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {useNavigate} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {techLoginStart} from "../../redux/tech/tech.actions";
+import {selectLoginError, selectLoginLoading, selectTechnician,} from "../../redux/tech/tech.selectors";
 import AlertComponent from "../alert/alert.component";
 import "./tech-login.styles.scss";
-import { useNavigate } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
-  technician: selectTechnician,
-  loginError: selectLoginError,
-  loginLoading: selectLoginLoading,
+    technician: selectTechnician,
+    loginError: selectLoginError,
+    loginLoading: selectLoginLoading,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  techLoginStart: (user) => dispatch(techLoginStart(user)),
+    techLoginStart: (user) => dispatch(techLoginStart(user)),
 });
 
 export function TechLogin({
-  technician,
-  loginError,
-  loginLoading,
-  techLoginStart,
-}) {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
+                              technician,
+                              loginError,
+                              loginLoading,
+                              techLoginStart,
+                          }) {
+    const {t} = useTranslation();
+    const navigate = useNavigate();
 
-  const handleFinish = (values) => {
-    // Remap these because EmployeeID form name has previously been used in the project
-    techLoginStart({pin: values.pin, employeeid: values.techEmployeeId});
-  };
+    const handleFinish = (values) => {
+        // Remap these because EmployeeID form name has previously been used in the project
+        techLoginStart({pin: values.pin, employeeid: values.techEmployeeId});
+    };
 
-  useEffect(() => {
-    if (technician) return navigate("/tech/joblookup");
-  }, [technician, navigate]);
+    useEffect(() => {
+        if (technician) return navigate("/tech/joblookup");
+    }, [technician, navigate]);
 
-  return (
-    <div className="tech-login-container">
-      <Form
-        layout="vertical"
-        onFinish={handleFinish}
-        autoComplete="new-password"
-      >
-        <Form.Item
-          label={t("tech.fields.employeeid")}
-          name="techEmployeeId"
+    useEffect(() => {
+        document.title = t("titles.techconsole");
+    }, [t]);
 
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input size="large" autoComplete="new-password" />
-        </Form.Item>
-        <Form.Item
-          label={t("tech.fields.pin")}
-          name="pin"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input.Password size="large" autoComplete="new-password" />
-        </Form.Item>
-        <Button htmlType="submit" loading={loginLoading} className="login-btn">
-          {t("general.actions.login")}
-        </Button>
-      </Form>
-      {loginError ? <AlertComponent type="error" message={loginError} /> : null}
-    </div>
-  );
+    return (
+        <div className="tech-login-container">
+            <Form
+                layout="vertical"
+                onFinish={handleFinish}
+                autoComplete="new-password"
+            >
+                <Form.Item
+                    label={t("tech.fields.employeeid")}
+                    name="techEmployeeId"
+
+                    rules={[
+                        {
+                            required: true,
+                            //message: t("general.validation.required"),
+                        },
+                    ]}
+                >
+                    <Input size="large" autoComplete="new-password"/>
+                </Form.Item>
+                <Form.Item
+                    label={t("tech.fields.pin")}
+                    name="pin"
+                    rules={[
+                        {
+                            required: true,
+                            //message: t("general.validation.required"),
+                        },
+                    ]}
+                >
+                    <Input.Password size="large" autoComplete="new-password"/>
+                </Form.Item>
+                <Button htmlType="submit" loading={loginLoading} className="login-btn">
+                    {t("general.actions.login")}
+                </Button>
+            </Form>
+            {loginError ? <AlertComponent type="error" message={loginError}/> : null}
+        </div>
+    );
 }
+
 export default connect(mapStateToProps, mapDispatchToProps)(TechLogin);