acasini/n3wt-school
1
0
Fork 0
mirror of https://git.v0id.ovh/n3wt-innov/n3wt-school.git synced 2026-01-28 23:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Suppression event planning

Browse Source 
feat: Planning mode SchoolClass
This commit is contained in:
N3WT DE COMPET
2025-05-30 22:59:23 +02:00
parent e4668ef1e5
commit c117f96e52
3 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Back-End/Planning/views.py
View File

@ -147,7 +147,7 @@ class EventsWithIdView(APIView):
return JsonResponse({'error': 'Event not found'}, status=404) return JsonResponse({'error': 'Event not found'}, status=404)
event.delete() event.delete()
return JsonResponse({'message': 'Event deleted'}, status=204) return JsonResponse({'message': 'Event deleted'}, status=200)
class UpcomingEventsView(APIView): class UpcomingEventsView(APIView):
def get(self, request): def get(self, request):

136
Front-End/src/components/Calendar/Calendar.js
View File

@ -22,14 +22,14 @@ import { fr } from 'date-fns/locale';
import { AnimatePresence, motion } from 'framer-motion'; // Ajouter cet import import { AnimatePresence, motion } from 'framer-motion'; // Ajouter cet import
import logger from '@/utils/logger'; import logger from '@/utils/logger';
const Calendar = ({ modeSet, onDateClick, onEventClick }) => { const Calendar = ({ modeSet, onDateClick, onEventClick, schoolClassMode=false }) => {
const { const {
currentDate, currentDate,
setCurrentDate, setCurrentDate,
viewType, viewType,
setViewType, setViewType,
events, events,
hiddenSchedules, hiddenSchedules
} = usePlanning(); } = usePlanning();
const [visibleEvents, setVisibleEvents] = useState([]); const [visibleEvents, setVisibleEvents] = useState([]);
const [showDatePicker, setShowDatePicker] = useState(false); const [showDatePicker, setShowDatePicker] = useState(false);
@ -90,79 +90,81 @@ const Calendar = ({ modeSet, onDateClick, onEventClick }) => {
return ( return (
<div className="flex-1 flex flex-col"> <div className="flex-1 flex flex-col">
<div className="flex items-center justify-between p-4 bg-white sticky top-0 z-30 border-b shadow-sm h-[64px]"> <div className="flex items-center justify-between p-4 bg-white sticky top-0 z-30 border-b shadow-sm h-[64px]">
{/* Navigation à gauche */} {!schoolClassMode && (
<div className="flex items-center gap-4"> <div className="flex items-center gap-4">
<button {/* Navigation à gauche */}
onClick={() => setCurrentDate(new Date())}
className="px-3 py-1.5 text-sm font-medium text-gray-700 hover:text-gray-900 bg-gray-100 hover:bg-gray-200 rounded-md transition-colors"
>
Aujourd&apos;hui
</button>
<button
onClick={() => navigateDate('prev')}
className="p-2 hover:bg-gray-100 rounded-full"
>
<ChevronLeft className="w-5 h-5" />
</button>
{/* Menu déroulant pour le mois/année */}
<div className="relative">
<button <button
onClick={() => setShowDatePicker(!showDatePicker)} onClick={() => setCurrentDate(new Date())}
className="flex items-center gap-1 px-2 py-1 hover:bg-gray-100 rounded-md" className="px-3 py-1.5 text-sm font-medium text-gray-700 hover:text-gray-900 bg-gray-100 hover:bg-gray-200 rounded-md transition-colors"
> >
<h2 className="text-xl font-semibold"> Aujourd&apos;hui
{format( </button>
currentDate, <button
viewType === 'year' ? 'yyyy' : 'MMMM yyyy', onClick={() => navigateDate('prev')}
{ locale: fr } className="p-2 hover:bg-gray-100 rounded-full"
)} >
</h2> <ChevronLeft className="w-5 h-5" />
<ChevronDown className="w-4 h-4" />
</button> </button>
{/* Menu de sélection du mois/année */} {/* Menu déroulant pour le mois/année */}
{showDatePicker && ( <div className="relative">
<div className="absolute top-full left-0 mt-1 bg-white border border-gray-200 rounded-lg shadow-lg z-50 w-64"> <button
{viewType !== 'year' && ( onClick={() => setShowDatePicker(!showDatePicker)}
<div className="p-2 border-b"> className="flex items-center gap-1 px-2 py-1 hover:bg-gray-100 rounded-md"
>
<h2 className="text-xl font-semibold">
{format(
currentDate,
viewType === 'year' ? 'yyyy' : 'MMMM yyyy',
{ locale: fr }
)}
</h2>
<ChevronDown className="w-4 h-4" />
</button>
{/* Menu de sélection du mois/année */}
{showDatePicker && (
<div className="absolute top-full left-0 mt-1 bg-white border border-gray-200 rounded-lg shadow-lg z-50 w-64">
{viewType !== 'year' && (
<div className="p-2 border-b">
<div className="grid grid-cols-3 gap-1">
{months.map((month) => (
<button
key={month.value}
onClick={() => handleMonthSelect(month.value)}
className="p-2 text-sm hover:bg-gray-100 rounded-md"
>
{month.label}
</button>
))}
</div>
</div>
)}
<div className="p-2">
<div className="grid grid-cols-3 gap-1"> <div className="grid grid-cols-3 gap-1">
{months.map((month) => ( {years.map((year) => (
<button <button
key={month.value} key={year.value}
onClick={() => handleMonthSelect(month.value)} onClick={() => handleYearSelect(year.value)}
className="p-2 text-sm hover:bg-gray-100 rounded-md" className="p-2 text-sm hover:bg-gray-100 rounded-md"
> >
{month.label} {year.label}
</button> </button>
))} ))}
</div> </div>
</div> </div>
)}
<div className="p-2">
<div className="grid grid-cols-3 gap-1">
{years.map((year) => (
<button
key={year.value}
onClick={() => handleYearSelect(year.value)}
className="p-2 text-sm hover:bg-gray-100 rounded-md"
>
{year.label}
</button>
))}
</div>
</div> </div>
</div> )}
)} </div>
</div>
<button <button
onClick={() => navigateDate('next')} onClick={() => navigateDate('next')}
className="p-2 hover:bg-gray-100 rounded-full" className="p-2 hover:bg-gray-100 rounded-full"
> >
<ChevronRight className="w-5 h-5" /> <ChevronRight className="w-5 h-5" />
</button> </button>
</div> </div>
)}
{/* Numéro de semaine au centre */} {/* Numéro de semaine au centre */}
{viewType === 'week' && ( {viewType === 'week' && (
@ -176,11 +178,13 @@ const Calendar = ({ modeSet, onDateClick, onEventClick }) => {
{/* Contrôles à droite */} {/* Contrôles à droite */}
<div className="flex items-center gap-4"> <div className="flex items-center gap-4">
<ToggleView viewType={viewType} setViewType={setViewType} /> {!schoolClassMode && (
<button <ToggleView viewType={viewType} setViewType={setViewType} />
onClick={onDateClick} )}
className="w-10 h-10 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors" <button
> onClick={onDateClick}
className="w-10 h-10 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors"
>
<Plus className="w-5 h-5" /> <Plus className="w-5 h-5" />
</button> </button>
</div> </div>

1
Front-End/src/components/Structure/Planning/ScheduleManagement.js
View File

@ -60,6 +60,7 @@ export default function ScheduleManagement({
setEventData(event); setEventData(event);
setIsModalOpen(true); setIsModalOpen(true);
}} }}
schoolClassMode={true}
/> />
<ScheduleEventModal <ScheduleEventModal
isOpen={isModalOpen} isOpen={isModalOpen}