refactor: refactoring du FRONT page subscribe

2026-01-29 07:53:23 +00:00 · 2025-01-12 14:37:49 +01:00
parent 58fe509734
commit 427b6c7588
25 changed files with 671 additions and 652 deletions
--- a/Front-End/src/components/Structure/Configuration/StructureManagement.js
+++ b/Front-End/src/components/Structure/Configuration/StructureManagement.js
@ -4,41 +4,41 @@ import TeachersSection from '@/components/Structure/Configuration/TeachersSectio
 import ClassesSection from '@/components/Structure/Configuration/ClassesSection';
 import { ClassesProvider } from '@/context/ClassesContext';

-import { BK_GESTIONENSEIGNANTS_SPECIALITE_URL, 
-  BK_GESTIONENSEIGNANTS_TEACHER_URL,
-  BK_GESTIONENSEIGNANTS_CLASSE_URL } from '@/utils/Url';
+import { BE_SCHOOL_SPECIALITY_URL,
+  BE_SCHOOL_TEACHER_URL,
+  BE_SCHOOL_SCHOOLCLASS_URL } from '@/utils/Url';

 const StructureManagement = ({ specialities, setSpecialities, teachers, setTeachers, classes, setClasses, handleCreate, handleEdit, handleDelete }) => {
  return (
-    <div className='p-8'>  
+    <div className='p-8'>
      <ClassesProvider>
-        <SpecialitiesSection 
-          specialities={specialities} 
+        <SpecialitiesSection
+          specialities={specialities}
          setSpecialities={setSpecialities}
-          handleCreate={(newData) => handleCreate(`${BK_GESTIONENSEIGNANTS_SPECIALITE_URL}`, newData, setSpecialities)}
-          handleEdit={(id, updatedData) => handleEdit(`${BK_GESTIONENSEIGNANTS_SPECIALITE_URL}`, id, updatedData, setSpecialities)}
-          handleDelete={(id) => handleDelete(`${BK_GESTIONENSEIGNANTS_SPECIALITE_URL}`, id, setSpecialities)}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_SPECIALITY_URL}`, newData, setSpecialities)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_SPECIALITY_URL}`, id, updatedData, setSpecialities)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_SPECIALITY_URL}`, id, setSpecialities)}
        />

        <TeachersSection
          teachers={teachers}
          specialities={specialities}
-          handleCreate={(newData) => handleCreate(`${BK_GESTIONENSEIGNANTS_TEACHER_URL}`, newData, setTeachers)}
-          handleEdit={(id, updatedData) => handleEdit(`${BK_GESTIONENSEIGNANTS_TEACHER_URL}`, id, updatedData, setTeachers)}
-          handleDelete={(id) => handleDelete(`${BK_GESTIONENSEIGNANTS_TEACHER_URL}`, id, setTeachers)}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_TEACHER_URL}`, newData, setTeachers)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_TEACHER_URL}`, id, updatedData, setTeachers)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_TEACHER_URL}`, id, setTeachers)}
        />

-        <ClassesSection 
-          classes={classes} 
+        <ClassesSection
+          classes={classes}
          specialities={specialities}
          teachers={teachers}
