{/* Graphique des inscriptions */}
-
diff --git a/Front-End/src/app/[locale]/admin/structure/page.js b/Front-End/src/app/[locale]/admin/structure/page.js
index 4943f6b..f095821 100644
--- a/Front-End/src/app/[locale]/admin/structure/page.js
+++ b/Front-End/src/app/[locale]/admin/structure/page.js
@@ -1,4 +1,4 @@
-'use client'
+'use client';
import React, { useState, useEffect } from 'react';
import StructureManagement from '@/components/Structure/Configuration/StructureManagement';
import ScheduleManagement from '@/components/Structure/Planning/ScheduleManagement';
@@ -6,26 +6,27 @@ import FeesManagement from '@/components/Structure/Tarification/FeesManagement';
import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import { useCsrfToken } from '@/context/CsrfContext';
import { ClassesProvider } from '@/context/ClassesContext';
-import {
- createDatas,
- updateDatas,
- removeDatas,
- fetchSpecialities,
- fetchTeachers,
- fetchClasses,
- fetchSchedules,
- fetchRegistrationDiscounts,
- fetchTuitionDiscounts,
- fetchRegistrationFees,
- fetchTuitionFees,
- fetchRegistrationPaymentPlans,
- fetchTuitionPaymentPlans,
- fetchRegistrationPaymentModes,
- fetchTuitionPaymentModes } from '@/app/actions/schoolAction';
+import {
+ createDatas,
+ updateDatas,
+ removeDatas,
+ fetchSpecialities,
+ fetchTeachers,
+ fetchClasses,
+ fetchSchedules,
+ fetchRegistrationDiscounts,
+ fetchTuitionDiscounts,
+ fetchRegistrationFees,
+ fetchTuitionFees,
+ fetchRegistrationPaymentPlans,
+ fetchTuitionPaymentPlans,
+ fetchRegistrationPaymentModes,
+ fetchTuitionPaymentModes,
+} from '@/app/actions/schoolAction';
import { fetchProfileRoles, fetchProfiles } from '@/app/actions/authAction';
import SidebarTabs from '@/components/SidebarTabs';
import FilesGroupsManagement from '@/components/Structure/Files/FilesGroupsManagement';
-import { fetchRegistrationTemplateMaster } from "@/app/actions/registerFileGroupAction";
+import { fetchRegistrationTemplateMaster } from '@/app/actions/registerFileGroupAction';
import logger from '@/utils/logger';
import { useEstablishment } from '@/context/EstablishmentContext';
@@ -76,10 +77,10 @@ export default function Page() {
// Fetch data for registration file templates
fetchRegistrationTemplateMaster()
- .then((data)=> {
- setFichiers(data)
+ .then((data) => {
+ setFichiers(data);
})
- .catch(error => logger.error('Error fetching files:', error));
+ .catch((error) => logger.error('Error fetching files:', error));
// Fetch data for registration payment plans
handleRegistrationPaymentPlans();
@@ -94,145 +95,161 @@ export default function Page() {
handleTuitionPaymentModes();
fetchProfiles()
- .then(data => {
- setProfiles(data);
- })
- .catch(error => {
- logger.error('Error fetching profileRoles:', error);
- })
+ .then((data) => {
+ setProfiles(data);
+ })
+ .catch((error) => {
+ logger.error('Error fetching profileRoles:', error);
+ });
}
}, [selectedEstablishmentId]);
const handleSpecialities = () => {
fetchSpecialities(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setSpecialities(data);
})
- .catch(error => logger.error('Error fetching specialities:', error));
+ .catch((error) => logger.error('Error fetching specialities:', error));
};
const handleTeachers = () => {
fetchTeachers(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setTeachers(data);
})
- .catch(error => logger.error('Error fetching teachers:', error));
+ .catch((error) => logger.error('Error fetching teachers:', error));
};
const handleClasses = () => {
fetchClasses(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setClasses(data);
})
- .catch(error => logger.error('Error fetching classes:', error));
+ .catch((error) => logger.error('Error fetching classes:', error));
};
const handleSchedules = () => {
fetchSchedules()
- .then(data => {
+ .then((data) => {
setSchedules(data);
})
- .catch(error => logger.error('Error fetching schedules:', error));
+ .catch((error) => logger.error('Error fetching schedules:', error));
};
const handleRegistrationDiscounts = () => {
fetchRegistrationDiscounts(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setRegistrationDiscounts(data);
})
- .catch(error => logger.error('Error fetching registration discounts:', error));
+ .catch((error) =>
+ logger.error('Error fetching registration discounts:', error)
+ );
};
const handleTuitionDiscounts = () => {
fetchTuitionDiscounts(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setTuitionDiscounts(data);
})
- .catch(error => logger.error('Error fetching tuition discounts:', error));
+ .catch((error) =>
+ logger.error('Error fetching tuition discounts:', error)
+ );
};
const handleRegistrationFees = () => {
fetchRegistrationFees(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setRegistrationFees(data);
})
- .catch(error => logger.error('Error fetching registration fees:', error));
+ .catch((error) =>
+ logger.error('Error fetching registration fees:', error)
+ );
};
const handleTuitionFees = () => {
fetchTuitionFees(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setTuitionFees(data);
})
- .catch(error => logger.error('Error fetching tuition fees', error));
+ .catch((error) => logger.error('Error fetching tuition fees', error));
};
const handleRegistrationPaymentPlans = () => {
fetchRegistrationPaymentPlans(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setRegistrationPaymentPlans(data);
})
- .catch(error => logger.error('Error fetching registration payment plans:', error));
+ .catch((error) =>
+ logger.error('Error fetching registration payment plans:', error)
+ );
};
const handleTuitionPaymentPlans = () => {
fetchTuitionPaymentPlans(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setTuitionPaymentPlans(data);
})
- .catch(error => logger.error('Error fetching tuition payment plans:', error));
+ .catch((error) =>
+ logger.error('Error fetching tuition payment plans:', error)
+ );
};
const handleRegistrationPaymentModes = () => {
fetchRegistrationPaymentModes(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setRegistrationPaymentModes(data);
})
- .catch(error => logger.error('Error fetching registration payment modes:', error));
+ .catch((error) =>
+ logger.error('Error fetching registration payment modes:', error)
+ );
};
const handleTuitionPaymentModes = () => {
fetchTuitionPaymentModes(selectedEstablishmentId)
- .then(data => {
+ .then((data) => {
setTuitionPaymentModes(data);
})
- .catch(error => logger.error('Error fetching tuition payment modes:', error));
+ .catch((error) =>
+ logger.error('Error fetching tuition payment modes:', error)
+ );
};
const handleCreate = (url, newData, setDatas) => {
return createDatas(url, newData, csrfToken)
- .then(data => {
- setDatas(prevState => [...prevState, data]);
- return data;
- })
- .catch(error => {
- logger.error('Error creating data:', error);
- throw error;
- });
+ .then((data) => {
+ setDatas((prevState) => [...prevState, data]);
+ return data;
+ })
+ .catch((error) => {
+ logger.error('Error creating data:', error);
+ throw error;
+ });
};
const handleEdit = (url, id, updatedData, setDatas) => {
return updateDatas(url, id, updatedData, csrfToken)
- .then(data => {
- setDatas(prevState => prevState.map(item => item.id === id ? data : item));
- return data;
- })
- .catch(error => {
- logger.error('Error editing data:', error);
- throw error;
- });
+ .then((data) => {
+ setDatas((prevState) =>
+ prevState.map((item) => (item.id === id ? data : item))
+ );
+ return data;
+ })
+ .catch((error) => {
+ logger.error('Error editing data:', error);
+ throw error;
+ });
};
const handleDelete = (url, id, setDatas) => {
return removeDatas(url, id, csrfToken)
- .then(data => {
- setDatas(prevState => prevState.filter(item => item.id !== id));
- return data;
- })
- .catch(error => {
- logger.error('Error deleting data:', error);
- throw error;
- });
+ .then((data) => {
+ setDatas((prevState) => prevState.filter((item) => item.id !== id));
+ return data;
+ })
+ .catch((error) => {
+ logger.error('Error deleting data:', error);
+ throw error;
+ });
};
const handleUpdatePlanning = (url, planningId, updatedData) => {
@@ -240,19 +257,19 @@ export default function Page() {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
+ 'X-CSRFToken': csrfToken,
},
body: JSON.stringify(updatedData),
- credentials: 'include'
+ credentials: 'include',
})
- .then(response => response.json())
- .then(data => {
- logger.debug('Planning mis à jour avec succès :', data);
- //setDatas(data);
- })
- .catch(error => {
- logger.error('Erreur :', error);
- });
+ .then((response) => response.json())
+ .then((data) => {
+ logger.debug('Planning mis à jour avec succès :', data);
+ //setDatas(data);
+ })
+ .catch((error) => {
+ logger.error('Erreur :', error);
+ });
};
const tabs = [
@@ -272,7 +289,7 @@ export default function Page() {
handleEdit={handleEdit}
handleDelete={handleDelete}
/>
- )
+ ),
},
{
id: 'Schedule',
@@ -284,7 +301,7 @@ export default function Page() {
classes={classes}
/>
- )
+ ),
},
{
id: 'Fees',
@@ -311,23 +328,27 @@ export default function Page() {
handleEdit={handleEdit}
handleDelete={handleDelete}
/>
- )
+ ),
},
{
id: 'Files',
- label: 'Documents d\'inscription',
- content:
{t('inscriptionTrends')}
++ {t('inscriptionTrends')} +
{/* Insérer ici un composant de graphique */}
{classes.map((classe) => (
-
);
-}
\ No newline at end of file
+}
diff --git a/Front-End/src/app/[locale]/admin/planning/page.js b/Front-End/src/app/[locale]/admin/planning/page.js
index a09e2a8..8085ffd 100644
--- a/Front-End/src/app/[locale]/admin/planning/page.js
+++ b/Front-End/src/app/[locale]/admin/planning/page.js
@@ -1,4 +1,4 @@
-'use client'
+'use client';
import { PlanningProvider } from '@/context/PlanningContext';
import Calendar from '@/components/Calendar';
import EventModal from '@/components/EventModal';
@@ -19,7 +19,7 @@ export default function Page() {
recurrenceEnd: '',
customInterval: 1,
customUnit: 'days',
- viewType: 'week' // Ajouter la vue semaine par défaut
+ viewType: 'week', // Ajouter la vue semaine par défaut
});
const initializeNewEvent = (date = new Date()) => {
@@ -37,7 +37,7 @@ export default function Page() {
selectedDays: [],
recurrenceEnd: '',
customInterval: 1,
- customUnit: 'days'
+ customUnit: 'days',
});
setIsModalOpen(true);
};
@@ -62,4 +62,4 @@ export default function Page() {
-
+
))}
+
- updateStatusAction(row.student.id, newStatus)} showDropdown={false} />
-
- )
- },
- { name: t('files'), transform: (row) =>
- (row.registration_file != null) &&(
-
- ) },
- { name: 'Actions',
- transform: (row) => (
-
- {getActionsByStatus(row).map((action, index) => (
-
- ))}
-
- ),
- },
-
-];
-
-const columnsSubscribed = [
- { name: t('studentName'), transform: (row) => row.student.last_name },
- { name: t('studentFistName'), transform: (row) => row.student.first_name },
- { name: t('lastUpdateDate'), transform: (row) => row.updated_date_formated},
- { name: t('class'), transform: (row) => row.student.first_name},
- { name: t('registrationFileStatus'), transform: (row) =>
- (
-
- updateStatusAction(row.student.id, newStatus)} showDropdown={false} />
-
- )
- },
- { name: t('files'), transform: (row) =>
- (row.registration_file != null) &&(
-
- ) },
- { name: 'Actions', transform: (row) => (
-
+
+ updateStatusAction(row.student.id, newStatus)
+ }
+ showDropdown={false}
+ />
+
+ ),
+ },
+ {
+ name: t('files'),
+ transform: (row) =>
+ row.registration_file != null && (
+
+ ),
+ },
+ {
+ name: 'Actions',
+ transform: (row) => (
+
+ {getActionsByStatus(row).map((action, index) => (
+
+ ))}
+
+ ),
+ },
+ ];
+ const columnsSubscribed = [
+ { name: t('studentName'), transform: (row) => row.student.last_name },
+ { name: t('studentFistName'), transform: (row) => row.student.first_name },
+ {
+ name: t('lastUpdateDate'),
+ transform: (row) => row.updated_date_formated,
+ },
+ { name: t('class'), transform: (row) => row.student.first_name },
+ {
+ name: t('registrationFileStatus'),
+ transform: (row) => (
+
+
+ updateStatusAction(row.student.id, newStatus)
+ }
+ showDropdown={false}
+ />
+
+ ),
+ },
+ {
+ name: t('files'),
+ transform: (row) =>
+ row.registration_file != null && (
+
+ ),
+ },
+ {
+ name: 'Actions',
+ transform: (row) => (
+
+
+
{t('pending')}
- ({totalPending})
+
+ ({totalPending})
+
- )}
+ }
active={activeTab === 'pending'}
onClick={() => setActiveTab('pending')}
/>
{t('subscribed')}
- ({totalSubscribed})
+
+ ({totalSubscribed})
+
- )}
+ }
active={activeTab === 'subscribed'}
onClick={() => setActiveTab('subscribed')}
/>
{t('archived')}
- ({totalArchives})
+
+ ({totalArchives})
+
- )}
+ }
active={activeTab === 'archived'}
onClick={() => setActiveTab('archived')}
/>
(
- fee.is_active)}
- tuitionFees={tuitionFees.filter(fee => fee.is_active)}
- groups={groups}
- profiles={profiles}
- onSubmit={createRF}
- />
- )}
- />
+ isOpen={isOpen}
+ setIsOpen={setIsOpen}
+ title={"Nouveau dossier d'inscription"}
+ ContentComponent={() => (
+ fee.is_active
+ )}
+ tuitionFees={tuitionFees.filter((fee) => fee.is_active)}
+ groups={groups}
+ profiles={profiles}
+ onSubmit={createRF}
+ />
+ )}
+ />
)}
{isOpenAffectationClasse && (
(
- (
+
);
}
}
-}
\ No newline at end of file
+}
diff --git a/Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js b/Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js
index fe5c8e1..63cf2f8 100644
--- a/Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js
+++ b/Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js
@@ -1,11 +1,11 @@
-'use client'
+'use client';
import React from 'react';
import { useSearchParams, useRouter } from 'next/navigation';
import ValidateSubscription from '@/components/Inscription/ValidateSubscription';
-import { sendSEPARegisterForm } from "@/app/actions/subscriptionAction"
+import { sendSEPARegisterForm } from '@/app/actions/subscriptionAction';
import { useCsrfToken } from '@/context/CsrfContext';
import logger from '@/utils/logger';
-import { FE_ADMIN_SUBSCRIPTIONS_URL} from '@/utils/Url';
+import { FE_ADMIN_SUBSCRIPTIONS_URL } from '@/utils/Url';
export default function Page() {
const searchParams = useSearchParams();
@@ -23,11 +23,11 @@ export default function Page() {
const handleAcceptRF = (data) => {
logger.debug('Mise à jour du RF avec les données:', data);
- const {status, sepa_file} = data
+ const { status, sepa_file } = data;
const formData = new FormData();
formData.append('status', status); // Ajoute le statut
formData.append('sepa_file', sepa_file); // Ajoute le fichier SEPA
-
+
// Appeler l'API pour mettre à jour le RF
sendSEPARegisterForm(studentId, formData, csrfToken)
.then((response) => {
@@ -39,7 +39,7 @@ export default function Page() {
logger.error('Erreur lors de la mise à jour du RF:', error);
});
};
-
+
return (
+ content:
, + }, + { + label: 'Settings', + icon: Settings, + onClick: () => { + router.push(FE_PARENTS_SETTINGS_URL); + }, }, - { label: 'Settings', icon: Settings , onClick: () => { router.push(FE_PARENTS_SETTINGS_URL); } }, { type: 'item', label: 'Déconnexion', @@ -63,68 +71,72 @@ const dropdownItems = [ }, ]; return ( -
+
- {/*SI STATE == pending || subscribe || archived */}
- {activeTab === 'pending' || activeTab === 'subscribed' || activeTab === 'archived' ? (
-
-
+
+
) : null}
-
+ {/*SI STATE == pending || subscribe || archived */}
+ {activeTab === 'pending' ||
+ activeTab === 'subscribed' ||
+ activeTab === 'archived' ? (
+
-
-
-
+
-
+
+
+
-
-
-
+
+
+ {user?.email || 'Utilisateur'}
- {getRightStr(profileRole) || ''}
+
+ {getRightStr(profileRole) || ''}
+
+ content:
, + }, + { + label: 'Settings', + icon: Settings, + onClick: () => { + router.push(FE_PARENTS_SETTINGS_URL); + }, }, - { label: 'Settings', icon: Settings , onClick: () => { router.push(FE_PARENTS_SETTINGS_URL); } }, { type: 'item', label: 'Déconnexion', @@ -63,68 +71,72 @@ const dropdownItems = [ }, ]; return ( -
{/* Entête */}
-
-
-
- Accueil
+
+ setIsPopupVisible(false)}
- />
-
+ visible={isPopupVisible}
+ message="Êtes-vous sûr(e) de vouloir vous déconnecter ?"
+ onConfirm={confirmDisconnect}
+ onCancel={() => setIsPopupVisible(false)}
+ />
+
);
}
-
-
diff --git a/Front-End/src/app/[locale]/parents/messagerie/page.js b/Front-End/src/app/[locale]/parents/messagerie/page.js
index 1d40809..1cd7627 100644
--- a/Front-End/src/app/[locale]/parents/messagerie/page.js
+++ b/Front-End/src/app/[locale]/parents/messagerie/page.js
@@ -1,13 +1,25 @@
-'use client'
+'use client';
import React, { useState, useRef, useEffect } from 'react';
import { SendHorizontal } from 'lucide-react';
import Image from 'next/image';
import { getGravatarUrl } from '@/utils/gravatar';
const contacts = [
- { id: 1, name: 'Facturation', profilePic: getGravatarUrl('facturation@n3wtschool.com') },
- { id: 2, name: 'Enseignant 1', profilePic: getGravatarUrl('enseignant@n3wtschool.com') },
- { id: 3, name: 'Contact', profilePic: getGravatarUrl('contact@n3wtschool.com') },
+ {
+ id: 1,
+ name: 'Facturation',
+ profilePic: getGravatarUrl('facturation@n3wtschool.com'),
+ },
+ {
+ id: 2,
+ name: 'Enseignant 1',
+ profilePic: getGravatarUrl('enseignant@n3wtschool.com'),
+ },
+ {
+ id: 3,
+ name: 'Contact',
+ profilePic: getGravatarUrl('contact@n3wtschool.com'),
+ },
];
export default function MessageriePage() {
@@ -29,7 +41,14 @@ export default function MessageriePage() {
const contactMessages = messages[selectedContact.id] || [];
setMessages({
...messages,
- [selectedContact.id]: [...contactMessages, { id: contactMessages.length + 1, text: newMessage, date: new Date() }],
+ [selectedContact.id]: [
+ ...contactMessages,
+ {
+ id: contactMessages.length + 1,
+ text: newMessage,
+ date: new Date(),
+ },
+ ],
});
setNewMessage('');
simulateContactResponse(selectedContact.id);
@@ -48,14 +67,24 @@ export default function MessageriePage() {
const contactMessages = prevMessages[contactId] || [];
return {
...prevMessages,
- [contactId]: [...contactMessages, { id: contactMessages.length + 2, text: 'Réponse automatique', isResponse: true, date: new Date() }],
+ [contactId]: [
+ ...contactMessages,
+ {
+ id: contactMessages.length + 2,
+ text: 'Réponse automatique',
+ isResponse: true,
+ date: new Date(),
+ },
+ ],
};
});
}, 2000);
};
return (
-
+
-
-
+
+ Accueil
+
+
-
{/* Content */}
-
+
+
+
- {messages.length > 0 && (
-
- )}
-
-
- {/* Ajout de flex-1 pour utiliser toute la hauteur disponible */}
+
+ {' '}
+ {/* Ajout de flex-1 pour utiliser toute la hauteur disponible */}
{children}
{/* Footer responsive */}
{/* Utilisation de calc pour soustraire la hauteur de l'entête */}
+
+ {' '}
+ {/* Utilisation de calc pour soustraire la hauteur de l'entête */}
{contacts.map((contact) => (
setSelectedContact(contact)}
>
-
+
))}
- {selectedContact && (messages[selectedContact.id] || []).map((message) => (
-
diff --git a/Front-End/src/app/[locale]/users/login/error.js b/Front-End/src/app/[locale]/users/login/error.js
index 5f75634..b08f8aa 100644
--- a/Front-End/src/app/[locale]/users/login/error.js
+++ b/Front-End/src/app/[locale]/users/login/error.js
@@ -1,7 +1,5 @@
-"use client";
+'use client';
-function ErrorBoundary({
- error
-}) {
+function ErrorBoundary({ error }) {
return <>{error.message};
-}
\ No newline at end of file
+}
diff --git a/Front-End/src/app/[locale]/users/login/page.js b/Front-End/src/app/[locale]/users/login/page.js
index 2a68cce..2e6be43 100644
--- a/Front-End/src/app/[locale]/users/login/page.js
+++ b/Front-End/src/app/[locale]/users/login/page.js
@@ -1,116 +1,159 @@
-'use client'
-import React, { useState } from 'react'
-import DjangoCSRFToken from '@/components/DjangoCSRFToken'
+'use client';
+import React, { useState } from 'react';
+import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo';
-import { useSearchParams, useRouter } from 'next/navigation'
+import { useSearchParams, useRouter } from 'next/navigation';
import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; // Importez le composant Loader
import Button from '@/components/Button'; // Importez le composant Button
import { User, KeySquare } from 'lucide-react'; // Importez directement les icônes nécessaires
-import {
- FE_USERS_NEW_PASSWORD_URL,
- getRedirectUrlFromRole
-} from '@/utils/Url';
+import { FE_USERS_NEW_PASSWORD_URL, getRedirectUrlFromRole } from '@/utils/Url';
import { login } from '@/app/actions/authAction';
import { getSession } from 'next-auth/react';
import { useCsrfToken } from '@/context/CsrfContext'; // Importez le hook useCsrfToken
import logger from '@/utils/logger';
-
import { useEstablishment } from '@/context/EstablishmentContext';
-
-
export default function Page() {
- const searchParams = useSearchParams();
- const [errorMessage, setErrorMessage] = useState("");
- const [userFieldError, setUserFieldError] = useState("")
- const [passwordFieldError, setPasswordFieldError] = useState("")
- const { setUser } = useEstablishment();
- const [isLoading, setIsLoading] = useState(false);
+ const searchParams = useSearchParams();
+ const [errorMessage, setErrorMessage] = useState('');
+ const [userFieldError, setUserFieldError] = useState('');
+ const [passwordFieldError, setPasswordFieldError] = useState('');
+ const { setUser } = useEstablishment();
+ const [isLoading, setIsLoading] = useState(false);
- const router = useRouter();
- const csrfToken = useCsrfToken(); // Utilisez le hook useCsrfToken
+ const router = useRouter();
+ const csrfToken = useCsrfToken(); // Utilisez le hook useCsrfToken
- function isOK(data) {
- return data.errorMessage === ""
- }
+ function isOK(data) {
+ return data.errorMessage === '';
+ }
+ function handleFormLogin(formData) {
+ setIsLoading(true);
+ setErrorMessage('');
+ login({
+ email: formData.get('login'),
+ password: formData.get('password'),
+ })
+ .then((result) => {
+ logger.debug('Sign In Result', result);
- function handleFormLogin(formData) {
- setIsLoading(true);
- setErrorMessage("");
-
- login({
- email: formData.get('login'),
- password: formData.get('password')
- }).then(result => {
- logger.debug('Sign In Result', result);
-
- if (result.error) {
- setErrorMessage(result.error);
+ if (result.error) {
+ setErrorMessage(result.error);
+ setIsLoading(false);
+ } else {
+ getSession()
+ .then((session) => {
+ if (!session || !session.user) {
+ throw new Error('Session not found');
+ }
+ const user = session.user;
+ logger.debug('User Session:', user);
+ setUser(session.user);
+ if (session.user.roles && session.user.roles.length > 0) {
+ let roleIndex = 0;
+ if (
+ session.user.roles.length > session.user.roleIndexLoginDefault
+ ) {
+ roleIndex = session.user.roleIndexLoginDefault;
+ }
+ const role = session.user.roles[roleIndex].role_type;
+ const url = getRedirectUrlFromRole(role);
+ if (url) {
+ router.push(url);
+ } else {
+ setIsLoading(false);
+ setErrorMessage('Type de rôle non géré');
+ }
+ } else {
setIsLoading(false);
- } else {
- getSession().then(session => {
- if (!session || !session.user) {
- throw new Error('Session not found');
- }
- const user = session.user;
- logger.debug('User Session:', user);
- setUser(session.user);
- if (session.user.roles && session.user.roles.length > 0) {
- let roleIndex = 0;
- if( session.user.roles.length > session.user.roleIndexLoginDefault){
- roleIndex = session.user.roleIndexLoginDefault;
- }
- const role = session.user.roles[roleIndex].role_type;
- const url = getRedirectUrlFromRole(role);
- if (url) {
- router.push(url);
- } else {
- setIsLoading(false);
- setErrorMessage('Type de rôle non géré');
- }
- } else {
- setIsLoading(false);
- setErrorMessage('Aucun rôle trouvé pour le profil sélectionné.');
- }
- }).catch(error => {
- logger.error('Erreur lors de la récupération de la session:', error);
- setIsLoading(false);
- setErrorMessage('Une erreur est survenue lors de la récupération de la session.');
- });
- }
- }).catch(error => {
- logger.error('Erreur lors de la connexion:', error);
- setIsLoading(false);
- setErrorMessage('Une erreur est survenue lors de la connexion.');
- });
- }
+ setErrorMessage(
+ 'Aucun rôle trouvé pour le profil sélectionné.'
+ );
+ }
+ })
+ .catch((error) => {
+ logger.error(
+ 'Erreur lors de la récupération de la session:',
+ error
+ );
+ setIsLoading(false);
+ setErrorMessage(
+ 'Une erreur est survenue lors de la récupération de la session.'
+ );
+ });
+ }
+ })
+ .catch((error) => {
+ logger.error('Erreur lors de la connexion:', error);
+ setIsLoading(false);
+ setErrorMessage('Une erreur est survenue lors de la connexion.');
+ });
+ }
- if (isLoading === true) {
- return
-
- 
- {selectedContact.name}
- {new Date(message.date).toLocaleTimeString()}
+ {selectedContact &&
+ (messages[selectedContact.id] || []).map((message) => (
+
- ))}
+ ))}
+
- {message.text}
-
+
+
+ {selectedContact.name}
+
+
+ {new Date(message.date).toLocaleTimeString()}
+
+
+ {message.text}
diff --git a/Front-End/src/app/[locale]/parents/page.js b/Front-End/src/app/[locale]/parents/page.js
index d82d520..b31b80a 100644
--- a/Front-End/src/app/[locale]/parents/page.js
+++ b/Front-End/src/app/[locale]/parents/page.js
@@ -1,4 +1,4 @@
-'use client'
+'use client';
import React, { useEffect, useState } from 'react';
import { useRouter } from 'next/navigation';
import Table from '@/components/Table';
@@ -14,35 +14,42 @@ export default function ParentHomePage() {
const [children, setChildren] = useState([]);
const [userId, setUserId] = useState(null);
const [currentPage, setCurrentPage] = useState(1);
- const { user, setProfileRole, selectedEstablishmentId, setSelectedEstablishmentId, establishments } = useEstablishment();
+ const {
+ user,
+ setProfileRole,
+ selectedEstablishmentId,
+ setSelectedEstablishmentId,
+ establishments,
+ } = useEstablishment();
const router = useRouter();
useEffect(() => {
- const userIdFromSession = user.user_id;
- setUserId(userIdFromSession);
- console.log(selectedEstablishmentId)
- fetchChildren(userIdFromSession, selectedEstablishmentId).then(data => {
- setChildren(data);
- });
-
- }, [ selectedEstablishmentId]);
+ const userIdFromSession = user.user_id;
+ setUserId(userIdFromSession);
+ console.log(selectedEstablishmentId);
+ fetchChildren(userIdFromSession, selectedEstablishmentId).then((data) => {
+ setChildren(data);
+ });
+ }, [selectedEstablishmentId]);
const handleEstablishmentChange = (e) => {
const establishmentId = parseInt(e.target.value, 10);
setSelectedEstablishmentId(establishmentId);
- const role = establishments.find(est => est.id === establishmentId)?.role_type;
+ const role = establishments.find(
+ (est) => est.id === establishmentId
+ )?.role_type;
setProfileRole(role);
};
function handleEdit(eleveId) {
// Logique pour éditer le dossier de l'élève
logger.debug(`Edit dossier for student id: ${eleveId}`);
- router.push(`${FE_PARENTS_EDIT_INSCRIPTION_URL}?id=${userId}&studentId=${eleveId}`);
+ router.push(
+ `${FE_PARENTS_EDIT_INSCRIPTION_URL}?id=${userId}&studentId=${eleveId}`
+ );
}
- const actionColumns = [
- { name: 'Action', transform: (row) => row.action },
- ];
+ const actionColumns = [{ name: 'Action', transform: (row) => row.action }];
// Définir les colonnes du tableau
const childrenColumns = [
@@ -52,9 +59,9 @@ export default function ParentHomePage() {
name: 'Statut',
transform: (row) => (
- )
- }
+ ),
+ },
];
const itemsPerPage = 5;
diff --git a/Front-End/src/app/[locale]/parents/settings/page.js b/Front-End/src/app/[locale]/parents/settings/page.js
index 9694e0e..a6211e4 100644
--- a/Front-End/src/app/[locale]/parents/settings/page.js
+++ b/Front-End/src/app/[locale]/parents/settings/page.js
@@ -1,4 +1,4 @@
-'use client'
+'use client';
import React, { useState } from 'react';
import Button from '@/components/Button';
import InputText from '@/components/InputText';
@@ -61,13 +61,7 @@ export default function SettingsPage() {
required
/>
-
- )
+ ),
},
{
name: 'Actions',
@@ -71,8 +78,8 @@ export default function ParentHomePage() {
-
-
-
+
- setPopupVisible(false)}
- />
-
+ const data = { email: formData.get('email') };
+ sendNewPassword(data, csrfToken)
+ .then((data) => {
+ logger.debug('Success:', data);
+ setUserFieldError('');
+ setErrorMessage('');
+ if (data.errorMessage === '') {
+ setPopupMessage(data.message);
+ setPopupConfirmAction(() => () => setPopupVisible(false));
+ setPopupVisible(true);
+ } else {
+ if (data.errorFields) {
+ setUserFieldError(data.errorFields.email);
+ }
+ if (data.errorMessage) {
+ setErrorMessage(data.errorMessage);
+ }
+ }
+ })
+ .catch((error) => {
+ logger.error('Error fetching data:', error);
+ error = error.errorMessage;
+ logger.debug(error);
+ });
}
-}
\ No newline at end of file
+ }
+
+ if (isLoading === true) {
+ return setPopupVisible(false)}
+ />
+
+ );
+ }
+}
diff --git a/Front-End/src/app/[locale]/users/password/reset/page.js b/Front-End/src/app/[locale]/users/password/reset/page.js
index 6ac49f1..ae0f355 100644
--- a/Front-End/src/app/[locale]/users/password/reset/page.js
+++ b/Front-End/src/app/[locale]/users/password/reset/page.js
@@ -1,10 +1,10 @@
-'use client'
+'use client';
// src/app/pages/subscribe.js
import React, { useState, useEffect } from 'react';
-import DjangoCSRFToken from '@/components/DjangoCSRFToken'
+import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo';
-import { useSearchParams, useRouter } from 'next/navigation'
+import { useSearchParams, useRouter } from 'next/navigation';
import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; // Importez le composant Loader
import Button from '@/components/Button'; // Importez le composant Button
@@ -18,113 +18,149 @@ import logger from '@/utils/logger';
const useFakeData = process.env.NEXT_PUBLIC_USE_FAKE_DATA === 'true';
export default function Page() {
- const searchParams = useSearchParams();
- const uuid = searchParams.get('uuid');
- const [errorMessage, setErrorMessage] = useState("");
- const [password1FieldError,setPassword1FieldError] = useState("")
- const [password2FieldError,setPassword2FieldError] = useState("")
- const [isLoading, setIsLoading] = useState(false);
- const [popupVisible, setPopupVisible] = useState(false);
- const [popupMessage, setPopupMessage] = useState("");
+ const searchParams = useSearchParams();
+ const uuid = searchParams.get('uuid');
+ const [errorMessage, setErrorMessage] = useState('');
+ const [password1FieldError, setPassword1FieldError] = useState('');
+ const [password2FieldError, setPassword2FieldError] = useState('');
+ const [isLoading, setIsLoading] = useState(false);
+ const [popupVisible, setPopupVisible] = useState(false);
+ const [popupMessage, setPopupMessage] = useState('');
- const router = useRouter();
- const csrfToken = useCsrfToken();
+ const router = useRouter();
+ const csrfToken = useCsrfToken();
- useEffect(() => {
- if (useFakeData) {
- setTimeout(() => {
- setIsLoading(false);
- }, 1000);
- } else {
- getResetPassword(uuid)
- .then(data => {
- logger.debug('Success:', data);
- setIsLoading(true);
- if(data.errorFields){
- setPassword1FieldError(data.errorFields.password1)
- setPassword2FieldError(data.errorFields.password2)
- }
- if(data.errorMessage){
- setErrorMessage(data.errorMessage)
- }
- setIsLoading(false);
- })
- .catch(error => {
- logger.error('Error fetching data:', error);
- });
- }
- }, []);
-
- function validate(formData) {
- if (useFakeData) {
- setTimeout(() => {
- setPopupMessage("Mot de passe réinitialisé avec succès");
- setPopupVisible(true);
- }, 1000);
- } else {
- const data = {
- password1: formData.get('password1'),
- password2: formData.get('password2'),
- }
- resetPassword(uuid,data,csrfToken)
- .then(data => {
- logger.debug('Success:', data);
- setPassword1FieldError("")
- setPassword2FieldError("")
- setErrorMessage("")
- if(data.errorMessage === ""){
- setPopupMessage(data.message);
- setPopupVisible(true);
- } else {
- if(data.errorMessage){
- setErrorMessage(data.errorMessage);
- }
- if(data.errorFields){
- setPassword1FieldError(data.errorFields.password1)
- setPassword2FieldError(data.errorFields.password2)
- }
- }
- })
- .catch(error => {
- logger.error('Error fetching data:', error);
- error = error.errorMessage;
- logger.debug(error);
- });
- }
- }
-
- if (isLoading === true) {
- return {
- setPopupVisible(false);
- router.push(`${FE_USERS_LOGIN_URL}`);
- }}
- onCancel={() => setPopupVisible(false)}
- />
- {
+ setPopupVisible(false);
+ router.push(`${FE_USERS_LOGIN_URL}`);
+ }}
+ onCancel={() => setPopupVisible(false)}
+ />
+ {
- setPopupVisible(false);
- router.push(`${FE_USERS_LOGIN_URL}`);
- }}
- onCancel={() => setPopupVisible(false)}
+ if (isLoading === true) {
+ return {
+ setPopupVisible(false);
+ router.push(`${FE_USERS_LOGIN_URL}`);
+ }}
+ onCancel={() => setPopupVisible(false)}
+ />
+
+ );
+ }
+}
diff --git a/Front-End/src/app/actions/authAction.js b/Front-End/src/app/actions/authAction.js
index 377917f..875f790 100644
--- a/Front-End/src/app/actions/authAction.js
+++ b/Front-End/src/app/actions/authAction.js
@@ -11,14 +11,13 @@ import {
} from '@/utils/Url';
import logger from '@/utils/logger';
-
const requestResponseHandler = async (response) => {
const body = await response.json();
if (response.ok) {
return body;
}
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
};
@@ -27,43 +26,39 @@ const requestResponseHandler = async (response) => {
* Login action
*/
export const login = (data) => {
- return signIn('credentials', {
- redirect: false,
- email: data.email,
- password: data.password,
- role_type: data.role_type,
- })
+ return signIn('credentials', {
+ redirect: false,
+ email: data.email,
+ password: data.password,
+ role_type: data.role_type,
+ });
};
/**
* Login user with API
*/
-export const getJWT = (data) =>{
- const request = new Request(
- `${BE_AUTH_LOGIN_URL}`, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify(data),
- credentials: 'include'
- }
- );
- return fetch(request).then(requestResponseHandler)
-}
-export const refreshJWT = (data) =>{
- const request = new Request(
- `${BE_AUTH_REFRESH_JWT_URL}`, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify(data),
- credentials: 'include'
- }
- );
- return fetch(request).then(requestResponseHandler)
-}
+export const getJWT = (data) => {
+ const request = new Request(`${BE_AUTH_LOGIN_URL}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(data),
+ credentials: 'include',
+ });
+ return fetch(request).then(requestResponseHandler);
+};
+export const refreshJWT = (data) => {
+ const request = new Request(`${BE_AUTH_REFRESH_JWT_URL}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify(data),
+ credentials: 'include',
+ });
+ return fetch(request).then(requestResponseHandler);
+};
/**
* Disconnects the user after confirming the action.
@@ -75,140 +70,116 @@ export const refreshJWT = (data) =>{
* @returns {void}
*/
export const disconnect = () => {
- signOut({ callbackUrl: FE_USERS_LOGIN_URL });
+ signOut({ callbackUrl: FE_USERS_LOGIN_URL });
};
export const fetchProfileRoles = (establishment) => {
- return fetch(`${BE_AUTH_PROFILES_ROLES_URL}?establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_AUTH_PROFILES_ROLES_URL}?establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const updateProfileRoles = (id, data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_PROFILES_ROLES_URL}/${id}`,
- {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_PROFILES_ROLES_URL}/${id}`, {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
export const deleteProfileRoles = (id, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_PROFILES_ROLES_URL}/${id}`,
- {
- method: 'DELETE',
- headers: {
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include'
- }
- );
+ const request = new Request(`${BE_AUTH_PROFILES_ROLES_URL}/${id}`, {
+ method: 'DELETE',
+ headers: {
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ });
return fetch(request).then(requestResponseHandler);
};
export const fetchProfiles = () => {
- return fetch(`${BE_AUTH_PROFILES_URL}`)
- .then(requestResponseHandler)
+ return fetch(`${BE_AUTH_PROFILES_URL}`).then(requestResponseHandler);
};
export const createProfile = (data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_PROFILES_URL}`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_PROFILES_URL}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
export const deleteProfile = (id, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_PROFILES_URL}/${id}`,
- {
- method: 'DELETE',
- headers: {
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include'
- }
- );
+ const request = new Request(`${BE_AUTH_PROFILES_URL}/${id}`, {
+ method: 'DELETE',
+ headers: {
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ });
return fetch(request).then(requestResponseHandler);
};
export const updateProfile = (id, data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_PROFILES_URL}/${id}`,
- {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_PROFILES_URL}/${id}`, {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
export const sendNewPassword = (data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_NEW_PASSWORD_URL}`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_NEW_PASSWORD_URL}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
export const subscribe = (data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_REGISTER_URL}`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_REGISTER_URL}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
export const resetPassword = (uuid, data, csrfToken) => {
- const request = new Request(
- `${BE_AUTH_RESET_PASSWORD_URL}/${uuid}`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include',
- body: JSON.stringify(data),
- }
- );
+ const request = new Request(`${BE_AUTH_RESET_PASSWORD_URL}/${uuid}`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ body: JSON.stringify(data),
+ });
return fetch(request).then(requestResponseHandler);
};
diff --git a/Front-End/src/app/actions/messagerieAction.js b/Front-End/src/app/actions/messagerieAction.js
index c62bdad..5b06962 100644
--- a/Front-End/src/app/actions/messagerieAction.js
+++ b/Front-End/src/app/actions/messagerieAction.js
@@ -1,24 +1,20 @@
-import {
-BE_GESTIONMESSAGERIE_MESSAGES_URL
-} from '@/utils/Url';
+import { BE_GESTIONMESSAGERIE_MESSAGES_URL } from '@/utils/Url';
const requestResponseHandler = async (response) => {
-
const body = await response.json();
if (response.ok) {
return body;
}
- // Throw an error with the JSON body containing the form errors
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ // Throw an error with the JSON body containing the form errors
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
-}
+};
-
-export const fetchMessages = (id) =>{
- return fetch(`${BE_GESTIONMESSAGERIE_MESSAGES_URL}/${id}`, {
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(requestResponseHandler)
-}
\ No newline at end of file
+export const fetchMessages = (id) => {
+ return fetch(`${BE_GESTIONMESSAGERIE_MESSAGES_URL}/${id}`, {
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(requestResponseHandler);
+};
diff --git a/Front-End/src/app/actions/planningAction.js b/Front-End/src/app/actions/planningAction.js
index cba39fe..a5a18f0 100644
--- a/Front-End/src/app/actions/planningAction.js
+++ b/Front-End/src/app/actions/planningAction.js
@@ -1,112 +1,96 @@
-import { BE_PLANNING_PLANNINGS_URL,
- BE_PLANNING_EVENTS_URL
-} from '@/utils/Url';
-
-
+import { BE_PLANNING_PLANNINGS_URL, BE_PLANNING_EVENTS_URL } from '@/utils/Url';
const requestResponseHandler = async (response) => {
const body = response.status !== 204 ? await response?.json() : {};
- console.log(response)
+ console.log(response);
if (response.ok) {
return body;
}
- // Throw an error with the JSON body containing the form errors
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ // Throw an error with the JSON body containing the form errors
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
-}
+};
-const getData = (url) => {
+const getData = (url) => {
return fetch(`${url}`).then(requestResponseHandler);
-}
+};
const createDatas = (url, newData, csrfToken) => {
return fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
+ 'X-CSRFToken': csrfToken,
},
body: JSON.stringify(newData),
- credentials: 'include'
- })
- .then(requestResponseHandler)
+ credentials: 'include',
+ }).then(requestResponseHandler);
};
const updateDatas = (url, updatedData, csrfToken) => {
- return fetch(`${url}`, {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- body: JSON.stringify(updatedData),
- credentials: 'include'
- })
- .then(requestResponseHandler)
- };
-
-const removeDatas = (url, csrfToken) => {
- return fetch(`${url}`, {
- method: 'DELETE',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include'
- })
- .then(requestResponseHandler)
+ return fetch(`${url}`, {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(updatedData),
+ credentials: 'include',
+ }).then(requestResponseHandler);
};
-
-
+const removeDatas = (url, csrfToken) => {
+ return fetch(`${url}`, {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ }).then(requestResponseHandler);
+};
export const fetchPlannings = () => {
- return getData(`${BE_PLANNING_PLANNINGS_URL}`)
+ return getData(`${BE_PLANNING_PLANNINGS_URL}`);
};
-
export const getPlanning = (id) => {
- return getData(`${BE_PLANNING_PLANNINGS_URL}/${id}`)
+ return getData(`${BE_PLANNING_PLANNINGS_URL}/${id}`);
};
export const createPlanning = (newData, csrfToken) => {
- return createDatas(`${BE_PLANNING_PLANNINGS_URL}`, newData, csrfToken)
-}
-
-export const updatePlanning = (id,newData, csrfToken) => {
- return updateDatas(`${BE_PLANNING_PLANNINGS_URL}/${id}`, newData, csrfToken)
-}
-
-export const deletePlanning = (id, csrfToken) => {
- return removeDatas(`${BE_PLANNING_PLANNINGS_URL}/${id}`, csrfToken)
-}
-
-
-export const fetchEvents = () => {
- return getData(`${BE_PLANNING_EVENTS_URL}`)
+ return createDatas(`${BE_PLANNING_PLANNINGS_URL}`, newData, csrfToken);
};
+export const updatePlanning = (id, newData, csrfToken) => {
+ return updateDatas(`${BE_PLANNING_PLANNINGS_URL}/${id}`, newData, csrfToken);
+};
+
+export const deletePlanning = (id, csrfToken) => {
+ return removeDatas(`${BE_PLANNING_PLANNINGS_URL}/${id}`, csrfToken);
+};
+
+export const fetchEvents = () => {
+ return getData(`${BE_PLANNING_EVENTS_URL}`);
+};
export const getEvent = (id) => {
- return getData(`${BE_PLANNING_EVENTS_URL}/${id}`)
+ return getData(`${BE_PLANNING_EVENTS_URL}/${id}`);
};
export const createEvent = (newData, csrfToken) => {
- return createDatas(`${BE_PLANNING_EVENTS_URL}`, newData, csrfToken)
-}
+ return createDatas(`${BE_PLANNING_EVENTS_URL}`, newData, csrfToken);
+};
-export const updateEvent = (id,newData, csrfToken) => {
- return updateDatas(`${BE_PLANNING_EVENTS_URL}/${id}`, newData, csrfToken)
-}
+export const updateEvent = (id, newData, csrfToken) => {
+ return updateDatas(`${BE_PLANNING_EVENTS_URL}/${id}`, newData, csrfToken);
+};
export const deleteEvent = (id, csrfToken) => {
- return removeDatas(`${BE_PLANNING_EVENTS_URL}/${id}`, csrfToken)
-}
+ return removeDatas(`${BE_PLANNING_EVENTS_URL}/${id}`, csrfToken);
+};
export const fetchUpcomingEvents = () => {
return getData(`${BE_PLANNING_EVENTS_URL}/upcoming`);
};
-
-
-
diff --git a/Front-End/src/app/actions/registerFileGroupAction.js b/Front-End/src/app/actions/registerFileGroupAction.js
index 604ca7b..ad1d077 100644
--- a/Front-End/src/app/actions/registerFileGroupAction.js
+++ b/Front-End/src/app/actions/registerFileGroupAction.js
@@ -1,30 +1,33 @@
-import { BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL,
- BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL,
- BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL,
- FE_API_DOCUSEAL_CLONE_URL,
- FE_API_DOCUSEAL_DOWNLOAD_URL,
- FE_API_DOCUSEAL_GENERATE_TOKEN
+import {
+ BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL,
+ BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL,
+ BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL,
+ FE_API_DOCUSEAL_CLONE_URL,
+ FE_API_DOCUSEAL_DOWNLOAD_URL,
+ FE_API_DOCUSEAL_GENERATE_TOKEN,
} from '@/utils/Url';
const requestResponseHandler = async (response) => {
-
const body = await response.json();
if (response.ok) {
return body;
}
- // Throw an error with the JSON body containing the form errors
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ // Throw an error with the JSON body containing the form errors
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
-}
+};
export async function fetchRegistrationFileGroups(establishment) {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}?establishment_id=${establishment}`, {
- credentials: 'include',
- headers: {
- 'Accept': 'application/json',
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}?establishment_id=${establishment}`,
+ {
+ credentials: 'include',
+ headers: {
+ Accept: 'application/json',
+ },
}
- });
+ );
if (!response.ok) {
throw new Error('Failed to fetch file groups');
}
@@ -32,15 +35,18 @@ export async function fetchRegistrationFileGroups(establishment) {
}
export async function createRegistrationFileGroup(groupData, csrfToken) {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}`, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken,
- },
- body: JSON.stringify(groupData),
- credentials: 'include'
- });
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}`,
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(groupData),
+ credentials: 'include',
+ }
+ );
if (!response.ok) {
throw new Error('Failed to create file group');
@@ -50,26 +56,36 @@ export async function createRegistrationFileGroup(groupData, csrfToken) {
}
export async function deleteRegistrationFileGroup(groupId, csrfToken) {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}`, {
- method: 'DELETE',
- headers: {
- 'X-CSRFToken': csrfToken,
- },
- credentials: 'include'
- });
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}`,
+ {
+ method: 'DELETE',
+ headers: {
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ }
+ );
return response;
}
-export const editRegistrationFileGroup = async (groupId, groupData, csrfToken) => {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}`, {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken,
- },
- body: JSON.stringify(groupData),
- });
+export const editRegistrationFileGroup = async (
+ groupId,
+ groupData,
+ csrfToken
+) => {
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}`,
+ {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(groupData),
+ }
+ );
if (!response.ok) {
throw new Error('Erreur lors de la modification du groupe');
@@ -79,33 +95,35 @@ export const editRegistrationFileGroup = async (groupId, groupData, csrfToken) =
};
export const fetchRegistrationFileFromGroup = async (groupId) => {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}/templates`, {
- credentials: 'include',
- headers: {
- 'Accept': 'application/json',
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL}/${groupId}/templates`,
+ {
+ credentials: 'include',
+ headers: {
+ Accept: 'application/json',
+ },
}
- });
+ );
if (!response.ok) {
- throw new Error('Erreur lors de la récupération des fichiers associés au groupe');
+ throw new Error(
+ 'Erreur lors de la récupération des fichiers associés au groupe'
+ );
}
return response.json();
-}
+};
-export const fetchRegistrationTemplates = (id = null) => {
- let url = `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL}`
+export const fetchRegistrationTemplates = (id = null) => {
+ let url = `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL}`;
if (id) {
url = `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL}/${id}`;
}
- const request = new Request(
- `${url}`,
- {
- method:'GET',
- headers: {
- 'Content-Type':'application/json'
- },
- }
- );
- return fetch(request).then(requestResponseHandler)
+ const request = new Request(`${url}`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+ return fetch(request).then(requestResponseHandler);
};
export const editRegistrationTemplates = (fileId, data, csrfToken) => {
@@ -116,12 +134,10 @@ export const editRegistrationTemplates = (fileId, data, csrfToken) => {
'X-CSRFToken': csrfToken,
},
credentials: 'include',
- })
- .then(requestResponseHandler)
-}
-
-export const createRegistrationTemplates = (data,csrfToken) => {
+ }).then(requestResponseHandler);
+};
+export const createRegistrationTemplates = (data, csrfToken) => {
return fetch(`${BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL}`, {
method: 'POST',
body: JSON.stringify(data),
@@ -130,73 +146,72 @@ export const createRegistrationTemplates = (data,csrfToken) => {
'Content-Type': 'application/json',
},
credentials: 'include',
- })
- .then(requestResponseHandler)
-}
+ }).then(requestResponseHandler);
+};
-export const deleteRegistrationTemplates = (fileId,csrfToken) => {
+export const deleteRegistrationTemplates = (fileId, csrfToken) => {
return fetch(`${BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL}/${fileId}`, {
method: 'DELETE',
headers: {
'X-CSRFToken': csrfToken,
},
credentials: 'include',
- })
-}
+ });
+};
export const fetchRegistrationTemplateMaster = (id = null) => {
let url = `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}`;
- if(id){
+ if (id) {
url = `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}/${id}`;
}
- const request = new Request(
- `${url}`,
- {
- method:'GET',
- headers: {
- 'Content-Type':'application/json'
- },
- }
- );
- return fetch(request).then(requestResponseHandler)
+ const request = new Request(`${url}`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+ return fetch(request).then(requestResponseHandler);
};
-export const createRegistrationTemplateMaster = (data,csrfToken) => {
-
+export const createRegistrationTemplateMaster = (data, csrfToken) => {
return fetch(`${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}`, {
method: 'POST',
body: JSON.stringify(data),
headers: {
'X-CSRFToken': csrfToken,
- 'Content-Type':'application/json'
+ 'Content-Type': 'application/json',
},
credentials: 'include',
- })
- .then(requestResponseHandler)
-}
+ }).then(requestResponseHandler);
+};
-export const deleteRegistrationTemplateMaster = (fileId,csrfToken) => {
- return fetch(`${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}/${fileId}`, {
- method: 'DELETE',
- headers: {
- 'X-CSRFToken': csrfToken,
- },
- credentials: 'include',
- })
-}
+export const deleteRegistrationTemplateMaster = (fileId, csrfToken) => {
+ return fetch(
+ `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}/${fileId}`,
+ {
+ method: 'DELETE',
+ headers: {
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ }
+ );
+};
export const editRegistrationTemplateMaster = (fileId, data, csrfToken) => {
- return fetch(`${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}/${fileId}`, {
- method: 'PUT',
- body: JSON.stringify(data),
- headers: {
- 'X-CSRFToken': csrfToken,
- 'Content-Type':'application/json'
- },
- credentials: 'include',
- })
- .then(requestResponseHandler)
-}
+ return fetch(
+ `${BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL}/${fileId}`,
+ {
+ method: 'PUT',
+ body: JSON.stringify(data),
+ headers: {
+ 'X-CSRFToken': csrfToken,
+ 'Content-Type': 'application/json',
+ },
+ credentials: 'include',
+ }
+ ).then(requestResponseHandler);
+};
export const cloneTemplate = (templateId, email, is_required) => {
return fetch(`${FE_API_DOCUSEAL_CLONE_URL}`, {
@@ -207,21 +222,19 @@ export const cloneTemplate = (templateId, email, is_required) => {
body: JSON.stringify({
templateId,
email,
- is_required
- })
- })
- .then(requestResponseHandler)
-}
+ is_required,
+ }),
+ }).then(requestResponseHandler);
+};
export const downloadTemplate = (slug) => {
return fetch(`${FE_API_DOCUSEAL_DOWNLOAD_URL}/${slug}`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
- }
- })
- .then(requestResponseHandler)
-}
+ },
+ }).then(requestResponseHandler);
+};
export const generateToken = (email, id = null) => {
return fetch(`${FE_API_DOCUSEAL_GENERATE_TOKEN}`, {
@@ -231,4 +244,4 @@ export const generateToken = (email, id = null) => {
},
body: JSON.stringify({ user_email: email, id }),
}).then(requestResponseHandler);
-};
\ No newline at end of file
+};
diff --git a/Front-End/src/app/actions/schoolAction.js b/Front-End/src/app/actions/schoolAction.js
index a890ba1..fd1fa2d 100644
--- a/Front-End/src/app/actions/schoolAction.js
+++ b/Front-End/src/app/actions/schoolAction.js
@@ -1,127 +1,133 @@
import {
- BE_SCHOOL_SPECIALITIES_URL,
- BE_SCHOOL_TEACHERS_URL,
- BE_SCHOOL_SCHOOLCLASSES_URL,
- BE_SCHOOL_PLANNINGS_URL,
- BE_SCHOOL_FEES_URL,
- BE_SCHOOL_DISCOUNTS_URL,
- BE_SCHOOL_PAYMENT_PLANS_URL,
- BE_SCHOOL_PAYMENT_MODES_URL,
- BE_SCHOOL_ESTABLISHMENT_URL
+ BE_SCHOOL_SPECIALITIES_URL,
+ BE_SCHOOL_TEACHERS_URL,
+ BE_SCHOOL_SCHOOLCLASSES_URL,
+ BE_SCHOOL_PLANNINGS_URL,
+ BE_SCHOOL_FEES_URL,
+ BE_SCHOOL_DISCOUNTS_URL,
+ BE_SCHOOL_PAYMENT_PLANS_URL,
+ BE_SCHOOL_PAYMENT_MODES_URL,
+ BE_SCHOOL_ESTABLISHMENT_URL,
} from '@/utils/Url';
const requestResponseHandler = async (response) => {
-
const body = await response.json();
if (response.ok) {
return body;
}
- // Throw an error with the JSON body containing the form errors
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ // Throw an error with the JSON body containing the form errors
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
-}
-
+};
export const fetchSpecialities = (establishment) => {
- return fetch(`${BE_SCHOOL_SPECIALITIES_URL}?establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_SPECIALITIES_URL}?establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchTeachers = (establishment) => {
- return fetch(`${BE_SCHOOL_TEACHERS_URL}?establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_TEACHERS_URL}?establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchClasses = (establishment) => {
- return fetch(`${BE_SCHOOL_SCHOOLCLASSES_URL}?establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_SCHOOLCLASSES_URL}?establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchSchedules = () => {
- return fetch(`${BE_SCHOOL_PLANNINGS_URL}`)
- .then(requestResponseHandler)
+ return fetch(`${BE_SCHOOL_PLANNINGS_URL}`).then(requestResponseHandler);
};
export const fetchRegistrationDiscounts = (establishment) => {
- return fetch(`${BE_SCHOOL_DISCOUNTS_URL}?filter=registration&establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_DISCOUNTS_URL}?filter=registration&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchTuitionDiscounts = (establishment) => {
- return fetch(`${BE_SCHOOL_DISCOUNTS_URL}?filter=tuition&establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_DISCOUNTS_URL}?filter=tuition&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchRegistrationFees = (establishment) => {
- return fetch(`${BE_SCHOOL_FEES_URL}?filter=registration&establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_FEES_URL}?filter=registration&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchTuitionFees = (establishment) => {
- return fetch(`${BE_SCHOOL_FEES_URL}?filter=tuition&establishment_id=${establishment}`)
- .then(requestResponseHandler)
+ return fetch(
+ `${BE_SCHOOL_FEES_URL}?filter=tuition&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
};
export const fetchRegistrationPaymentPlans = (establishment) => {
- return fetch(`${BE_SCHOOL_PAYMENT_PLANS_URL}?filter=registration&establishment_id=${establishment}`)
- .then(requestResponseHandler)
-}
+ return fetch(
+ `${BE_SCHOOL_PAYMENT_PLANS_URL}?filter=registration&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
+};
export const fetchTuitionPaymentPlans = (establishment) => {
- return fetch(`${BE_SCHOOL_PAYMENT_PLANS_URL}?filter=tuition&establishment_id=${establishment}`)
- .then(requestResponseHandler)
-}
+ return fetch(
+ `${BE_SCHOOL_PAYMENT_PLANS_URL}?filter=tuition&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
+};
export const fetchRegistrationPaymentModes = (establishment) => {
- return fetch(`${BE_SCHOOL_PAYMENT_MODES_URL}?filter=registration&establishment_id=${establishment}`)
- .then(requestResponseHandler)
-}
+ return fetch(
+ `${BE_SCHOOL_PAYMENT_MODES_URL}?filter=registration&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
+};
export const fetchTuitionPaymentModes = (establishment) => {
- return fetch(`${BE_SCHOOL_PAYMENT_MODES_URL}?filter=tuition&establishment_id=${establishment}`)
- .then(requestResponseHandler)
-}
+ return fetch(
+ `${BE_SCHOOL_PAYMENT_MODES_URL}?filter=tuition&establishment_id=${establishment}`
+ ).then(requestResponseHandler);
+};
export const fetchEstablishment = (establishment) => {
- return fetch(`${BE_SCHOOL_ESTABLISHMENT_URL}/${establishment}`)
- .then(requestResponseHandler)
-}
+ return fetch(`${BE_SCHOOL_ESTABLISHMENT_URL}/${establishment}`).then(
+ requestResponseHandler
+ );
+};
export const createDatas = (url, newData, csrfToken) => {
return fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
+ 'X-CSRFToken': csrfToken,
},
body: JSON.stringify(newData),
- credentials: 'include'
- })
- .then(requestResponseHandler)
+ credentials: 'include',
+ }).then(requestResponseHandler);
};
export const updateDatas = (url, id, updatedData, csrfToken) => {
- return fetch(`${url}/${id}`, {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- body: JSON.stringify(updatedData),
- credentials: 'include'
- })
- .then(requestResponseHandler)
- };
+ return fetch(`${url}/${id}`, {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(updatedData),
+ credentials: 'include',
+ }).then(requestResponseHandler);
+};
export const removeDatas = (url, id, csrfToken) => {
- return fetch(`${url}/${id}`, {
- method: 'DELETE',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- credentials: 'include'
- })
- .then(requestResponseHandler)
-};
\ No newline at end of file
+ return fetch(`${url}/${id}`, {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ credentials: 'include',
+ }).then(requestResponseHandler);
+};
diff --git a/Front-End/src/app/actions/subscriptionAction.js b/Front-End/src/app/actions/subscriptionAction.js
index 7309b38..6788be7 100644
--- a/Front-End/src/app/actions/subscriptionAction.js
+++ b/Front-End/src/app/actions/subscriptionAction.js
@@ -1,150 +1,152 @@
import {
- BE_SUBSCRIPTION_STUDENTS_URL,
- BE_SUBSCRIPTION_CHILDRENS_URL,
- BE_SUBSCRIPTION_REGISTERFORMS_URL,
- BE_SUBSCRIPTION_LAST_GUARDIAN_ID_URL
+ BE_SUBSCRIPTION_STUDENTS_URL,
+ BE_SUBSCRIPTION_CHILDRENS_URL,
+ BE_SUBSCRIPTION_REGISTERFORMS_URL,
+ BE_SUBSCRIPTION_LAST_GUARDIAN_ID_URL,
} from '@/utils/Url';
export const PENDING = 'pending';
export const SUBSCRIBED = 'subscribed';
export const ARCHIVED = 'archived';
-
const requestResponseHandler = async (response) => {
-
const body = await response.json();
if (response.ok) {
return body;
}
- // Throw an error with the JSON body containing the form errors
- const error = new Error(body?.errorMessage || "Une erreur est survenue");
+ // Throw an error with the JSON body containing the form errors
+ const error = new Error(body?.errorMessage || 'Une erreur est survenue');
error.details = body;
throw error;
-}
-
-export const fetchRegisterForms = (establishment, filter=PENDING, page='', pageSize='', search = '') => {
- let url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}?filter=${filter}&establishment_id=${establishment}`;
- if (page !== '' && pageSize !== '') {
- url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}?filter=${filter}&establishment_id=${establishment}&page=${page}&search=${search}`;
- }
- return fetch(url, {
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(requestResponseHandler)
- };
-
-export const fetchRegisterForm = (id) =>{
- return fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}`) // Utilisation de studentId au lieu de codeDI
- .then(requestResponseHandler)
-}
-export const fetchLastGuardian = () =>{
- return fetch(`${BE_SUBSCRIPTION_LAST_GUARDIAN_ID_URL}`)
- .then(requestResponseHandler)
-}
-
-export const editRegisterForm=(id, data, csrfToken)=>{
- return fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}`, {
- method: 'PUT',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- body: JSON.stringify(data),
- credentials: 'include'
- })
- .then(requestResponseHandler)
};
-export const sendSEPARegisterForm=(id, data, csrfToken)=>{
+export const fetchRegisterForms = (
+ establishment,
+ filter = PENDING,
+ page = '',
+ pageSize = '',
+ search = ''
+) => {
+ let url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}?filter=${filter}&establishment_id=${establishment}`;
+ if (page !== '' && pageSize !== '') {
+ url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}?filter=${filter}&establishment_id=${establishment}&page=${page}&search=${search}`;
+ }
+ return fetch(url, {
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(requestResponseHandler);
+};
+
+export const fetchRegisterForm = (id) => {
+ return fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}`) // Utilisation de studentId au lieu de codeDI
+ .then(requestResponseHandler);
+};
+export const fetchLastGuardian = () => {
+ return fetch(`${BE_SUBSCRIPTION_LAST_GUARDIAN_ID_URL}`).then(
+ requestResponseHandler
+ );
+};
+
+export const editRegisterForm = (id, data, csrfToken) => {
return fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}`, {
method: 'PUT',
headers: {
- 'X-CSRFToken': csrfToken
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(data),
+ credentials: 'include',
+ }).then(requestResponseHandler);
+};
+
+export const sendSEPARegisterForm = (id, data, csrfToken) => {
+ return fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}`, {
+ method: 'PUT',
+ headers: {
+ 'X-CSRFToken': csrfToken,
},
body: data,
- credentials: 'include'
- })
- .then(requestResponseHandler)
+ credentials: 'include',
+ }).then(requestResponseHandler);
};
-export const createRegisterForm=(data, csrfToken)=>{
- const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}`;
- return fetch(url, {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-CSRFToken': csrfToken
- },
- body: JSON.stringify(data),
- credentials: 'include'
- })
- .then(requestResponseHandler)
-}
+export const createRegisterForm = (data, csrfToken) => {
+ const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}`;
+ return fetch(url, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': csrfToken,
+ },
+ body: JSON.stringify(data),
+ credentials: 'include',
+ }).then(requestResponseHandler);
+};
export const sendRegisterForm = (id) => {
- const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/send`;
- return fetch(url, {
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(requestResponseHandler)
-}
-
-export const resendRegisterForm = (id) => {
- const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/resend`;
- return fetch(url, {
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(requestResponseHandler)
-
-}
-export const archiveRegisterForm = (id) => {
- const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/archive`;
- return fetch(url, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- },
- }).then(requestResponseHandler)
-}
-
-export const fetchStudents = (establishment, id=null) => {
- const url = (id)?`${BE_SUBSCRIPTION_STUDENTS_URL}/${id}`:`${BE_SUBSCRIPTION_STUDENTS_URL}?establishment_id=${establishment}`;
- const request = new Request(
- url,
- {
- method:'GET',
- headers: {
- 'Content-Type':'application/json'
- },
- }
- );
- return fetch(request).then(requestResponseHandler)
-
+ const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/send`;
+ return fetch(url, {
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(requestResponseHandler);
};
-export const fetchChildren = (id, establishment) =>{
- const request = new Request(
- `${BE_SUBSCRIPTION_CHILDRENS_URL}/${id}?establishment_id=${establishment}`,
- {
- method:'GET',
- headers: {
- 'Content-Type':'application/json'
- },
- }
- );
- return fetch(request).then(requestResponseHandler)
-}
+export const resendRegisterForm = (id) => {
+ const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/resend`;
+ return fetch(url, {
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(requestResponseHandler);
+};
+export const archiveRegisterForm = (id) => {
+ const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/archive`;
+ return fetch(url, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }).then(requestResponseHandler);
+};
+
+export const fetchStudents = (establishment, id = null) => {
+ const url = id
+ ? `${BE_SUBSCRIPTION_STUDENTS_URL}/${id}`
+ : `${BE_SUBSCRIPTION_STUDENTS_URL}?establishment_id=${establishment}`;
+ const request = new Request(url, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+ return fetch(request).then(requestResponseHandler);
+};
+
+export const fetchChildren = (id, establishment) => {
+ const request = new Request(
+ `${BE_SUBSCRIPTION_CHILDRENS_URL}/${id}?establishment_id=${establishment}`,
+ {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ }
+ );
+ return fetch(request).then(requestResponseHandler);
+};
export async function getRegisterFormFileTemplate(fileId) {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTERFORM_FILE_TEMPLATE_URL}/${fileId}`, {
- credentials: 'include',
- headers: {
- 'Accept': 'application/json',
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTERFORM_FILE_TEMPLATE_URL}/${fileId}`,
+ {
+ credentials: 'include',
+ headers: {
+ Accept: 'application/json',
+ },
}
- });
+ );
if (!response.ok) {
throw new Error('Failed to fetch file template');
}
@@ -152,28 +154,36 @@ export async function getRegisterFormFileTemplate(fileId) {
}
export const fetchTemplatesFromRegistrationFiles = async (id) => {
- const response = await fetch(`${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/templates`, {
- credentials: 'include',
- headers: {
- 'Accept': 'application/json',
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_REGISTERFORMS_URL}/${id}/templates`,
+ {
+ credentials: 'include',
+ headers: {
+ Accept: 'application/json',
+ },
}
- });
+ );
if (!response.ok) {
- throw new Error('Erreur lors de la récupération des fichiers associés au groupe');
+ throw new Error(
+ 'Erreur lors de la récupération des fichiers associés au groupe'
+ );
}
return response.json();
-}
+};
export const dissociateGuardian = async (studentId, guardianId) => {
- const response = await fetch(`${BE_SUBSCRIPTION_STUDENTS_URL}/${studentId}/guardians/${guardianId}/dissociate`, {
+ const response = await fetch(
+ `${BE_SUBSCRIPTION_STUDENTS_URL}/${studentId}/guardians/${guardianId}/dissociate`,
+ {
credentials: 'include',
method: 'PUT',
headers: {
- 'Accept': 'application/json',
+ Accept: 'application/json',
},
- });
+ }
+ );
if (!response.ok) {
- throw new Error('Erreur lors de la dissociation.');
+ throw new Error('Erreur lors de la dissociation.');
}
return response.json();
-};
\ No newline at end of file
+};
diff --git a/Front-End/src/app/layout.js b/Front-End/src/app/layout.js
index 21ac084..cf8feea 100644
--- a/Front-End/src/app/layout.js
+++ b/Front-End/src/app/layout.js
@@ -1,11 +1,11 @@
import React from 'react';
import { getMessages } from 'next-intl/server';
-import Providers from '@/components/Providers'
-import "@/css/tailwind.css";
+import Providers from '@/components/Providers';
+import '@/css/tailwind.css';
import { headers } from 'next/headers';
export const metadata = {
- title: "N3WT-SCHOOL",
+ title: 'N3WT-SCHOOL',
description: "Gestion de l'école",
icons: {
icon: [
@@ -14,7 +14,7 @@ export const metadata = {
type: 'image/svg+xml',
},
{
- url: '/favicon.ico', // Fallback pour les anciens navigateurs
+ url: '/favicon.ico', // Fallback pour les anciens navigateurs
sizes: 'any',
},
],
diff --git a/Front-End/src/app/not-found.js b/Front-End/src/app/not-found.js
index 1ffc731..d1a1c58 100644
--- a/Front-End/src/app/not-found.js
+++ b/Front-End/src/app/not-found.js
@@ -1,15 +1,21 @@
-import Link from 'next/link'
-import Logo from '../components/Logo'
+import Link from 'next/link';
+import Logo from '../components/Logo';
export default function NotFound() {
return (
-
-
- Authentification
- + if (isLoading === true) { + return
+
+
+ );
+ }
+}
diff --git a/Front-End/src/app/[locale]/users/password/new/page.js b/Front-End/src/app/[locale]/users/password/new/page.js
index 495bbe8..5e46f3c 100644
--- a/Front-End/src/app/[locale]/users/password/new/page.js
+++ b/Front-End/src/app/[locale]/users/password/new/page.js
@@ -1,7 +1,7 @@
-'use client'
+'use client';
import React, { useState } from 'react';
-import DjangoCSRFToken from '@/components/DjangoCSRFToken'
+import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo';
import { useSearchParams } from 'next/navigation';
import InputTextIcon from '@/components/InputTextIcon';
@@ -17,80 +17,108 @@ import logger from '@/utils/logger';
const useFakeData = process.env.NEXT_PUBLIC_USE_FAKE_DATA === 'true';
export default function Page() {
- const searchParams = useSearchParams();
- const [errorMessage, setErrorMessage] = useState("");
- const [userFieldError, setUserFieldError] = useState("");
- const [isLoading, setIsLoading] = useState(false);
- const [popupVisible, setPopupVisible] = useState(false);
- const [popupMessage, setPopupMessage] = useState("");
- const [popupConfirmAction, setPopupConfirmAction] = useState(null);
- const csrfToken = useCsrfToken();
+ const searchParams = useSearchParams();
+ const [errorMessage, setErrorMessage] = useState('');
+ const [userFieldError, setUserFieldError] = useState('');
+ const [isLoading, setIsLoading] = useState(false);
+ const [popupVisible, setPopupVisible] = useState(false);
+ const [popupMessage, setPopupMessage] = useState('');
+ const [popupConfirmAction, setPopupConfirmAction] = useState(null);
+ const csrfToken = useCsrfToken();
- function validate(formData) {
- if (useFakeData) {
- setTimeout(() => {
- setUserFieldError("");
- setErrorMessage("");
- setPopupMessage("Mot de passe réinitialisé avec succès !");
- setPopupConfirmAction(() => () => setPopupVisible(false));
- setPopupVisible(true);
- }, 1000); // Simule un délai de traitement
- } else {
- const data = {email: formData.get('email')}
- sendNewPassword(data, csrfToken)
- .then(data => {
- logger.debug('Success:', data);
- setUserFieldError("");
- setErrorMessage("");
- if (data.errorMessage === "") {
- setPopupMessage(data.message);
- setPopupConfirmAction(() => () => setPopupVisible(false));
- setPopupVisible(true);
- } else {
- if (data.errorFields) {
- setUserFieldError(data.errorFields.email);
- }
- if (data.errorMessage) {
- setErrorMessage(data.errorMessage);
- }
- }
- })
- .catch(error => {
- logger.error('Error fetching data:', error);
- error = error.errorMessage;
- logger.debug(error);
- });
- }
- }
-
- if (isLoading === true) {
- return
+
+ + Authentification +
+ +
-
-
-
-
- Nouveau Mot de passe
- --
-
-
-
+
+
+
+
+ + Nouveau Mot de passe +
+ ++
+
+
+
-
-
-
+ getResetPassword(uuid)
+ .then((data) => {
+ logger.debug('Success:', data);
+ setIsLoading(true);
+ if (data.errorFields) {
+ setPassword1FieldError(data.errorFields.password1);
+ setPassword2FieldError(data.errorFields.password2);
+ }
+ if (data.errorMessage) {
+ setErrorMessage(data.errorMessage);
+ }
+ setIsLoading(false);
+ })
+ .catch((error) => {
+ logger.error('Error fetching data:', error);
+ });
}
-}
\ No newline at end of file
+ }, []);
+
+ function validate(formData) {
+ if (useFakeData) {
+ setTimeout(() => {
+ setPopupMessage('Mot de passe réinitialisé avec succès');
+ setPopupVisible(true);
+ }, 1000);
+ } else {
+ const data = {
+ password1: formData.get('password1'),
+ password2: formData.get('password2'),
+ };
+ resetPassword(uuid, data, csrfToken)
+ .then((data) => {
+ logger.debug('Success:', data);
+ setPassword1FieldError('');
+ setPassword2FieldError('');
+ setErrorMessage('');
+ if (data.errorMessage === '') {
+ setPopupMessage(data.message);
+ setPopupVisible(true);
+ } else {
+ if (data.errorMessage) {
+ setErrorMessage(data.errorMessage);
+ }
+ if (data.errorFields) {
+ setPassword1FieldError(data.errorFields.password1);
+ setPassword2FieldError(data.errorFields.password2);
+ }
+ }
+ })
+ .catch((error) => {
+ logger.error('Error fetching data:', error);
+ error = error.errorMessage;
+ logger.debug(error);
+ });
+ }
+ }
+
+ if (isLoading === true) {
+ return
-
- Réinitialisation du mot de passe
- --
-
-
-
+
+
+
+ );
+ }
+}
diff --git a/Front-End/src/app/[locale]/users/subscribe/page.js b/Front-End/src/app/[locale]/users/subscribe/page.js
index db7e37e..b1f3c38 100644
--- a/Front-End/src/app/[locale]/users/subscribe/page.js
+++ b/Front-End/src/app/[locale]/users/subscribe/page.js
@@ -1,106 +1,155 @@
-'use client'
+'use client';
// src/app/pages/subscribe.js
import React, { useState, useEffect } from 'react';
-import DjangoCSRFToken from '@/components/DjangoCSRFToken'
+import DjangoCSRFToken from '@/components/DjangoCSRFToken';
import Logo from '@/components/Logo';
-import { useSearchParams, useRouter } from 'next/navigation'
+import { useSearchParams, useRouter } from 'next/navigation';
import InputTextIcon from '@/components/InputTextIcon';
import Loader from '@/components/Loader'; // Importez le composant Loader
import Button from '@/components/Button'; // Importez le composant Button
import Popup from '@/components/Popup'; // Importez le composant Popup
import { User, KeySquare } from 'lucide-react'; // Importez directement les icônes nécessaires
-import { FE_USERS_LOGIN_URL } from '@/utils/Url';
+import { FE_USERS_LOGIN_URL } from '@/utils/Url';
import { useCsrfToken } from '@/context/CsrfContext';
import { subscribe } from '@/app/actions/authAction';
import logger from '@/utils/logger';
import { useEstablishment } from '@/context/EstablishmentContext';
export default function Page() {
- const searchParams = useSearchParams();
+ const searchParams = useSearchParams();
- const [errorMessage, setErrorMessage] = useState("");
- const [userFieldError,setUserFieldError] = useState("")
- const [password1FieldError,setPassword1FieldError] = useState("")
- const [password2FieldError,setPassword2FieldError] = useState("")
- const [isLoading, setIsLoading] = useState(false);
- const [popupVisible, setPopupVisible] = useState(false);
- const [popupMessage, setPopupMessage] = useState("");
+ const [errorMessage, setErrorMessage] = useState('');
+ const [userFieldError, setUserFieldError] = useState('');
+ const [password1FieldError, setPassword1FieldError] = useState('');
+ const [password2FieldError, setPassword2FieldError] = useState('');
+ const [isLoading, setIsLoading] = useState(false);
+ const [popupVisible, setPopupVisible] = useState(false);
+ const [popupMessage, setPopupMessage] = useState('');
- const router = useRouter();
- const csrfToken = useCsrfToken();
-
- const establishment_id = searchParams.get('establishment_id');
+ const router = useRouter();
+ const csrfToken = useCsrfToken();
- function isOK(data) {
- return data.errorMessage === ""
- }
+ const establishment_id = searchParams.get('establishment_id');
- function subscribeFormSubmit(formData) {
- const data ={
- email: formData.get('login'),
- password1: formData.get('password1'),
- password2: formData.get('password2'),
- establishment_id: establishment_id
+ function isOK(data) {
+ return data.errorMessage === '';
+ }
+
+ function subscribeFormSubmit(formData) {
+ const data = {
+ email: formData.get('login'),
+ password1: formData.get('password1'),
+ password2: formData.get('password2'),
+ establishment_id: establishment_id,
+ };
+ subscribe(data, csrfToken)
+ .then((data) => {
+ logger.debug('Success:', data);
+ setUserFieldError('');
+ setPassword1FieldError('');
+ setPassword2FieldError('');
+ setErrorMessage('');
+ if (isOK(data)) {
+ setPopupMessage(data.message);
+ setPopupVisible(true);
+ } else {
+ if (data.errorMessage) {
+ setErrorMessage(data.errorMessage);
+ }
+ if (data.errorFields) {
+ setUserFieldError(data.errorFields.email);
+ setPassword1FieldError(data.errorFields.password1);
+ setPassword2FieldError(data.errorFields.password2);
+ }
}
- subscribe(data,csrfToken).then(data => {
- logger.debug('Success:', data);
- setUserFieldError("")
- setPassword1FieldError("")
- setPassword2FieldError("")
- setErrorMessage("")
- if(isOK(data)){
- setPopupMessage(data.message);
- setPopupVisible(true);
- } else {
- if(data.errorMessage){
- setErrorMessage(data.errorMessage);
- }
- if(data.errorFields){
- setUserFieldError(data.errorFields.email)
- setPassword1FieldError(data.errorFields.password1)
- setPassword2FieldError(data.errorFields.password2)
- }
- }
- })
- .catch(error => {
- logger.error('Error fetching data:', error);
- error = error.errorMessage;
- logger.debug(error);
- });
- }
+ })
+ .catch((error) => {
+ logger.error('Error fetching data:', error);
+ error = error.errorMessage;
+ logger.debug(error);
+ });
+ }
- if (isLoading === true) {
- return
+
+ + Réinitialisation du mot de passe +
+ ++
+
+
+
-
- -
-
-
- Nouveau profil
- -- -
+
+
+
+
+ + Nouveau profil +
+ ++
+
+
-
+
diff --git a/Front-End/src/components/AlertMessage.js b/Front-End/src/components/AlertMessage.js
index bebee7d..38c1f5e 100644
--- a/Front-End/src/components/AlertMessage.js
+++ b/Front-End/src/components/AlertMessage.js
@@ -2,11 +2,17 @@ import React from 'react';
const AlertMessage = ({ title, message, buttonText, buttonLink }) => {
return (
-
+
- )
-}
\ No newline at end of file
+ );
+}
diff --git a/Front-End/src/components/AffectationClasseForm.js b/Front-End/src/components/AffectationClasseForm.js
index b96db19..6bd5278 100644
--- a/Front-End/src/components/AffectationClasseForm.js
+++ b/Front-End/src/components/AffectationClasseForm.js
@@ -1,7 +1,6 @@
import React, { useState } from 'react';
const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
-
const [formData, setFormData] = useState({
classeAssocie_id: eleve?.classeAssocie_id || null,
});
@@ -17,10 +16,10 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
const handleSubmit = () => {
onSubmit({
eleve: {
- ...formData
+ ...formData,
},
- etat:5
- });
+ etat: 5,
+ });
};
return (
@@ -30,18 +29,21 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
Classes
404 | Page non trouvée
-La ressource que vous souhaitez consulter n'existe pas ou plus.
- Retour Accueil ++ 404 | Page non trouvée +
++ La ressource que vous souhaitez consulter n'existe pas ou plus. +
+ + Retour Accueil +
- {classes.map(classe => (
+ {classes.map((classe) => (
-
@@ -50,15 +52,15 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
+
-
@@ -168,7 +198,11 @@ const Calendar = ({ onDateClick, onEventClick }) => {
transition={{ duration: 0.2 }}
className="h-full flex flex-col"
>
- {title}
{message}
diff --git a/Front-End/src/components/AlertWithModal.js b/Front-End/src/components/AlertWithModal.js index 76b02bb..347227a 100644 --- a/Front-End/src/components/AlertWithModal.js +++ b/Front-End/src/components/AlertWithModal.js @@ -2,28 +2,31 @@ import React, { useState } from 'react'; import Modal from '@/components/Modal'; import { UserPlus } from 'lucide-react'; -const AlertWithModal = ({ title, message, buttonText}) => { - const [isOpen, setIsOpen] = useState(false); +const AlertWithModal = ({ title, message, buttonText }) => { + const [isOpen, setIsOpen] = useState(false); - const openModal = () => { - setIsOpen(true); - }; + const openModal = () => { + setIsOpen(true); + }; - return ( -
-
- );
+ return (
+ {title}
-{message}
-
-
-
-
+
+ );
};
-export default AlertWithModal;
\ No newline at end of file
+export default AlertWithModal;
diff --git a/Front-End/src/components/AlphabetLinks.js b/Front-End/src/components/AlphabetLinks.js
index 79fd4b9..4f68f34 100644
--- a/Front-End/src/components/AlphabetLinks.js
+++ b/Front-End/src/components/AlphabetLinks.js
@@ -1,37 +1,39 @@
-
import React, { useState } from 'react';
-
-const AlphabetPaginationNumber = ({ letter, active , onClick}) => (
-
-
@@ -129,7 +156,10 @@ const Calendar = ({ onDateClick, onEventClick }) => {
)}
{title}
+{message}
+
+
+
+
-
@@ -50,7 +60,7 @@ const MonthView = ({ onDateClick, onEventClick }) => {
style={{
backgroundColor: `${event.color}15`,
color: event.color,
- borderLeft: `2px solid ${event.color}`
+ borderLeft: `2px solid ${event.color}`,
}}
onClick={(e) => {
e.stopPropagation();
@@ -69,8 +79,11 @@ const MonthView = ({ onDateClick, onEventClick }) => {
{/* En-tête des jours de la semaine */}
- {['Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam', 'Dim'].map(day => (
-
+ {['Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam', 'Dim'].map((day) => (
+
{day}
))}
@@ -83,4 +96,4 @@ const MonthView = ({ onDateClick, onEventClick }) => {
);
};
-export default MonthView;
\ No newline at end of file
+export default MonthView;
diff --git a/Front-End/src/components/Calendar/PlanningView.js b/Front-End/src/components/Calendar/PlanningView.js
index a3e71a9..ee0fb30 100644
--- a/Front-End/src/components/Calendar/PlanningView.js
+++ b/Front-End/src/components/Calendar/PlanningView.js
@@ -15,17 +15,20 @@ const PlanningView = ({ events, onEventClick }) => {
// Sinon, créer une entrée pour chaque jour
const days = eachDayOfInterval({ start, end });
- return days.map(day => ({
+ return days.map((day) => ({
...event,
displayDate: day,
- isMultiDay: true
+ isMultiDay: true,
}));
};
// Aplatir tous les événements en incluant les événements sur plusieurs jours
const flattenedEvents = events
.flatMap(splitEventByDays)
- .sort((a, b) => new Date(a.displayDate || a.start) - new Date(b.displayDate || b.start));
+ .sort(
+ (a, b) =>
+ new Date(a.displayDate || a.start) - new Date(b.displayDate || b.start)
+ );
return (
@@ -58,26 +61,29 @@ const PlanningView = ({ events, onEventClick }) => {
-
@@ -108,4 +114,4 @@ const PlanningView = ({ events, onEventClick }) => {
);
};
-export default PlanningView;
\ No newline at end of file
+export default PlanningView;
diff --git a/Front-End/src/components/Calendar/WeekView.js b/Front-End/src/components/Calendar/WeekView.js
index 2804368..446a835 100644
--- a/Front-End/src/components/Calendar/WeekView.js
+++ b/Front-End/src/components/Calendar/WeekView.js
@@ -1,6 +1,12 @@
import React, { useEffect, useState, useRef } from 'react';
import { usePlanning } from '@/context/PlanningContext';
-import { format, startOfWeek, addDays, differenceInMinutes, isSameDay } from 'date-fns';
+import {
+ format,
+ startOfWeek,
+ addDays,
+ differenceInMinutes,
+ isSameDay,
+} from 'date-fns';
import { fr } from 'date-fns/locale';
import { getWeekEvents } from '@/utils/events';
import { isToday } from 'date-fns';
@@ -16,7 +22,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
const weekDays = Array.from({ length: 7 }, (_, i) => addDays(weekStart, i));
// Maintenant on peut utiliser weekDays
- const isCurrentWeek = weekDays.some(day => isSameDay(day, new Date()));
+ const isCurrentWeek = weekDays.some((day) => isSameDay(day, new Date()));
// Mettre à jour la position de la ligne toutes les minutes
useEffect(() => {
@@ -61,7 +67,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
const eventStart = new Date(event.start);
const eventEnd = new Date(event.end);
- return dayEvents.filter(otherEvent => {
+ return dayEvents.filter((otherEvent) => {
if (otherEvent.id === event.id) return false;
const otherStart = new Date(otherEvent.start);
const otherEnd = new Date(otherEvent.end);
@@ -77,7 +83,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
// Trouver les événements qui se chevauchent
const overlappingEvents = findOverlappingEvents(event, dayEvents);
- const eventIndex = overlappingEvents.findIndex(e => e.id > event.id) + 1;
+ const eventIndex = overlappingEvents.findIndex((e) => e.id > event.id) + 1;
const totalOverlapping = overlappingEvents.length + 1;
// Calculer la largeur et la position horizontale
@@ -93,7 +99,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
borderLeft: `3px solid ${event.color}`,
borderRadius: '0.25rem',
zIndex: 1,
- transform: `translateY(${startMinutes}rem)`
+ transform: `translateY(${startMinutes}rem)`,
};
};
@@ -111,14 +117,24 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
}}
>
{format(start, 'd')}
- {format(start, 'MMM', { locale: fr }).toLowerCase()}
- {format(start, 'EEE', { locale: fr })}
+
+ {format(start, 'MMM', { locale: fr }).toLowerCase()}
+
+
+ {format(start, 'EEE', { locale: fr })}
+
-
+
- {isMultiDay
- ? (isSameDay(start, new Date(event.start))
- ? "À partir de "
- : isSameDay(start, end)
- ? "Jusqu'à "
- : "Toute la journée")
- : ""
- }
- {format(new Date(event.start), 'HH:mm')}
- {!isMultiDay && ` - ${format(end, 'HH:mm')}`}
+ {isMultiDay
+ ? isSameDay(start, new Date(event.start))
+ ? 'À partir de '
+ : isSameDay(start, end)
+ ? "Jusqu'à "
+ : 'Toute la journée'
+ : ''}
+ {format(new Date(event.start), 'HH:mm')}
+ {!isMultiDay && ` - ${format(end, 'HH:mm')}`}
-
+
{event.title}
-
- {format(new Date(event.start), 'HH:mm')} - {format(new Date(event.end), 'HH:mm')}
+
+ {format(new Date(event.start), 'HH:mm')} -{' '}
+ {format(new Date(event.end), 'HH:mm')}
{event.location && (
-
+
{event.location}
)}
@@ -130,7 +146,10 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
return (
{/* En-tête des jours */}
-
+
{weekDays.map((day) => (
{
)}
-
{format(day, 'EEEE', { locale: fr })}
-
+
@@ -158,17 +179,17 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
className="absolute left-0 right-0 z-10 border-emerald-500 border pointer-events-none"
style={{
top: getCurrentTimePosition(),
-
}}
>
-
+
{format(day, 'd', { locale: fr })}
- {timeSlots.map(hour => (
+
+ {timeSlots.map((hour) => (
{`${hour.toString().padStart(2, '0')}:00`}
@@ -188,11 +209,15 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
onDateClick(date);
}}
>
-
{/* Ajout de gap-1 */}
- {dayEvents.filter(event => {
- const eventStart = new Date(event.start);
- return eventStart.getHours() === hour;
- }).map(event => renderEventInCell(event, dayEvents))}
+
);
@@ -205,4 +230,4 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
);
};
-export default WeekView;
\ No newline at end of file
+export default WeekView;
diff --git a/Front-End/src/components/Calendar/YearView.js b/Front-End/src/components/Calendar/YearView.js
index 0f31967..e6261ed 100644
--- a/Front-End/src/components/Calendar/YearView.js
+++ b/Front-End/src/components/Calendar/YearView.js
@@ -37,7 +37,7 @@ const YearView = ({ onDateClick }) => {
return (
+ {' '}
+ {/* Ajout de gap-1 */}
+ {dayEvents
+ .filter((event) => {
+ const eventStart = new Date(event.start);
+ return eventStart.getHours() === hour;
+ })
+ .map((event) => renderEventInCell(event, dayEvents))}
- {months.map(month => (
+ {months.map((month) => (
{
);
};
-export default YearView;
\ No newline at end of file
+export default YearView;
diff --git a/Front-End/src/components/CheckBox.js b/Front-End/src/components/CheckBox.js
index 02f8fd5..7fb6e70 100644
--- a/Front-End/src/components/CheckBox.js
+++ b/Front-End/src/components/CheckBox.js
@@ -1,13 +1,24 @@
import React from 'react';
-const CheckBox = ({ item, formData, handleChange, fieldName, itemLabelFunc = () => null, labelAttenuated = () => false, horizontal }) => {
+const CheckBox = ({
+ item,
+ formData,
+ handleChange,
+ fieldName,
+ itemLabelFunc = () => null,
+ labelAttenuated = () => false,
+ horizontal,
+}) => {
const isChecked = formData[fieldName].includes(parseInt(item.id));
const isAttenuated = labelAttenuated(item) && !isChecked;
return (
-
+
{horizontal && (
-