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

Revert "fix: application des recommandations linter es pour générer un build de prod"

Browse Source 
This reverts commit d1aa8b54fb.
This commit is contained in:
Luc SORIGNET
2025-02-15 13:41:06 +01:00
parent a571d80482
commit d9655772b4
23 changed files with 92 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ const Calendar = ({ onDateClick, onEventClick }) => {
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'hui
Aujourd'hui
</button>
<button onClick={() => navigateDate('prev')} className="p-2 hover:bg-gray-100 rounded-full">
<ChevronLeft className="w-5 h-5" />

16
Front-End/src/components/DropdownMenu.js
View File

@ -11,20 +11,18 @@ const DropdownMenu = ({ buttonContent, items, buttonClassName, menuClassName, dr
const actualSetDropdownOpen = isControlled ? propSetDropdownOpen : setDropdownOpen;
const handleClickOutside = (event) => {
if (menuRef.current && !menuRef.current.contains(event.target)) {
actualSetDropdownOpen(false);
}
};
useEffect(() => {
const handleClickOutside = (event) => {
if (menuRef.current && !menuRef.current.contains(event.target)) {
actualSetDropdownOpen(false);
}
};
document.addEventListener('mousedown', handleClickOutside);
return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [actualSetDropdownOpen]);
}, []);
return (
<div className="relative" ref={menuRef}>
<button className={buttonClassName} onClick={() => actualSetDropdownOpen(!actualDropdownOpen)}>
@ -35,7 +33,7 @@ const DropdownMenu = ({ buttonContent, items, buttonClassName, menuClassName, dr
{items.map((item, index) => (
<button
key={index}
className="w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 flex items-center gap-2"
className="block w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 flex items-center gap-2"
onClick={() => {
item.onClick();
actualSetDropdownOpen(false);

2
Front-End/src/components/EventModal.js
View File

@ -14,7 +14,7 @@ export default function EventModal({ isOpen, onClose, eventData, setEventData })
color: schedules[0].color
}));
}
}, [schedules, eventData.scheduleId,setEventData]);
}, [schedules, eventData.scheduleId]);
if (!isOpen) return null;

18
Front-End/src/components/Inscription/InscriptionForm.js
View File

@ -23,7 +23,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
selectedTuitionDiscounts: [],
selectedTuitionFees: [],
selectedFileGroup: null // Ajout du groupe de fichiers sélectionné
}, [registrationFees, registrationDiscounts]);
});
const [step, setStep] = useState(currentStep || 1);
const [selectedStudent, setSelectedEleve] = useState('');
@ -79,7 +79,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
);
setTotalRegistrationAmount(initialTotalRegistrationAmount);
}, [registrationDiscounts, registrationFees,calculateFinalRegistrationAmount]);
}, [registrationDiscounts, registrationFees]);
useEffect(() => {
setStep(currentStep || 1);
@ -176,7 +176,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
});
};
const calculateFinalRegistrationAmount = useCallback((selectedRegistrationFees, selectedRegistrationDiscounts) => {
const calculateFinalRegistrationAmount = (selectedRegistrationFees, selectedRegistrationDiscounts) => {
const totalFees = selectedRegistrationFees.reduce((sum, feeId) => {
const fee = registrationFees.find(f => f.id === feeId);
if (fee && !isNaN(parseFloat(fee.base_amount))) {
@ -200,7 +200,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
const finalAmount = totalFees - totalDiscounts;
return finalAmount.toFixed(2);
},[registrationDiscounts, registrationFees]);
};
const calculateFinalTuitionAmount = (selectedTuitionFees, selectedTuitionDiscounts) => {
const totalFees = selectedTuitionFees.reduce((sum, feeId) => {
@ -385,7 +385,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
) : (
<p className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative" role="alert">
<strong className="font-bold">Information</strong>
<span className="block sm:inline"> Aucune réduction n&apos;a été créée sur les frais d&apos;inscription.</span>
<span className="block sm:inline"> Aucune réduction n'a été créée sur les frais d'inscription.</span>
</p>
)}
</div>
@ -408,7 +408,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
) : (
<p className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
<strong className="font-bold">Attention!</strong>
<span className="block sm:inline"> Aucun frais d&apos;inscription n&apos;a été créé.</span>
<span className="block sm:inline"> Aucun frais d'inscription n'a été créé.</span>
</p>
)}
</div>
@ -440,7 +440,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
) : (
<p className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative" role="alert">
<strong className="font-bold">Information</strong>
<span className="block sm:inline"> Aucune réduction n&apos;a été créée sur les frais de scolarité.</span>
<span className="block sm:inline"> Aucune réduction n'a été créée sur les frais de scolarité.</span>
</p>
)}
</div>
@ -463,7 +463,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
) : (
<p className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
<strong className="font-bold">Attention!</strong>
<span className="block sm:inline"> Aucun frais de scolarité n&apos;a été créé.</span>
<span className="block sm:inline"> Aucun frais de scolarité n'a été créé.</span>
</p>
)}
</div>
@ -501,7 +501,7 @@ const InscriptionForm = ( { students, registrationDiscounts, tuitionDiscounts, r
) : (
<p className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
<strong className="font-bold">Attention!</strong>
<span className="block sm:inline"> Aucun groupe de documents n&apos;a été créé.</span>
<span className="block sm:inline"> Aucun groupe de documents n'a été créé.</span>
</p>
)}
</div>

