feat: allow same date live class creation

frappe · Nov 10, 2024 · e25f161 · e25f161
1 parent c5f091f
commit e25f161
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/frontend/src/components/Modals/LiveClassModal.vue b/frontend/src/components/Modals/LiveClassModal.vue
@@ -161,21 +161,30 @@ const submitLiveClass = (close) => {
 			if (!liveClass.date) {
 				return 'Please select a date.'
 			}
-			if (dayjs(liveClass.date).isSameOrBefore(dayjs(), 'day')) {
-				return 'Please select a future date.'
-			}
 			if (!liveClass.time) {
 				return 'Please select a time.'
 			}
+			if (!liveClass.timezone) {
+				return 'Please select a timezone.'
+			}
 			if (!valideTime()) {
 				return 'Please enter a valid time in the format HH:mm.'
 			}
+			const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz(
+				liveClass.timezone,
+				true
+			)
+			if (
+				liveClassDateTime.isSameOrBefore(
+					dayjs().tz(liveClass.timezone, false),
+					'minute'
+				)
+			) {
+				return 'Please select a future date and time.'
+			}
 			if (!liveClass.duration) {
 				return 'Please select a duration.'
 			}
-			if (!liveClass.timezone) {
-				return 'Please select a timezone.'
-			}
 		},
 		onSuccess() {
 			liveClasses.value.reload()

diff --git a/frontend/src/utils/dayjs.js b/frontend/src/utils/dayjs.js
@@ -5,12 +5,16 @@ import updateLocale from 'dayjs/esm/plugin/updateLocale'
 import isToday from 'dayjs/esm/plugin/isToday'
 import isSameOrBefore from 'dayjs/esm/plugin/isSameOrBefore'
 import isSameOrAfter from 'dayjs/esm/plugin/isSameOrAfter'
+import utc from 'dayjs/esm/plugin/utc'
+import timezone from 'dayjs/esm/plugin/timezone'
 
 dayjs.extend(updateLocale)
 dayjs.extend(relativeTime)
 dayjs.extend(localizedFormat)
 dayjs.extend(isToday)
 dayjs.extend(isSameOrBefore)
 dayjs.extend(isSameOrAfter)
+dayjs.extend(utc)
+dayjs.extend(timezone)
 
 export default dayjs