IO-1513 Added next contact date.

client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx

@@ -75,6 +75,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         >
           <DateTimePicker />
         </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.date_next_contact")}
+          name="date_next_contact"
+        >
+          <DateTimePicker />
+        </Form.Item>
         <Form.Item
           label={t("jobs.fields.scheduled_completion")}
           name="scheduled_completion"

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,4 +1,5 @@
 import i18n from "i18next";
+import moment from "moment";
 import React from "react";
 import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
@@ -11,11 +12,11 @@ import ProductionListColumnBodyPriority from "./production-list-columns.bodyprio
 import ProductionListDate from "./production-list-columns.date.component";
 import ProductionListColumnDetailPriority from "./production-list-columns.detailpriority.component";
 import ProductionListEmployeeAssignment from "./production-list-columns.empassignment.component";
+import ProductionListLastContacted from "./production-list-columns.lastcontacted.component";
 import ProductionListColumnPaintPriority from "./production-list-columns.paintpriority.component";
 import ProductionListColumnNote from "./production-list-columns.productionnote.component";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
-import ProductionListLastContacted from "./production-list-columns.lastcontacted.component";
 
 const r = ({ technician, state, activeStatuses }) => {
   return [
@@ -109,6 +110,29 @@ const r = ({ technician, state, activeStatuses }) => {
         state.sortedInfo.order,
       render: (text, record) => <ProductionListLastContacted record={record} />,
     },
+    {
+      title: i18n.t("jobs.fields.date_next_contact"),
+      dataIndex: "date_next_contact",
+      key: "date_next_contact",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.date_next_contact, b.date_next_contact),
+      sortOrder:
+        state.sortedInfo.columnKey === "date_next_contact" &&
+        state.sortedInfo.order,
+      render: (text, record) => (
+        <span
+          style={{
+            color:
+              record.date_next_contact &&
+              moment(record.date_next_contact).isBefore(moment())
+                ? "red"
+                : "",
+          }}
+        >
+          <ProductionListDate record={record} field="date_next_contact" time/>
+        </span>
+      ),
+    },
     {
       title: i18n.t("jobs.fields.scheduled_delivery"),
       dataIndex: "scheduled_delivery",

client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx

@@ -29,7 +29,11 @@ export function ProductionLastContacted({ currentUser, record }) {
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const handleFinish = async ({ date_last_contacted, note }) => {
+  const handleFinish = async ({
+    date_last_contacted,
+    date_next_contact,
+    note,
+  }) => {
     logImEXEvent("production_last_contacted");
 
     //e.stopPropagation();
@@ -38,6 +42,7 @@ export function ProductionLastContacted({ currentUser, record }) {
         jobId: record.id,
         job: {
           date_last_contacted,
+          ...(date_next_contact ? { date_next_contact } : {}),
         },
       },
     });
@@ -98,7 +103,16 @@ export function ProductionLastContacted({ currentUser, record }) {
             onClick={(e) => e.stopPropagation()}
           >
             <Form form={form} onFinish={handleFinish} layout="vertical">
-              <Form.Item name="date_last_contacted">
+              <Form.Item
+                name="date_last_contacted"
+                label={t("jobs.fields.date_last_contacted")}
+              >
+                <FormDateTimePickerComponent />
+              </Form.Item>
+              <Form.Item
+                name="date_next_contact"
+                label={t("jobs.fields.date_next_contact")}
+              >
                 <FormDateTimePickerComponent />
               </Form.Item>
               <Form.Item label={t("notes.labels.notetoadd")} name="note">