Merge pull request #795 from culturecreates/feature/issue-9

Feature/issue 9
culturecreates · Nov 17, 2023 · 61ff4c4 · 61ff4c4
2 parents 574c955 + 4d916b7
commit 61ff4c4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx
@@ -35,6 +35,8 @@ const RecurringEvents = function ({
   const [subEventCount, setSubEventCount] = useState(0);
   const startDateRecur = Form.useWatch('startDateRecur', form);
   const { t } = useTranslation();
+  Form.useWatch('endTimeRecur', form);
+  Form.useWatch('startTimeRecur', form);
 
   useEffect(() => {
     if (eventDetails) {
@@ -454,6 +456,11 @@ const RecurringEvents = function ({
                       use12Hours={i18n?.language === 'en' ? true : false}
                       format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'}
                       data-cy="multiple-start-time"
+                      onSelect={(value) => {
+                        form.setFieldsValue({
+                          startTimeRecur: value,
+                        });
+                      }}
                     />
                   </Form.Item>
                 </Col>
@@ -470,6 +477,11 @@ const RecurringEvents = function ({
                       disabledHours={disabledHours}
                       disabledMinutes={disabledMinutes}
                       data-cy="multiple-end-time"
+                      onSelect={(value) => {
+                        form.setFieldsValue({
+                          endTimeRecur: value,
+                        });
+                      }}
                     />
                   </Form.Item>
                 </Col>

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -90,6 +90,8 @@ function AddEvent() {
   const navigate = useNavigate();
   const location = useLocation();
   const [form] = Form.useForm();
+  Form.useWatch('startTime', form);
+  Form.useWatch('endTime', form);
   const timestampRef = useRef(Date.now()).current;
   const { calendarId, eventId } = useParams();
   let [searchParams] = useSearchParams();
@@ -1603,6 +1605,11 @@ function AddEvent() {
                                   placeholder={t('dashboard.events.addEditEvent.dates.timeFormatPlaceholder')}
                                   use12Hours={i18n?.language === 'en' ? true : false}
                                   format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'}
+                                  onSelect={(value) => {
+                                    form.setFieldsValue({
+                                      startTime: value,
+                                    });
+                                  }}
                                   data-cy="single-date-start-time"
                                 />
                               </Form.Item>
@@ -1621,6 +1628,11 @@ function AddEvent() {
                                   placeholder={t('dashboard.events.addEditEvent.dates.timeFormatPlaceholder')}
                                   use12Hours={i18n?.language === 'en' ? true : false}
                                   format={i18n?.language === 'en' ? 'h:mm a' : 'HH:mm'}
+                                  onSelect={(value) => {
+                                    form.setFieldsValue({
+                                      endTime: value,
+                                    });
+                                  }}
                                   data-cy="single-date-end-time"
                                 />
                               </Form.Item>