-          handleCreate={(newData) => handleCreate(`${BK_GESTIONENSEIGNANTS_CLASSE_URL}`, newData, setClasses)}
-          handleEdit={(id, updatedData) => handleEdit(`${BK_GESTIONENSEIGNANTS_CLASSE_URL}`, id, updatedData, setClasses)}
-          handleDelete={(id) => handleDelete(`${BK_GESTIONENSEIGNANTS_CLASSE_URL}`, id, setClasses)}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_SCHOOLCLASS_URL}`, newData, setClasses)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_SCHOOLCLASS_URL}`, id, updatedData, setClasses)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_SCHOOLCLASS_URL}`, id, setClasses)}
        />
      </ClassesProvider>
    </div>
-  
+

  );
 };
--- a/Front-End/src/components/Structure/Configuration/TeachersSection.js
+++ b/Front-End/src/components/Structure/Configuration/TeachersSection.js
@ -4,9 +4,10 @@ import Table from '@/components/Table';
 import DropdownMenu from '@/components/DropdownMenu';
 import Modal from '@/components/Modal';
 import TeacherForm from '@/components/Structure/Configuration/TeacherForm';
-import {BK_PROFILE_URL} from '@/utils/Url';
+
 import useCsrfToken from '@/hooks/useCsrfToken';
 import { TeacherFormProvider } from '@/context/TeacherFormContext';
+import { createProfile, updateProfile } from '@/app/lib/authAction';

 const TeachersSection = ({ teachers, handleCreate, handleEdit, handleDelete, specialities }) => {

@ -20,31 +21,21 @@ const TeachersSection = ({ teachers, handleCreate, handleEdit, handleDelete, spe
    setEditingTeacher(teacher);
  }

-  const closeEditModal = () => { 
-    setIsOpen(false); 
-    setEditingTeacher(null); 
+  const closeEditModal = () => {
+    setIsOpen(false);
+    setEditingTeacher(null);
  };

  const handleModalSubmit = (updatedData) => {
    if (editingTeacher) {
      // Modification du profil
-      const request = new Request(
-        `${BK_PROFILE_URL}/${updatedData.profilAssocie_id}`,
-        {
-            method:'PUT',
-            headers: {
-                'Content-Type':'application/json', 
-                'X-CSRFToken': csrfToken
-            },
-            credentials: 'include',
-            body: JSON.stringify( {
-                email: updatedData.mail,
-                username: updatedData.mail,
-                droit:updatedData.droit
-            }),
-          }
-        );
-        fetch(request).then(response => response.json())
+      const data = {
+          email: updatedData.mail,
+          username: updatedData.mail,
+          droit:updatedData.droit
+      }
+
+        updateProfile(updatedData.profilAssocie_id,data,csrfToken)
        .then(response => {
          console.log('Success:', response);
          console.log('UpdateData:', updatedData);
@ -58,25 +49,14 @@ const TeachersSection = ({ teachers, handleCreate, handleEdit, handleDelete, spe
    } else {
      // Création d'un profil associé à l'adresse mail du responsable saisie
      // Le profil est inactif
-      const request = new Request(
-          `${BK_PROFILE_URL}`,
-          {
-              method:'POST',
-              headers: {
-                  'Content-Type':'application/json', 
-                  'X-CSRFToken': csrfToken
-              },
-              credentials: 'include',
-              body: JSON.stringify( {
-                  email: updatedData.mail,
-                  password: 'Provisoire01!',
-                  username: updatedData.mail,
-                  is_active: 1, // On rend le profil actif : on considère qu'au moment de la configuration de l'école un abonnement a été souscrit
-                  droit:updatedData.droit
-              }),
-          }
-      );
-      fetch(request).then(response => response.json())
+      const data = {
+          email: updatedData.mail,
+          password: 'Provisoire01!',
+          username: updatedData.mail,
+          is_active: 1, // On rend le profil actif : on considère qu'au moment de la configuration de l'école un abonnement a été souscrit
+          droit:updatedData.droit
+      }
+      createProfile(data,csrfToken)
      .then(response => {
        console.log('Success:', response);
        console.log('UpdateData:', updatedData);
@ -133,7 +113,7 @@ const TeachersSection = ({ teachers, handleCreate, handleEdit, handleDelete, spe
              )
            },
            {
-              name: 'TYPE PROFIL', 
+              name: 'TYPE PROFIL',
              transform: (row) => {
                if (row.profilAssocie) {
                  const badgeClass = row.DroitLabel === 'ECOLE' ? 'bg-blue-100 text-blue-600' : 'bg-red-100 text-red-600';
@ -168,9 +148,9 @@ const TeachersSection = ({ teachers, handleCreate, handleEdit, handleDelete, spe
      </div>
      {isOpen && (
        <TeacherFormProvider initialTeacher={editingTeacher || {}}>
-          <Modal 
-            isOpen={isOpen} 
-            setIsOpen={setIsOpen} 
+          <Modal
+            isOpen={isOpen}
+            setIsOpen={setIsOpen}
            title={editingTeacher ? "Modification de l'enseignant" : "Création d'un nouvel enseignant"}
            size='sm:w-1/4'
            ContentComponent={() => (
--- a/Front-End/src/components/Structure/Planning/ScheduleManagement.js
+++ b/Front-End/src/components/Structure/Planning/ScheduleManagement.js
@ -6,7 +6,7 @@ import { DndProvider } from 'react-dnd';
 import { AnimatePresence, motion } from 'framer-motion';
 import PlanningClassView from '@/components/Structure/Planning/PlanningClassView';
 import SpecialitiesList from '@/components/Structure/Planning/SpecialitiesList';
-import { BK_GESTIONENSEIGNANTS_PLANNING_URL } from '@/utils/Url';
+import { BE_SCHOOL_PLANNING_URL } from '@/utils/Url';
 import { useClasses } from '@/context/ClassesContext';
 import { ClasseFormProvider } from '@/context/ClasseFormContext';
 import TabsStructure from '@/components/Structure/Configuration/TabsStructure';
@ -60,14 +60,14 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
  const onDrop = (item, hour, day) => {
    const { id, name, color, teachers } = item;
    const newSchedule = { ...schedule, emploiDuTemps: schedule.emploiDuTemps || {} };
-  
+
    if (!newSchedule.emploiDuTemps[day]) {
      newSchedule.emploiDuTemps[day] = [];
    }
    const courseTime = `${hour.toString().padStart(2, '0')}:00`;
-  
+
    const existingCourseIndex = newSchedule.emploiDuTemps[day].findIndex(course => course.heure === courseTime);
-  
+
    const newCourse = {
      duree: '1',
      heure: courseTime,
@ -75,21 +75,21 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
      teachers: teachers,
      color: color,
    };
-  
+
    if (existingCourseIndex !== -1) {
      newSchedule.emploiDuTemps[day][existingCourseIndex] = newCourse;
    } else {
      newSchedule.emploiDuTemps[day].push(newCourse);
    }
-  
+
    // Mettre à jour scheduleRef
    setSchedule(newSchedule)
-  
+
    // Utiliser `handleUpdatePlanning` pour mettre à jour le planning du niveau de la classe
    const planningId = selectedClass.plannings_read.find(planning => planning.niveau === selectedLevel)?.planning.id;
    if (planningId) {
      console.log('newSchedule : ', newSchedule)
-      handleUpdatePlanning(BK_GESTIONENSEIGNANTS_PLANNING_URL, planningId, newSchedule);
+      handleUpdatePlanning(BE_SCHOOL_PLANNING_URL, planningId, newSchedule);
    }
  };

@ -110,7 +110,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
      <DndProvider backend={HTML5Backend}>
        <div className="p-4 bg-gray-100 border-b">
          <div className="grid grid-cols-3 gap-4">
-            
+
            {/* Colonne Classes */}
            <div className="p-4 bg-gray-50 rounded-lg shadow-inner">
              <div className="flex justify-between items-center mb-4">
@ -131,7 +131,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
                />
              }
            </div>
-            
+
            {/* Colonne Niveaux */}
            <div className="p-4 bg-gray-50 rounded-lg shadow-inner">
              <div className="flex justify-between items-center mb-4">
@ -144,7 +144,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
                <TabsStructure activeTab={selectedLevel} setActiveTab={handleLevelSelect} tabs={niveauxLabels} />
              }
            </div>
-            
+
            {/* Colonne Spécialités */}
            <div className="p-4 bg-gray-50 rounded-lg shadow-inner">
              <div className="flex justify-between items-center mb-4">
@ -155,10 +155,10 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
              </div>
              <SpecialitiesList teachers={selectedClass ? selectedClass.enseignants : []} />
            </div>
-  
+
          </div>
        </div>
-        
+
        <div className="flex-1 p-4 overflow-y-auto">
          <AnimatePresence mode="wait">
            <motion.div
@ -178,7 +178,7 @@ const ScheduleManagement = ({ handleUpdatePlanning, classes }) => {
      </DndProvider>
    </div>
  );
-  
+
 };

 export default ScheduleManagement;
--- a/Front-End/src/components/Structure/Planning/SpecialityEventModal.js
+++ b/Front-End/src/components/Structure/Planning/SpecialityEventModal.js
@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import SelectChoice from '@/components/SelectChoice';
 import { useClasses } from '@/context/ClassesContext';
 import { useClasseForm } from '@/context/ClasseFormContext';
-import { BK_GESTIONENSEIGNANTS_PLANNING_URL } from '@/utils/Url';
+import { BE_SCHOOL_PLANNING_URL } from '@/utils/Url';
 import { BookOpen, Users } from 'lucide-react';

 const SpecialityEventModal = ({ isOpen, onClose, selectedCell, existingEvent, handleUpdatePlanning, classe }) => {
@ -56,17 +56,17 @@ const SpecialityEventModal = ({ isOpen, onClose, selectedCell, existingEvent, ha

  const handleSubmit = (e) => {
    e.preventDefault();
-  
+
    if (!eventData.specialiteId) {
      alert('Veuillez sélectionner une spécialité');
      return;
    }
-  
+
    if (!eventData.teacherId) {
      alert('Veuillez sélectionner un enseignant');
      return;
    }
-  
+
    // Transformer eventData pour correspondre au format du planning
    const selectedTeacherData = formData.enseignants.find(teacher => teacher.id === parseInt(eventData.teacherId, 10));
    const newCourse = {
@ -114,14 +114,14 @@ const SpecialityEventModal = ({ isOpen, onClose, selectedCell, existingEvent, ha
    const planningId = updatedPlanning ? updatedPlanning.planning.id : null;
    console.log("id : ", planningId)
    if (planningId) {
-      handleUpdatePlanning(BK_GESTIONENSEIGNANTS_PLANNING_URL, planningId, updatedPlanning.emploiDuTemps);
+      handleUpdatePlanning(BE_SCHOOL_PLANNING_URL, planningId, updatedPlanning.emploiDuTemps);
    }

    onClose();
  };

-  const filteredTeachers = selectedSpeciality 
-    ? formData.enseignants.filter(teacher => 
+  const filteredTeachers = selectedSpeciality
+    ? formData.enseignants.filter(teacher =>
        teacher.specialites_ids.includes(parseInt(selectedSpeciality, 10))
      )
    : formData.enseignants;