From f884d2e23f749399352f190bb895046c36bfe3c0 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 14 Feb 2022 10:41:09 -0800
Subject: [PATCH] IO-1721 Update time ticket time fields to be in 5 minute
 increments.

---
 .../form-date-time-picker.component.jsx       | 34 +++++++++----------
 .../time-ticket-modal.component.jsx           |  2 ++
 2 files changed, 19 insertions(+), 17 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 34131d479..0337a038b 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
@@ -19,26 +19,26 @@ const DateTimePicker = (
   return (
     <div id={id}>
       <FormDatePicker
-        {...restProps}
-        {...(onlyFuture && {
-          disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
-        })}
-        value={value}
-        onBlur={onBlur}
-        onChange={onChange}
+      {...(onlyFuture && {
+        disabledDate: (d) => moment().subtract(1, "day").isAfter(d),
+      })}
+      value={value}
+      onBlur={onBlur}
+      onChange={onChange}
+      {...restProps}
       />
 
       <TimePicker
-        {...restProps}
-        value={value ? moment(value) : null}
-        {...(onlyFuture && {
-          disabledDate: (d) => moment().isAfter(d),
-        })}
-        onChange={onChange}
-        showSecond={false}
-        minuteStep={15}
-        onBlur={onBlur}
-        format="hh:mm a"
+      value={value ? moment(value) : null}
+      {...(onlyFuture && {
+        disabledDate: (d) => moment().isAfter(d),
+      })}
+      onChange={onChange}
+      showSecond={false}
+      minuteStep={15}
+      onBlur={onBlur}
+      format="hh:mm a"
+      {...restProps}
       />
     </div>
   );
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index cc12ce503..cbd68ad5a 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -212,6 +212,7 @@ export function TimeTicketModalComponent({
           <>
             <Form.Item label={t("timetickets.fields.clockon")} name="clockon">
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,
@@ -245,6 +246,7 @@ export function TimeTicketModalComponent({
               ]}
             >
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,