Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Little release #48

Merged
merged 1 commit into from
Nov 10, 2024
Merged

Little release #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions frontend/src/components/Calendar/DataPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ const DatePicker = ({ setDate, initialDate, disableButtons }) => {
const [weekRange, setWeekRange] = useState("");
const [selectedDate, setSelectedDate] = useState(new Date(initialDate.start));

// Функция для вычисления начала и конца недели
const calculateWeekDates = useCallback((date) => {
const startOfWeek = new Date(date);
const endOfWeek = new Date(date);
startOfWeek.setDate(date.getDate() - (date.getDay() === 0 ? 6 : date.getDay() - 1)); // Пн
startOfWeek.setDate(date.getDate() - ((date.getDay() || 7) - 1)); // Пн

const endOfWeek = new Date(startOfWeek);
endOfWeek.setDate(startOfWeek.getDate() + 6); // Вс

// Форматируем даты в нужный формат
return {
start: `${startOfWeek.toISOString().split("T")[0]}T00:00:00+00:00`,
end: `${endOfWeek.toISOString().split("T")[0]}T23:59:59+00:00`,
start: `${startOfWeek.getFullYear()}-${(startOfWeek.getMonth() + 1).toString().padStart(2, '0')}-${startOfWeek.getDate().toString().padStart(2, '0')}T00:00:00+00:00`,
end: `${endOfWeek.getFullYear()}-${(endOfWeek.getMonth() + 1).toString().padStart(2, '0')}-${endOfWeek.getDate().toString().padStart(2, '0')}T23:59:59+00:00`,
};
}, []);

const calculateWeekRange = useCallback((date) => {
const startOfWeek = new Date(date);
const endOfWeek = new Date(date);
startOfWeek.setDate(date.getDate() - (date.getDay() === 0 ? 6 : date.getDay() - 1)); // Пн
startOfWeek.setDate(date.getDate() - ((date.getDay() || 7) - 1)); // Пн

const endOfWeek = new Date(startOfWeek);
endOfWeek.setDate(startOfWeek.getDate() + 6); // Вс

const formatOptions = { day: "numeric", month: "long" };
Expand All @@ -39,6 +39,14 @@ const DatePicker = ({ setDate, initialDate, disableButtons }) => {
return `${startFormatted} – ${endFormatted}`;
}, []);

// Установка начальной недели при загрузке
useEffect(() => {
const initialRange = calculateWeekRange(selectedDate);
const initialDates = calculateWeekDates(selectedDate);
setWeekRange(initialRange);
setDate(initialDates);
}, [selectedDate, calculateWeekRange, calculateWeekDates, setDate]);

useEffect(() => {
const fpInstance = flatpickr(datePickerRef.current, {
locale: Russian,
Expand All @@ -48,27 +56,24 @@ const DatePicker = ({ setDate, initialDate, disableButtons }) => {
const selectedDate = selectedDates[0];
setSelectedDate(selectedDate);
setWeekRange(calculateWeekRange(selectedDate));
const newDates = calculateWeekDates(selectedDate); // Обновляем даты
setDate(newDates); // Устанавливаем новые даты в родительском компоненте
const newDates = calculateWeekDates(selectedDate);
setDate(newDates);
}
}
});

return () => {
fpInstance.destroy();
};
}, [setDate, initialDate.start, calculateWeekRange, calculateWeekDates]);

useEffect(() => {
setWeekRange(calculateWeekRange(selectedDate));
}, [selectedDate, calculateWeekRange]);
}, [setDate, calculateWeekRange, calculateWeekDates]);