2
Front-End/src/components/Inscription/InscriptionFormShared.js
View File

@ -249,7 +249,7 @@ export default function InscriptionFormShared({
<DjangoCSRFToken csrfToken={csrfToken}/>
{/* Section Élève */}
<div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
<h2 className="text-xl font-bold mb-4 text-gray-800">Informations de l&apos;élève</h2>
<h2 className="text-xl font-bold mb-4 text-gray-800">Informations de l'élève</h2>
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<InputText
name="last_name"

36
Front-End/src/components/PaymentPlanSelector.js
View File

@ -49,25 +49,25 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
}, [paymentPlans]);
useEffect(() => {
const updateDefaultDay = () => {
const currentDates = dates[selectedFrequency];
if (currentDates && currentDates.length > 0) {
const days = currentDates.map(date => new Date(date).getDate());
const allSameDay = days.every(day => day === days[0]);
if (allSameDay) {
setDefaultDay(days[0]);
} else {
setDefaultDay('-');
setIsDefaultDayModified(false);
}
} else {
setDefaultDay('-');
}
};
updateDefaultDay();
}, [dates, selectedFrequency]);
const updateDefaultDay = () => {
const currentDates = dates[selectedFrequency];
if (currentDates && currentDates.length > 0) {
const days = currentDates.map(date => new Date(date).getDate());
const allSameDay = days.every(day => day === days[0]);
if (allSameDay) {
setDefaultDay(days[0]);
} else {
setDefaultDay('-');
setIsDefaultDayModified(false);
}
} else {
setDefaultDay('-');
}
};
const handleActivationChange = (value) => {
const selectedPlan = paymentPlans.find(plan => plan.frequency === paymentPlansOptions.find(p => p.id === value)?.frequency);
if (!selectedPlan) return;
@ -79,7 +79,7 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
handleEdit(selectedPlan.id, updatedData)
.then(() => {
setPaymentPlans(prevPlans => prevPlans.map(plan =>
setPaymentPlans(prevPlans => prevPlans.map(plan =>
plan.id === selectedPlan.id ? { ...plan, is_active: updatedData.is_active } : plan
));
setActiveFrequencies(prevFrequencies => {
@ -172,7 +172,7 @@ const PaymentPlanSelector = ({ paymentPlans, setPaymentPlans, handleEdit, type }
};
handleEdit(selectedPlan.id, updatedData)
.then(() => {
.then(() => {
setPopupMessage(`Mise à jour des dates d'échéances effectuée avec succès`);
setPopupVisible(true);
setIsDefaultDayModified(false);

2
Front-End/src/components/RegistrationFileGroupList.js
View File

@ -10,7 +10,7 @@ export default function RegistrationFileGroupList() {
return (
<div>
<h2>Groupes de fichiers d&apos;inscription</h2>
<h2>Groupes de fichiers d'inscription</h2>
<ul>
{groups.map(group => (
<li key={group.id}>{group.name}</li>

24
Front-End/src/components/Structure/Configuration/ClassesSection.js
View File

@ -7,8 +7,7 @@ import SelectChoice from '@/components/SelectChoice';
import TeacherItem from '@/components/Structure/Configuration/TeacherItem';
import MultiSelect from '@/components/MultiSelect';
import LevelLabel from '@/components/CustomLabels/LevelLabel';
import { DndProvider, useDrop } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import { DndProvider, HTML5Backend, useDrop } from 'react-dnd';
import { ESTABLISHMENT_ID } from '@/utils/Url';
const ItemTypes = {
@ -18,13 +17,16 @@ const ItemTypes = {
const TeachersDropZone = ({ classe, handleTeachersChange, teachers, isEditing }) => {
const [localTeachers, setLocalTeachers] = useState(classe.teachers_details || []);
useEffect(() => {
}, [teachers]);
useEffect(() => {
setLocalTeachers(classe.teachers_details || []);
}, [classe.teachers_details]);
useEffect(() => {
handleTeachersChange(localTeachers.map(teacher => teacher.id));
}, [handleTeachersChange, localTeachers]);
}, [localTeachers]);
const [{ isOver, canDrop }, drop] = useDrop({
accept: ItemTypes.TEACHER,
@ -103,20 +105,20 @@ const ClassesSection = ({ classes, setClasses, teachers, handleCreate, handleEdi
{ id: 3, name: 'MS', age: 4 },
{ id: 4, name: 'GS', age: 5 },
];
const niveauxSecondCycle = [
{ id: 5, name: 'CP', age: 6 },
{ id: 6, name: 'CE1', age: 7 },
{ id: 7, name: 'CE2', age: 8 },
];
const niveauxTroisiemeCycle = [
{ id: 8, name: 'CM1', age: 9 },
{ id: 9, name: 'CM2', age: 10 },
];
const allNiveaux = [...niveauxPremierCycle, ...niveauxSecondCycle, ...niveauxTroisiemeCycle];
const getNiveauxLabels = (levels) => {
return levels.map(niveauId => {
const niveau = allNiveaux.find(n => n.id === niveauId);
@ -129,10 +131,10 @@ const ClassesSection = ({ classes, setClasses, teachers, handleCreate, handleEdi
const currentDate = new Date();
const currentYear = currentDate.getFullYear();
const currentMonth = currentDate.getMonth() + 1; // Les mois sont indexés à partir de 0
// Si nous sommes avant septembre, l'année scolaire en cours a commencé l'année précédente
const startYear = currentMonth >= 9 ? currentYear : currentYear - 1;
const choices = [];
for (let i = 0; i < 3; i++) {
const year = startYear + i;
@ -230,7 +232,7 @@ const ClassesSection = ({ classes, setClasses, teachers, handleCreate, handleEdi
const handleMultiSelectChange = (selectedOptions) => {
const levels = selectedOptions.map(option => option.id);
if (editingClass) {
setFormData((prevData) => ({
...prevData,
@ -346,7 +348,7 @@ const ClassesSection = ({ classes, setClasses, teachers, handleCreate, handleEdi
const levelLabels = Array.isArray(classe.levels) ? getNiveauxLabels(classe.levels) : [];
return (
<div className="flex flex-wrap justify-center items-center space-x-2">
{levelLabels.length > 0
{levelLabels.length > 0
? levelLabels.map((label, index) => (
<LevelLabel key={index} label={label} index={index} />
))

2
Front-End/src/components/Structure/Configuration/TeachersSection.js
View File

@ -27,7 +27,7 @@ const SpecialitiesDropZone = ({ teacher, handleSpecialitiesChange, specialities,
useEffect(() => {
handleSpecialitiesChange(localSpecialities.map(speciality => speciality.id));
}, [localSpecialities,handleSpecialitiesChange]);
}, [localSpecialities]);
const [{ isOver, canDrop }, drop] = useDrop({
accept: ItemTypes.SPECIALITY,

10
Front-End/src/components/Structure/Planning/PlanningClassView.js
View File

@ -21,7 +21,7 @@ const PlanningClassView = ({ schedule, onDrop, selectedLevel, handleUpdatePlanni
if (schedule?.emploiDuTemps) {
setCurrentPeriod(determineInitialPeriod(schedule.emploiDuTemps));
}
}, [schedule, determineInitialPeriod]);
}, [schedule]);
if (!schedule || !schedule.emploiDuTemps) {
return (
@ -62,7 +62,7 @@ const PlanningClassView = ({ schedule, onDrop, selectedLevel, handleUpdatePlanni
const [eventHour, eventMinute] = event.heure.split(':').map(Number);
const eventStartTime = eventHour + eventMinute / 60;
const eventEndTime = eventStartTime + parseFloat(event.duree);
// Filtrer en fonction du selectedLevel
return schedule.niveau === level && startTime >= eventStartTime && startTime < eventEndTime;
}) || [];
@ -78,10 +78,10 @@ const PlanningClassView = ({ schedule, onDrop, selectedLevel, handleUpdatePlanni
const renderTimeSlots = () => {
const timeSlots = [];
for (let hour = parseInt(formData.time_range[0], 10); hour <= parseInt(formData.time_range[1], 10); hour++) {
const hourString = hour.toString().padStart(2, '0');
timeSlots.push(
<React.Fragment key={`${hourString}:00-${Math.random()}`}>
<div className="h-20 p-1 text-right text-sm text-gray-500 bg-gray-100 font-medium">
@ -160,7 +160,7 @@ const PlanningClassView = ({ schedule, onDrop, selectedLevel, handleUpdatePlanni
</div>
))}
</div>
{/* Contenu du planning */}
<div className="flex-1 overflow-y-auto relative" style={{ maxHeight: 'calc(100vh - 300px)' }}>
<div className="grid bg-white relative" style={{ gridTemplateColumns: `2.5rem repeat(${currentWeekDays.length}, 1fr)` }}>

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

@ -22,7 +22,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
const [schedule, setSchedule] = useState(null);
const { getNiveauxTabs } = useClasses();
const niveauxLabels = useMemo(() => Array.isArray(selectedClass?.levels) ? getNiveauxTabs(selectedClass.levels) : [], [selectedClass, getNiveauxTabs]);
const niveauxLabels = Array.isArray(selectedClass?.levels) ? getNiveauxTabs(selectedClass.levels) : [];
const [isModalOpen, setIsModalOpen] = useState(false);
const handleOpenModal = () => setIsModalOpen(true);
@ -38,7 +38,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
const currentPlanning = selectedClass.plannings_read?.find(planning => planning.niveau === niveau);
setSchedule(currentPlanning ? currentPlanning.planning : {});
}
}, [selectedClass, niveauxLabels, selectedLevel]);
}, [selectedClass, niveauxLabels]);
useEffect(() => {
if (selectedClass && selectedLevel) {

26
Front-End/src/components/Structure/Tarification/FeesManagement.js
View File

@ -6,14 +6,14 @@ import PaymentModeSelector from '@/components/PaymentModeSelector';
import { BE_SCHOOL_FEES_URL, BE_SCHOOL_DISCOUNTS_URL, BE_SCHOOL_PAYMENT_PLANS_URL, BE_SCHOOL_PAYMENT_MODES_URL } from '@/utils/Url';
import { set } from 'lodash';
const FeesManagement = ({ registrationDiscounts,
setRegistrationDiscounts,
tuitionDiscounts,
setTuitionDiscounts,
registrationFees,
setRegistrationFees,
tuitionFees,
setTuitionFees,
const FeesManagement = ({ registrationDiscounts,
setRegistrationDiscounts,
tuitionDiscounts,
setTuitionDiscounts,
registrationFees,
setRegistrationFees,
tuitionFees,
setTuitionFees,
registrationPaymentPlans,
setRegistrationPaymentPlans,
tuitionPaymentPlans,
@ -22,20 +22,20 @@ const FeesManagement = ({ registrationDiscounts,
setRegistrationPaymentModes,
tuitionPaymentModes,
setTuitionPaymentModes,
handleCreate,
handleEdit,
handleCreate,
handleEdit,
handleDelete }) => {
const handleDiscountDelete = (id, type) => {
if (type === 0) {
setRegistrationFees(prevFees =>
setRegistrationFees(prevFees =>
prevFees.map(fee => ({
...fee,
discounts: fee.discounts.filter(discountId => discountId !== id)
}))
);
} else {
setTuitionFees(prevFees =>
setTuitionFees(prevFees =>
prevFees.map(fee => ({
...fee,
discounts: fee.discounts.filter(discountId => discountId !== id)
@ -47,7 +47,7 @@ const FeesManagement = ({ registrationDiscounts,
return (
<div className="w-full mx-auto p-2 mt-6 space-y-6">
<div className="bg-white p-2 rounded-lg shadow-md">
<h2 className="text-2xl font-semibold mb-4">Frais d&apos;inscription</h2>
<h2 className="text-2xl font-semibold mb-4">Frais d'inscription</h2>
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
<FeesSection