Removed job close date. IO-629

client/src/components/contract-form/contract-form.component.jsx

@@ -104,9 +104,14 @@ export default function ContractFormComponent({
           </Form.Item>
         )}
       </LayoutFormRow>
-      <div>
-        <ContractFormJobPrefill jobId={selectedJobState[0]} form={form} />
-      </div>
+      {selectedJobState && (
+        <div>
+          <ContractFormJobPrefill
+            jobId={selectedJobState && selectedJobState[0]}
+            form={form}
+          />
+        </div>
+      )}
       <LayoutFormRow>
         <Form.Item
           label={t("contracts.fields.driver_dlnumber")}

client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx

@@ -22,7 +22,6 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
             data.date_open ||
             data.date_scheduled ||
             data.date_invoiced ||
-            data.date_closed ||
             data.date_exported
           ) ? (
             <div>{t("jobs.errors.nodates")}</div>
@@ -97,13 +96,6 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
             </Timeline.Item>
           ) : null}
 
-          {data.date_closed ? (
-            <Timeline.Item>
-              <label>{t("jobs.fields.date_closed")}: </label>
-              <DateFormatter>{data.date_closed}</DateFormatter>
-            </Timeline.Item>
-          ) : null}
-
           {data.date_exported ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_exported")}: </label>

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

@@ -1,4 +1,4 @@
-import { DatePicker, Form } from "antd";
+import { DatePicker, Form, Tooltip } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -36,9 +36,11 @@ export function JobsDetailDatesComponent({ jobRO, job }) {
         >
           <FormDatePicker disabled={jobRO} />
         </Form.Item>
-        <Form.Item label={t("jobs.fields.scheduled_in")} name="scheduled_in">
-          <DateTimePicker disabled={jobRO} />
-        </Form.Item>
+        <Tooltip title={t("jobs.labels.scheduledinchange")}>
+          <Form.Item label={t("jobs.fields.scheduled_in")} name="scheduled_in">
+            <DateTimePicker disabled={true || jobRO} />
+          </Form.Item>
+        </Tooltip>
         <Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
@@ -73,9 +75,7 @@ export function JobsDetailDatesComponent({ jobRO, job }) {
         <Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
-        <Form.Item label={t("jobs.fields.date_closed")} name="date_closed">
-          <DateTimePicker />
-        </Form.Item>
+
         <Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js

@@ -45,7 +45,7 @@ export default function DuplicateJob(
       delete newJob.date_estimated;
       delete newJob.date_scheduled;
       delete newJob.date_invoiced;
-      delete newJob.date_closed;
+
       delete newJob.date_exported;
       delete newJob.date_delivered;
       delete newJob.scheduled_completion;

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

@@ -85,6 +85,17 @@ export function ScheduleJobModalContainer({
       }
     }
 
+    if (existingAppointments.data.appointments.length > 0) {
+      console.log("Cancelling all previous appts.");
+      await Promise.all(
+        existingAppointments.data.appointments.map((app) => {
+          return cancelAppointment({
+            variables: { appid: app.id },
+          });
+        })
+      );
+    }
+
     const appt = await insertAppointment({
       variables: {
         app: {