diff --git a/Back-End/Planning/views.py b/Back-End/Planning/views.py index 8faa19e..a74c536 100644 --- a/Back-End/Planning/views.py +++ b/Back-End/Planning/views.py @@ -147,7 +147,7 @@ class EventsWithIdView(APIView): return JsonResponse({'error': 'Event not found'}, status=404) event.delete() - return JsonResponse({'message': 'Event deleted'}, status=204) + return JsonResponse({'message': 'Event deleted'}, status=200) class UpcomingEventsView(APIView): def get(self, request): diff --git a/Front-End/src/components/Calendar/Calendar.js b/Front-End/src/components/Calendar/Calendar.js index b45b77b..ffd7765 100644 --- a/Front-End/src/components/Calendar/Calendar.js +++ b/Front-End/src/components/Calendar/Calendar.js @@ -22,14 +22,14 @@ import { fr } from 'date-fns/locale'; import { AnimatePresence, motion } from 'framer-motion'; // Ajouter cet import import logger from '@/utils/logger'; -const Calendar = ({ modeSet, onDateClick, onEventClick }) => { +const Calendar = ({ modeSet, onDateClick, onEventClick, schoolClassMode=false }) => { const { currentDate, setCurrentDate, viewType, setViewType, events, - hiddenSchedules, + hiddenSchedules } = usePlanning(); const [visibleEvents, setVisibleEvents] = useState([]); const [showDatePicker, setShowDatePicker] = useState(false); @@ -90,79 +90,81 @@ const Calendar = ({ modeSet, onDateClick, onEventClick }) => { return (
- {/* Navigation à gauche */} -
- - - - {/* Menu déroulant pour le mois/année */} -
+ {!schoolClassMode && ( +
+ {/* Navigation à gauche */} + - {/* Menu de sélection du mois/année */} - {showDatePicker && ( -
- {viewType !== 'year' && ( -
+ {/* Menu déroulant pour le mois/année */} +
+ + + {/* Menu de sélection du mois/année */} + {showDatePicker && ( +
+ {viewType !== 'year' && ( +
+
+ {months.map((month) => ( + + ))} +
+
+ )} +
- {months.map((month) => ( + {years.map((year) => ( ))}
- )} -
-
- {years.map((year) => ( - - ))} -
-
- )} -
+ )} +
- -
+ +
+ )} {/* Numéro de semaine au centre */} {viewType === 'week' && ( @@ -176,11 +178,13 @@ const Calendar = ({ modeSet, onDateClick, onEventClick }) => { {/* Contrôles à droite */}
- -
diff --git a/Front-End/src/components/Structure/Planning/ScheduleManagement.js b/Front-End/src/components/Structure/Planning/ScheduleManagement.js index 3526188..41113e1 100644 --- a/Front-End/src/components/Structure/Planning/ScheduleManagement.js +++ b/Front-End/src/components/Structure/Planning/ScheduleManagement.js @@ -60,6 +60,7 @@ export default function ScheduleManagement({ setEventData(event); setIsModalOpen(true); }} + schoolClassMode={true} />