const handlePrevWeek = () => {
setSelectedDate((prev) => {
const newDate = new Date(prev);
newDate.setDate(prev.getDate() - 7);
setWeekRange(calculateWeekRange(newDate));
const newRange = calculateWeekRange(newDate);
const newDates = calculateWeekDates(newDate);
setWeekRange(newRange);
setDate(newDates);
return newDate;
});
Expand All @@ -78,8 +83,9 @@ const DatePicker = ({ setDate, initialDate, disableButtons }) => {
setSelectedDate((prev) => {
const newDate = new Date(prev);
newDate.setDate(prev.getDate() + 7);
setWeekRange(calculateWeekRange(newDate));
const newRange = calculateWeekRange(newDate);
const newDates = calculateWeekDates(newDate);
setWeekRange(newRange);
setDate(newDates);
return newDate;
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Calendar/DeadLine.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const DeadLine = ({date, events, setSelectedEvent}) => {
<button className="off-deadline">Скрыть</button>
</th>
{monthDays.map((day, index) => {
const adjustedDay = new Date(new Date(date.start).setDate(new Date(date.start).getDate() + index + 1)).toISOString().split('T')[0];
const adjustedDay = new Date(new Date(date.start).setDate(new Date(date.start).getDate() + index)).toISOString().split('T')[0];

const deadlines = events?.netology?.homework.filter(homework => {
const homeworkDeadline = new Date(homework.deadline).toISOString().split('T')[0];
Expand Down
11 changes: 11 additions & 0 deletions frontend/src/elements/ErrorMessage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react';

const ErrorMessage = ({message}) => {
return (
<div className="error-message">
<p>{message}</p>
</div>
);
};

export default ErrorMessage;
40 changes: 22 additions & 18 deletions frontend/src/pages/CalendarRoute.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import EventsDetail from "../components/Calendar/EventsDetail";
import DeadLine from "../components/Calendar/DeadLine";
import DaysNumber from "../components/Calendar/DaysNumber";
import LessonTimes from "../components/Calendar/LessonTimes";
import ErrorMessage from "../elements/ErrorMessage";

const CalendarRoute = () => {
const initialDate = useMemo(() => getCurrentWeekDates(), []);
Expand All @@ -26,7 +27,7 @@ const CalendarRoute = () => {
const [error, setError] = useState(null);
const [selectedEvent, setSelectedEvent] = useState(null);

console.log('date', date)
// console.log('date', date)

const fetchCourseAndEvents = useCallback(async () => {
setLoading(true);
Expand Down Expand Up @@ -65,9 +66,6 @@ const CalendarRoute = () => {
fetchCourseAndEvents();
}, [fetchCourseAndEvents]);

if (loading) return <Loader />;
if (error) return <div>{error}</div>;

const handleDataUpdate = (updatedEvents) => {
setEvents(updatedEvents);
};
Expand All @@ -84,26 +82,32 @@ const CalendarRoute = () => {
<div className="header-line">
<div className="shedule-export">
<span className="shedule">Мое расписание</span>
<ICSExporter events={allEvents} />
<CacheUpdateBtn date={date} onDataUpdate={handleDataUpdate} />
<ICSExporter events={allEvents}/>
<CacheUpdateBtn date={date} onDataUpdate={handleDataUpdate}/>
</div>
<ExitBtn />
<ExitBtn/>
</div>

<EventsDetail event={selectedEvent} />
<DatePicker setDate={setDate} initialDate={date} disableButtons={loading} />
<EventsDetail event={selectedEvent}/>
<DatePicker setDate={setDate} initialDate={date} disableButtons={loading}/>
</header>

<div className="calendar">
<table className="shedule-table">
<thead>
<DaysNumber date={date} />
<DeadLine date={date} events={events} setSelectedEvent={setSelectedEvent} />
</thead>
<tbody>
<LessonTimes events={events} selectedEvent={selectedEvent} setSelectedEvent={setSelectedEvent} />
</tbody>
</table>
{loading ? (
<Loader/>
) : error ? (
<ErrorMessage message={error}/>
) : (
<table className="shedule-table">
<thead>
<DaysNumber date={date}/>
<DeadLine date={date} events={events} setSelectedEvent={setSelectedEvent}/>
</thead>
<tbody>
<LessonTimes events={events} selectedEvent={selectedEvent} setSelectedEvent={setSelectedEvent}/>
</tbody>
</table>
)}
</div>
</div>
</div>
Expand Down
175 changes: 111 additions & 64 deletions frontend/src/services/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,21 @@ export async function getNetologyCourse(sessionToken) {
}
}

// calendar
export async function bulkEvents({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
// console.log('calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken', calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken)
// const calendarId = 45526; // Ваш ID календаря
// const timeZone = 'Europe/Moscow'; // Часовой пояс
// const attendeePersonId = '5a3d9024-d210-4bfb-a622-0a55ab5bac1a'; // Ваш ID участника

const apiRequest = async (endpoint, {calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user}) => {
const requestBody = {
body: {
timeMin: timeMin,
timeMax: timeMax,
size: 50,
attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
attendeePersonId: [attendeePersonId],
},
lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию

lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false },
};

try {
const response = await axios.post(
`${BACKEND_URL}/api/bulk/events/?calendar_id=${calendarId}&time_zone=${timeZone}`,
`${BACKEND_URL}${endpoint}?calendar_id=${calendarId}&time_zone=${timeZone}`,
requestBody,
{
headers: {
Expand All @@ -86,66 +80,119 @@ export async function bulkEvents({calendarId, timeZone, attendeePersonId, timeMi
return response;
} catch (error) {
console.error('Ошибка при получении данных:', error.response ? error.response.data : error.message);
throw error; // Пробрасываем ошибку, если необходимо
}
};

// Refresh calendar
export async function refreshBulkEvents({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
try {
const requestBody = {
body: {
timeMin: timeMin,
timeMax: timeMax,
size: 50,
attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
},
lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию
// Теперь используем apiRequest для реализации ваших функций
export const bulkEvents = (params) => {
return apiRequest('/api/bulk/events/', params);
};

};
export const refreshBulkEvents = (params) => {
return apiRequest('/api/bulk/refresh_events/', params);
};

const response = await axios.post(
`${BACKEND_URL}/api/bulk/refresh_events/?calendar_id=${calendarId}&time_zone=${timeZone}`,
requestBody,
{
headers: {
"_netology-on-rails_session": sessionToken, // Токен сессии
"Content-Type": "application/json",
},
}
);
return response;
} catch (e) {
return e.response;
}
}
export const exportICS = (params) => {
return apiRequest('/api/bulk/export_ics/', params);
};

// export file
export async function exportICS({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
try {
const requestBody = {
body: {
timeMin: timeMin,
timeMax: timeMax,
size: 50,
attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
},
lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию

};

const response = await axios.post(
`${BACKEND_URL}/api/bulk/export_ics/?calendar_id=${calendarId}&time_zone=${timeZone}`,
requestBody,
{
headers: {
"_netology-on-rails_session": sessionToken,
"Content-Type": "application/json",
},
}
);
return response;
} catch (e) {
return e.response;
}
}


// // calendar
// export async function bulkEvents({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
// // console.log('calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken', calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken)
// // const calendarId = 45526; // Ваш ID календаря
// // const timeZone = 'Europe/Moscow'; // Часовой пояс
// // const attendeePersonId = '5a3d9024-d210-4bfb-a622-0a55ab5bac1a'; // Ваш ID участника
//
// const requestBody = {
// body: {
// timeMin: timeMin,
// timeMax: timeMax,
// size: 50,
// attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
// },
// lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию
//
// };
//
// try {
// const response = await axios.post(
// `${BACKEND_URL}/api/bulk/events/?calendar_id=${calendarId}&time_zone=${timeZone}`,
// requestBody,
// {
// headers: {
// 'Content-Type': 'application/json',
// '_netology-on-rails_session': sessionToken,
// },
// }
// );
// return response;
// } catch (error) {
// console.error('Ошибка при получении данных:', error.response ? error.response.data : error.message);
// }
// };
//
// // Refresh calendar
// export async function refreshBulkEvents({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
// try {
// const requestBody = {
// body: {
// timeMin: timeMin,
// timeMax: timeMax,
// size: 50,
// attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
// },
// lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию
//
// };
//
// const response = await axios.post(
// `${BACKEND_URL}/api/bulk/refresh_events/?calendar_id=${calendarId}&time_zone=${timeZone}`,
// requestBody,
// {
// headers: {
// "_netology-on-rails_session": sessionToken, // Токен сессии
// "Content-Type": "application/json",
// },
// }
// );
// return response;
// } catch (e) {
// return e.response;
// }
// }
//
// // export file
// export async function exportICS({calendarId, timeZone, attendeePersonId, timeMin, timeMax, sessionToken, lms_user }) {
// try {
// const requestBody = {
// body: {
// timeMin: timeMin,
// timeMax: timeMax,
// size: 50,
// attendeePersonId: [attendeePersonId], // Обратите внимание на правильность имени свойства
// },
// lms_user: lms_user || { id: 0, token: sessionToken, is_enabled: false }, // Использовать переданный lms_user или значение по умолчанию
//
// };
//
// const response = await axios.post(
// `${BACKEND_URL}/api/bulk/export_ics/?calendar_id=${calendarId}&time_zone=${timeZone}`,
// requestBody,
// {
// headers: {
// "_netology-on-rails_session": sessionToken,
// "Content-Type": "application/json",
// },
// }
// );
// return response;
// } catch (e) {
// return e.response;
// }
// }

Loading
Loading