diff --git a/frontend/src/api/schedule.ts b/frontend/src/api/schedule.ts index 090cedf..3c3ec3a 100644 --- a/frontend/src/api/schedule.ts +++ b/frontend/src/api/schedule.ts @@ -84,11 +84,14 @@ export const createEvent = ({ scheduleId: number project_supervisors: number[] }) => { - return axiosInstance.post(`coordinator/enrollments/${scheduleId}/add`, { - start_date, - end_date, - project_supervisors, - }) + return axiosInstance.post( + `coordinator/enrollments/${scheduleId}/add-term-of-defences/`, + { + start_date, + end_date, + project_supervisors, + }, + ) } export const createSchedule = ( diff --git a/frontend/src/views/coordinator/EditSchedule.tsx b/frontend/src/views/coordinator/EditSchedule.tsx index 0d01fad..48b8420 100644 --- a/frontend/src/views/coordinator/EditSchedule.tsx +++ b/frontend/src/views/coordinator/EditSchedule.tsx @@ -72,8 +72,8 @@ const EditSchedule = ({

Termin

- {dayjs(eventData.start).format('YYYY-MM-DD HH:mm:ss')} -{' '} - {dayjs(eventData.end).format('YYYY-MM-DD HH:mm:ss')} + {dayjs(eventData.start).format('YYYY-MM-DD HH:mm')} -{' '} + {dayjs(eventData.end).format('HH:mm')}

{eventData.resource?.members_of_committee?.length ? ( <> diff --git a/frontend/src/views/coordinator/Schedule.tsx b/frontend/src/views/coordinator/Schedule.tsx index 236a82f..8aaacd3 100644 --- a/frontend/src/views/coordinator/Schedule.tsx +++ b/frontend/src/views/coordinator/Schedule.tsx @@ -27,6 +27,8 @@ const customStyles = { bottom: 'auto', marginRight: '-50%', transform: 'translate(-50%, -50%)', + width: '400px', + height: '400px', }, } type SelectValue = { @@ -164,20 +166,7 @@ const Schedule = () => { const handleSelectSlot = async (event: any) => { setSelectedDate(event) - if (view === Views.MONTH) { - setIsModalOpen(true) - } else { - // await mutateCreateEvent({ - // start_date: DateTime.fromJSDate(event.start).toFormat( - // 'YYYY-MM-DD HH:mm:ss', - // ), - // end_date: DateTime.fromJSDate(event.end).toFormat( - // 'YYYY-MM-DD HH:mm:ss', - // ), - // scheduleId: Number(id), - // }) - // refetch() - } + setIsModalOpen(true) } const handleSelectEvent = useCallback( @@ -200,16 +189,16 @@ const Schedule = () => { const onSubmit = async (data: any) => { // if (selectedDate && view === Views.MONTH) { if (selectedDate) { - const from = data.from.split(':') - const to = data.to.split(':') + const from = dayjs(selectedDate.start).format('HH:mm').split(':') + const to = dayjs(selectedDate.end).format('HH:mm').split(':') await mutateCreateEvent({ start_date: dayjs(selectedDate.start) - .set('hour', from[0]) - .set('minute', from[1]) + .set('hour', Number(from[0])) + .set('minute', Number(from[1])) .format('YYYY-MM-DD HH:mm:ss'), - end_date: dayjs(selectedDate.start) - .set('hour', to[0]) - .set('minute', to[1]) + end_date: dayjs(selectedDate.end) + .set('hour', Number(to[0])) + .set('minute', Number(to[1])) .format('YYYY-MM-DD HH:mm:ss'), scheduleId: Number(id), project_supervisors: data?.project_supervisors, @@ -264,7 +253,10 @@ const Schedule = () => { return (
- Start zapisów dla studentów: + Start zapisów dla studentów:{' '} + { locale={'pl'} disableClock /> - + { localizer={localizer} startAccessor="start" endAccessor="end" - style={{ height: '85vh' }} + style={{ height: '85vh', fontSize: '14px' }} selectable onSelectEvent={handleSelectEvent} onSelectSlot={handleSelectSlot} @@ -335,24 +329,9 @@ const Schedule = () => { >

Dostępne godziny

- - - - + {dayjs(selectedDate?.start).format('YYYY-MM-DD')} +

Od {dayjs(selectedDate?.start).format('HH:mm')}

+

Do {dayjs(selectedDate?.end).format('HH:mm')}

diff --git a/frontend/src/views/student/Enrollment.tsx b/frontend/src/views/student/Enrollment.tsx index 2b58105..7c765dd 100644 --- a/frontend/src/views/student/Enrollment.tsx +++ b/frontend/src/views/student/Enrollment.tsx @@ -25,7 +25,7 @@ const Enrollment = () => {

Opiekunowie:

- */}