{
onView={onView}
view={view}
eventPropGetter={eventGetter}
- min={DateTime.fromObject({ hour: 8, minute: 0 }).toJSDate()}
- max={DateTime.fromObject({ hour: 16, minute: 0 }).toJSDate()}
+ min={dayjs().set('hour', 8).set('minute', 0).toDate()}
+ max={dayjs().set('hour', 16).set('minute', 0).toDate()}
messages={bigCalendarTranslations}
/>
diff --git a/frontend/src/views/supervisor/SupervisorSchedule.tsx b/frontend/src/views/supervisor/SupervisorSchedule.tsx
index c51c213..924baa1 100644
--- a/frontend/src/views/supervisor/SupervisorSchedule.tsx
+++ b/frontend/src/views/supervisor/SupervisorSchedule.tsx
@@ -1,5 +1,4 @@
-import { Calendar, luxonLocalizer, Views } from 'react-big-calendar'
-import { DateTime, Settings } from 'luxon'
+import { Calendar, Views } from 'react-big-calendar'
import { useCallback, useState } from 'react'
import { useMutation, useQuery } from 'react-query'
import {
@@ -13,6 +12,8 @@ import { useForm } from 'react-hook-form'
import EditSchedule from '../coordinator/EditSchedule'
import useLocalStorageState from 'use-local-storage-state'
import bigCalendarTranslations from '../../utils/bigCalendarTranslations'
+import dayjs from 'dayjs'
+import dayjsLocalizer from '../../utils/dayjsLocalizer'
const customStyles = {
content: {
@@ -28,11 +29,9 @@ type SelectValue = {
value: string | number
label: string
}
+const localizer = dayjsLocalizer(dayjs)
const SupervisorSchedule = () => {
- Settings.defaultZone = DateTime.local().zoneName
- Settings.defaultLocale = 'pl'
-
const { id } = useParams<{ id: string }>()
const [yearGroupId] = useLocalStorageState('yearGroupId')
const [supervisorId] = useLocalStorageState('userId')
@@ -155,12 +154,14 @@ const SupervisorSchedule = () => {
const from = data.from.split(':')
const to = data.to.split(':')
await mutateAddAvailability({
- start_date: DateTime.fromJSDate(selectedDate.start)
- .set({ hour: from[0], minute: from[1] })
- .toFormat('yyyy-LL-dd HH:mm:ss'),
- end_date: DateTime.fromJSDate(selectedDate.start)
- .set({ hour: to[0], minute: to[1] })
- .toFormat('yyyy-LL-dd HH:mm:ss'),
+ start_date: dayjs(selectedDate.start)
+ .set('hour', from[0])
+ .set('minute', from[1])
+ .format('YYYY-MM-DD HH:mm:ss'),
+ end_date: dayjs(selectedDate.start)
+ .set('hour', to[0])
+ .set('minute', to[1])
+ .format('YYYY-MM-DD HH:mm:ss'),
scheduleId: Number(id),
project_supervisor_id: Number(supervisorId),
})
@@ -189,7 +190,7 @@ const SupervisorSchedule = () => {
return (
{
onView={onView}
view={view}
eventPropGetter={eventGetter}
- min={DateTime.fromObject({ hour: 8, minute: 0 }).toJSDate()}
- max={DateTime.fromObject({ hour: 16, minute: 0 }).toJSDate()}
+ min={dayjs().set('hour', 8).set('minute', 0).toDate()}
+ max={dayjs().set('hour', 16).set('minute', 0).toDate()}
messages={bigCalendarTranslations}
/>