From 58a314f72df2f00b4e401a768eab3bc58cf94e1d Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 6 May 2021 18:32:37 -0700
Subject: [PATCH] IO-1017 Schedule modal only future dates.

---
 .../form-date-time-picker.component.jsx               | 11 ++++++++++-
 .../schedule-job-modal.component.jsx                  |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
index 9b8cd3515..34131d479 100644
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -6,7 +6,10 @@ import { TimePicker } from "antd";
 import moment from "moment";
 //To be used as a form element only.
 
-const DateTimePicker = ({ value, onChange, onBlur, id, ...restProps }, ref) => {
+const DateTimePicker = (
+  { value, onChange, onBlur, id, onlyFuture, ...restProps },
+  ref
+) => {
   // const handleChange = (newDate) => {
   //   if (value !== newDate && onChange) {
   //     onChange(newDate);
@@ -17,6 +20,9 @@ const DateTimePicker = ({ value, onChange, onBlur, id, ...restProps }, ref) => {
     <div id={id}>
       <FormDatePicker
         {...restProps}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
+        })}
         value={value}
         onBlur={onBlur}
         onChange={onChange}
@@ -25,6 +31,9 @@ const DateTimePicker = ({ value, onChange, onBlur, id, ...restProps }, ref) => {
       <TimePicker
         {...restProps}
         value={value ? moment(value) : null}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().isAfter(d),
+        })}
         onChange={onChange}
         showSecond={false}
         minuteStep={15}
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 828c64f2a..bc695f326 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -76,7 +76,7 @@ export function ScheduleJobModalComponent({
               },
             ]}
           >
-            <DateTimePicker onBlur={handleDateBlur} />
+            <DateTimePicker onBlur={handleDateBlur} onlyFuture />
           </Form.Item>
           <Form.Item
             name="scheduled_completion"
@@ -88,7 +88,7 @@ export function ScheduleJobModalComponent({
               },
             ]}
           >
-            <DateTimePicker />
+            <DateTimePicker onlyFuture />
           </Form.Item>
         </LayoutFormRow>
         <Card title={t("appointments.labels.smartscheduling")}>