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

feat: Ajout d'un nouveau status avec envoi de mandat SEPA + envoi de

Browse Source 
mail
This commit is contained in:
N3WT DE COMPET
2025-04-11 20:02:03 +02:00
parent 4f774c18e4
commit 4c2e2f8756
17 changed files with 415 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Back-End/School/management/commands/References/LMDE/mandat_prelevement_sepa_interentreprise.pdf Normal file
View File

Binary file not shown.

24
Back-End/Subscriptions/mailManager.py
View File

@ -26,7 +26,6 @@ def envoieReinitMotDePasse(recipients, code):
def sendRegisterForm(recipients, establishment_id): def sendRegisterForm(recipients, establishment_id):
errorMessage = '' errorMessage = ''
try: try:
print(f'{settings.EMAIL_HOST_USER}')
# Préparation du contexte pour le template # Préparation du contexte pour le template
EMAIL_INSCRIPTION_SUBJECT = '[N3WT-SCHOOL] Dossier Inscription' EMAIL_INSCRIPTION_SUBJECT = '[N3WT-SCHOOL] Dossier Inscription'
context = { context = {
@ -47,6 +46,29 @@ def sendRegisterForm(recipients, establishment_id):
return errorMessage return errorMessage
def sendMandatSEPA(recipients, establishment_id):
errorMessage = ''
try:
# Préparation du contexte pour le template
EMAIL_INSCRIPTION_SUBJECT = '[N3WT-SCHOOL] Mandat de prélèvement SEPA'
context = {
'BASE_URL': settings.BASE_URL,
'email': recipients,
'establishment': establishment_id
}
subject = EMAIL_INSCRIPTION_SUBJECT
html_message = render_to_string('emails/sepa.html', context)
plain_message = strip_tags(html_message)
from_email = settings.EMAIL_HOST_USER
send_mail(subject, plain_message, from_email, [recipients], html_message=html_message)
except Exception as e:
errorMessage = str(e)
return errorMessage
def envoieRelanceDossierInscription(recipients, code): def envoieRelanceDossierInscription(recipients, code):
EMAIL_RELANCE_SUBJECT = '[N3WT-SCHOOL] Relance - Dossier Inscription' EMAIL_RELANCE_SUBJECT = '[N3WT-SCHOOL] Relance - Dossier Inscription'
EMAIL_RELANCE_CORPUS = 'Bonjour,\nN\'ayant pas eu de retour de votre part, nous vous renvoyons le lien vers le formulaire d\'inscription : ' + BASE_URL + '/users/login\nCordialement' EMAIL_RELANCE_CORPUS = 'Bonjour,\nN\'ayant pas eu de retour de votre part, nous vous renvoyons le lien vers le formulaire d\'inscription : ' + BASE_URL + '/users/login\nCordialement'

5
Back-End/Subscriptions/models.py
View File

@ -198,6 +198,11 @@ class RegistrationForm(models.Model):
null=True, null=True,
blank=True blank=True
) )
sepa_file = models.FileField(
upload_to=registration_file_path,
null=True,
blank=True
)
associated_rf = models.CharField(max_length=200, default="", blank=True) associated_rf = models.CharField(max_length=200, default="", blank=True)
# Many-to-Many Relationship # Many-to-Many Relationship

4
Back-End/Subscriptions/serializers.py
View File

@ -10,6 +10,7 @@ from N3wtSchool import settings
from django.utils import timezone from django.utils import timezone
import pytz import pytz
from datetime import datetime from datetime import datetime
import Subscriptions.util as util
class RegistrationTemplateMasterSerializer(serializers.ModelSerializer): class RegistrationTemplateMasterSerializer(serializers.ModelSerializer):
id = serializers.IntegerField(required=False) id = serializers.IntegerField(required=False)
@ -195,6 +196,7 @@ class StudentSerializer(serializers.ModelSerializer):
class RegistrationFormSerializer(serializers.ModelSerializer): class RegistrationFormSerializer(serializers.ModelSerializer):
student = StudentSerializer(many=False, required=False) student = StudentSerializer(many=False, required=False)
registration_file = serializers.FileField(required=False) registration_file = serializers.FileField(required=False)
sepa_file = serializers.FileField(required=False)
status_label = serializers.SerializerMethodField() status_label = serializers.SerializerMethodField()
formatted_last_update = serializers.SerializerMethodField() formatted_last_update = serializers.SerializerMethodField()
registration_files = RegistrationTemplateSerializer(many=True, required=False) registration_files = RegistrationTemplateSerializer(many=True, required=False)
@ -232,6 +234,8 @@ class RegistrationFormSerializer(serializers.ModelSerializer):
setattr(instance, field, validated_data[field]) setattr(instance, field, validated_data[field])
except KeyError: except KeyError:
pass pass
instance.last_update = util.convertToStr(util._now(), '%d-%m-%Y %H:%M')
instance.save() instance.save()
# Associer les IDs des objets Fee et Discount au RegistrationForm # Associer les IDs des objets Fee et Discount au RegistrationForm

51
Back-End/Subscriptions/templates/emails/sepa.html Normal file
View File

@ -0,0 +1,51 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Finalisation de l'inscription</title>
<style>
body {
font-family: Arial, sans-serif;
line-height: 1.6;
color: #333;
}
.container {
max-width: 600px;
margin: 0 auto;
padding: 20px;
}
.header {
background-color: #f4f4f4;
padding: 10px;
text-align: center;
}
.content {
padding: 20px;
}
.footer {
font-size: 12px;
text-align: center;
margin-top: 30px;
color: #777;
}
</style>
</head>
<body>
<div class="container">
<div class="header">
<h1>Finalisation de l'inscription</h1>
</div>
<div class="content">
<p>Bonjour,</p>
<p>Un mandat de prélèvement SEPA vous a été envoyé</p>
<p>Le document est à votre disposition sur votre espace parent : <a href="{{BASE_URL}}/users/login">{{BASE_URL}}/users/login</a></p>
<p>Merci de compléter puis de signer le document afin de valider votre inscription</p>
<p>Cordialement,</p>
<p>L'équipe N3wt School</p>
</div>
<div class="footer">
<p>Ce message est généré automatiquement, merci de ne pas y répondre.</p>
</div>
</div>
</body>
</html>

22
Back-End/Subscriptions/views/register_form_views.py
View File

@ -1,7 +1,6 @@
from django.http.response import JsonResponse from django.http.response import JsonResponse
from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from rest_framework.parsers import JSONParser
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework.decorators import action, api_view from rest_framework.decorators import action, api_view
from rest_framework import status from rest_framework import status
@ -230,10 +229,16 @@ class RegisterFormWithIdView(APIView):
""" """
Modifie un dossier d'inscription donné. Modifie un dossier d'inscription donné.
""" """
studentForm_data = JSONParser().parse(request) # Récupérer les données de la requête
studentForm_data = request.data.copy()
logger.info(f"Mise à jour du dossier d'inscription {studentForm_data}")
_status = studentForm_data.pop('status', 0) _status = studentForm_data.pop('status', 0)
studentForm_data["last_update"] = str(util.convertToStr(util._now(), '%d-%m-%Y %H:%M')) if isinstance(_status, list): # Cas Multipart/data, les données sont envoyées sous forme de liste, c'est nul
_status = int(_status[0])
else:
_status = int(_status)
# Récupérer le dossier d'inscription # Récupérer le dossier d'inscription
registerForm = bdd.getObject(_objectName=RegistrationForm, _columnName='student__id', _value=id) registerForm = bdd.getObject(_objectName=RegistrationForm, _columnName='student__id', _value=id)
@ -282,6 +287,17 @@ class RegisterFormWithIdView(APIView):
if registerForm.status == RegistrationForm.RegistrationFormStatus.RF_UNDER_REVIEW: if registerForm.status == RegistrationForm.RegistrationFormStatus.RF_UNDER_REVIEW:
updateStateMachine(registerForm, 'EVENT_REFUSE') updateStateMachine(registerForm, 'EVENT_REFUSE')
util.delete_registration_files(registerForm) util.delete_registration_files(registerForm)
elif _status == RegistrationForm.RegistrationFormStatus.RF_SEPA_SENT:
# Sauvegarde du mandat SEPA
student = registerForm.student
guardian = student.getMainGuardian()
email = guardian.profile_role.profile.email
errorMessage = mailer.sendMandatSEPA(email, registerForm.establishment.pk)
if errorMessage == '':
registerForm.last_update=util.convertToStr(util._now(), '%d-%m-%Y %H:%M')
updateStateMachine(registerForm, 'EVENT_SEND_SEPA')
return JsonResponse({"message": f"Le mandat SEPA a bien été envoyé à l'addresse {email}"}, safe=False)
return JsonResponse({"errorMessage":errorMessage}, safe=False, status=status.HTTP_400_BAD_REQUEST)
# Retourner les données mises à jour # Retourner les données mises à jour
return JsonResponse(studentForm_serializer.data, safe=False) return JsonResponse(studentForm_serializer.data, safe=False)

10
Front-End/src/app/[locale]/admin/subscriptions/page.js
View File

@ -14,6 +14,7 @@ import Modal from '@/components/Modal';
import InscriptionForm from '@/components/Inscription/InscriptionForm' import InscriptionForm from '@/components/Inscription/InscriptionForm'
import AffectationClasseForm from '@/components/AffectationClasseForm' import AffectationClasseForm from '@/components/AffectationClasseForm'
import { useEstablishment } from '@/context/EstablishmentContext'; import { useEstablishment } from '@/context/EstablishmentContext';
import ValidateSubscription from '@/components/Inscription/ValidateSubscription';
import { import {
PENDING, PENDING,
@ -44,7 +45,8 @@ import { createProfile, deleteProfile, fetchProfiles } from '@/app/actions/authA
import { import {
BASE_URL, BASE_URL,
FE_ADMIN_SUBSCRIPTIONS_EDIT_URL } from '@/utils/Url'; FE_ADMIN_SUBSCRIPTIONS_EDIT_URL,
FE_ADMIN_SUBSCRIPTIONS_VALIDATE_URL } from '@/utils/Url';
import DjangoCSRFToken from '@/components/DjangoCSRFToken' import DjangoCSRFToken from '@/components/DjangoCSRFToken'
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
@ -594,11 +596,7 @@ useEffect(()=>{
3: [ 3: [
{ {
icon: <CircleCheck className="w-5 h-5 text-green-500 hover:text-green-700" />, icon: <CircleCheck className="w-5 h-5 text-green-500 hover:text-green-700" />,
onClick: () => openModalAssociationEleve(row.student), onClick: () => window.location.href = `${FE_ADMIN_SUBSCRIPTIONS_VALIDATE_URL}?studentId=${row.student.id}&firstName=${row.student.first_name}&lastName=${row.student.last_name}&paymentMode=${row.registration_payment}&file=${row.registration_file}`,
},
{
icon: <XCircle className="w-5 h-5 text-red-500 hover:text-red-700" />,
onClick: () => refuseRegistrationForm(row.student.id, row.student.last_name, row.student.first_name, row.student.guardians[0].associated_profile_email),
}, },
], ],
5: [ 5: [

53
Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js Normal file
View File

@ -0,0 +1,53 @@
'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 { useCsrfToken } from '@/context/CsrfContext';
import logger from '@/utils/logger';
import { FE_ADMIN_SUBSCRIPTIONS_URL} from '@/utils/Url';
export default function Page() {
const searchParams = useSearchParams();
const router = useRouter();
// Récupérer les paramètres de la requête
const studentId = searchParams.get('studentId');
const firstName = searchParams.get('firstName');
const lastName = searchParams.get('lastName');
const paymentMode = searchParams.get('paymentMode');
const file = searchParams.get('file');
const csrfToken = useCsrfToken();
const handleAcceptRF = (data) => {
logger.debug('Mise à jour du RF avec les données:', 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) => {
logger.debug('RF mis à jour avec succès:', response);
router.push(FE_ADMIN_SUBSCRIPTIONS_URL);
// Logique supplémentaire après la mise à jour (par exemple, redirection ou notification)
})
.catch((error) => {
logger.error('Erreur lors de la mise à jour du RF:', error);
});
};
return (
<ValidateSubscription
studentId={studentId}
firstName={firstName}
lastName={lastName}
paymentMode={paymentMode}
file={file}
onAccept={handleAcceptRF}
/>
);
}

3
Front-End/src/app/[locale]/parents/editInscription/page.js
View File

@ -3,6 +3,7 @@ import React, { useState } from 'react';
import InscriptionFormShared from '@/components/Inscription/InscriptionFormShared'; import InscriptionFormShared from '@/components/Inscription/InscriptionFormShared';
import { useSearchParams, useRouter } from 'next/navigation'; import { useSearchParams, useRouter } from 'next/navigation';
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
import { useEstablishment } from '@/context/EstablishmentContext';
import { FE_PARENTS_HOME_URL} from '@/utils/Url'; import { FE_PARENTS_HOME_URL} from '@/utils/Url';
import { editRegisterForm} from '@/app/actions/subscriptionAction'; import { editRegisterForm} from '@/app/actions/subscriptionAction';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
@ -13,6 +14,7 @@ export default function Page() {
const studentId = searchParams.get('studentId'); const studentId = searchParams.get('studentId');
const router = useRouter(); const router = useRouter();
const csrfToken = useCsrfToken(); const csrfToken = useCsrfToken();
const { selectedEstablishmentId } = useEstablishment();
const handleSubmit = async (data) => { const handleSubmit = async (data) => {
try { try {
@ -28,6 +30,7 @@ export default function Page() {
<InscriptionFormShared <InscriptionFormShared
studentId={studentId} studentId={studentId}
csrfToken={csrfToken} csrfToken={csrfToken}
selectedEstablishmentId={selectedEstablishmentId}
onSubmit={handleSubmit} onSubmit={handleSubmit}
cancelUrl={FE_PARENTS_HOME_URL} cancelUrl={FE_PARENTS_HOME_URL}
/> />

21
Front-End/src/app/[locale]/parents/page.js
View File

@ -62,25 +62,6 @@ export default function ParentHomePage() {
{ name: 'Action', transform: (row) => row.action }, { name: 'Action', transform: (row) => row.action },
]; ];
const getShadowColor = (status) => {
switch (status) {
case 1:
return 'shadow-blue-500'; // Couleur d'ombre plus visible
case 2:
return 'shadow-orange-500'; // Couleur d'ombre plus visible
case 3:
return 'shadow-purple-500'; // Couleur d'ombre plus visible
case 4:
return 'shadow-red-500'; // Couleur d'ombre plus visible
case 5:
return 'shadow-green-500'; // Couleur d'ombre plus visible
case 6:
return 'shadow-red-500'; // Couleur d'ombre plus visible
default:
return 'shadow-green-500'; // Couleur d'ombre plus visible
}
};
// Définir les colonnes du tableau // Définir les colonnes du tableau
const childrenColumns = [ const childrenColumns = [
{ name: 'Nom', transform: (row) => `${row.student.last_name}` }, { name: 'Nom', transform: (row) => `${row.student.last_name}` },
@ -89,7 +70,7 @@ export default function ParentHomePage() {
name: 'Statut', name: 'Statut',
transform: (row) => ( transform: (row) => (
<div className="flex justify-center items-center"> <div className="flex justify-center items-center">
<StatusLabel status={row.status} showDropdown={false}/> <StatusLabel status={row.status} showDropdown={false} parent/>
</div> </div>
) )
}, },

15
Front-End/src/app/actions/registerFileGroupAction.js
View File

@ -2,7 +2,8 @@ import { BE_SUBSCRIPTION_REGISTRATIONFILE_GROUPS_URL,
BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL, BE_SUBSCRIPTION_REGISTRATION_TEMPLATES_URL,
BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL, BE_SUBSCRIPTION_REGISTRATION_TEMPLATE_MASTER_URL,
FE_API_DOCUSEAL_CLONE_URL, FE_API_DOCUSEAL_CLONE_URL,
FE_API_DOCUSEAL_DOWNLOAD_URL FE_API_DOCUSEAL_DOWNLOAD_URL,
FE_API_DOCUSEAL_GENERATE_TOKEN
} from '@/utils/Url'; } from '@/utils/Url';
const requestResponseHandler = async (response) => { const requestResponseHandler = async (response) => {
@ -220,4 +221,14 @@ export const downloadTemplate = (slug) => {
} }
}) })
.then(requestResponseHandler) .then(requestResponseHandler)
} }
export const generateToken = (email, id = null) => {
return fetch(`${FE_API_DOCUSEAL_GENERATE_TOKEN}`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ user_email: email, id }),
}).then(requestResponseHandler);
};

11
Front-End/src/app/actions/subscriptionAction.js
View File

@ -56,6 +56,17 @@ export const editRegisterForm=(id, data, csrfToken)=>{
.then(requestResponseHandler) .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)
};
export const createRegisterForm=(data, csrfToken)=>{ export const createRegisterForm=(data, csrfToken)=>{
const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}`; const url = `${BE_SUBSCRIPTION_REGISTERFORMS_URL}`;

175
Front-End/src/components/Inscription/ValidateSubscription.js Normal file
View File

@ -0,0 +1,175 @@
'use client'
import React, { useState, useEffect } from 'react';
import { DocusealBuilder } from '@docuseal/react';
import Button from '@/components/Button';
import { BASE_URL } from '@/utils/Url';
import { generateToken } from '@/app/actions/registerFileGroupAction';
import logger from '@/utils/logger';
import { GraduationCap, CloudUpload } from 'lucide-react';
export default function ValidateSubscription({ studentId, firstName, lastName, paymentMode, file, onAccept }) {
const [token, setToken] = useState(null);
const [uploadedFileName, setUploadedFileName] = useState('');
const [pdfUrl, setPdfUrl] = useState(`${BASE_URL}/${file}`);
const [isSepa, setIsSepa] = useState(paymentMode === '1'); // Vérifie si le mode de paiement est SEPA
const [currentPage, setCurrentPage] = useState(1); // Gestion des pages
useEffect(() => {
if (isSepa) {
generateToken('n3wt.school@gmail.com')
.then((data) => {
setToken(data.token);
})
.catch((error) => logger.error('Erreur lors de la génération du token:', error));
}
}, [isSepa]);
const handleUpload = (detail) => {
logger.debug('Uploaded file detail:', detail);
setUploadedFileName(detail.name);
};
const handleAccept = () => {
const fileInput = document.getElementById('fileInput'); // Récupère l'élément input
const file = fileInput?.files[0]; // Récupère le fichier sélectionné
if (!file) {
logger.error('Aucun fichier sélectionné pour le champ SEPA.');
return;
}
const data = {
status: 7,
sepa_file: file,
};
// Appeler la fonction passée par le parent pour mettre à jour le RF
onAccept(data);
};
const handleRefuse = () => {
logger.debug('Dossier refusé pour l\'étudiant:', studentId);
// Logique pour refuser l'inscription
};
const isValidateButtonDisabled = isSepa && !uploadedFileName;
const goToNextPage = () => {
if (currentPage < (isSepa ? 2 : 1)) {
setCurrentPage(currentPage + 1);
}
};
const goToPreviousPage = () => {
if (currentPage > 1) {
setCurrentPage(currentPage - 1);
}
};
return (
<div className="p-8 space-y-6 bg-gray-50 rounded-lg shadow-lg">
{/* Titre */}
<div className="flex items-center space-x-4">
<div className="bg-emerald-100 p-3 rounded-full shadow-md">
<GraduationCap className="w-8 h-8 text-emerald-600" />
</div>
<div>
<h1 className="text-3xl font-bold text-gray-800">
Dossier scolaire de <span className="text-emerald-600">{firstName} {lastName}</span>
</h1>
<p className="text-sm text-gray-500 italic">
Année scolaire {new Date().getFullYear()}-{new Date().getFullYear() + 1}
</p>
</div>
</div>
{/* Contenu principal */}
{currentPage === 1 && (
<div className="border p-6 rounded-lg shadow-md bg-white flex justify-center items-center">
<iframe
src={pdfUrl}
title="Aperçu du PDF"
className="w-full h-[900px] border rounded-lg"
style={{
transform: 'scale(0.95)', // Dézoom léger pour une meilleure vue
transformOrigin: 'top center',
border: 'none',
}}
/>
</div>
)}
{currentPage === 2 && isSepa && (
<div className="border p-4 rounded-md shadow-md">
<h3 className="text-lg font-semibold mb-4">Sélection du mandat de pélèvement SEPA</h3>
<div
className="border-2 border-dashed border-gray-500 p-6 rounded-lg flex flex-col items-center justify-center cursor-pointer hover:border-emerald-500"
onClick={() => document.getElementById('fileInput').click()} // Ouvre l'explorateur de fichiers au clic
onDragOver={(e) => e.preventDefault()}
onDrop={(e) => {
e.preventDefault();
const file = e.dataTransfer.files[0];
if (file) {
setUploadedFileName(file.name); // Stocke uniquement le nom du fichier
logger.debug('Fichier déposé:', file.name);
}
}}
>
<CloudUpload className="w-12 h-12 text-emerald-500 mb-4" /> {/* Icône de cloud */}
<input
type="file"
accept=".pdf"
onChange={(e) => {
const file = e.target.files[0];
if (file) {
setUploadedFileName(file.name); // Stocke uniquement le nom du fichier
logger.debug('Fichier sélectionné:', file.name);
}
}}
className="hidden"
id="fileInput"
/>
<label htmlFor="fileInput" className="text-center text-gray-500">
<p className="text-lg font-semibold text-gray-800">Déposez votre fichier ici</p>
<p className="text-sm text-gray-500 mt-2">ou cliquez pour sélectionner un fichier PDF</p>
</label>
</div>
{uploadedFileName && (
<div className="mt-4 flex items-center space-x-4 bg-gray-100 p-3 rounded-md shadow-sm">
<CloudUpload className="w-6 h-6 text-emerald-500" />
<p className="text-sm font-medium text-gray-800"><span className="font-semibold">{uploadedFileName}</span></p>
</div>
)}
</div>
)}
{/* Boutons de navigation */}
<div className="flex justify-end items-center mt-6 space-x-4">
{currentPage > 1 && (
<Button
text="Précédent"
onClick={goToPreviousPage}
className="bg-gray-300 text-gray-700 hover:bg-gray-400 px-6 py-2"
/>
)}
{currentPage < (isSepa ? 2 : 1) && (
<Button
text="Suivant"
onClick={goToNextPage}
primary
className="bg-emerald-500 text-white hover:bg-emerald-600 px-6 py-2"
/>
)}
{currentPage === (isSepa ? 2 : 1) && (
<Button
text="Valider"
onClick={handleAccept}
primary
className={`px-6 py-2 ${isValidateButtonDisabled ? 'bg-gray-300 text-gray-700 cursor-not-allowed' : 'bg-emerald-600 text-white hover:bg-emerald-700'}`}
disabled={isValidateButtonDisabled}
/>
)}
</div>
</div>
);
}

66
Front-End/src/components/StatusLabel.js
View File

@ -2,18 +2,48 @@ import { useState } from 'react';
import { ChevronUp } from 'lucide-react'; import { ChevronUp } from 'lucide-react';
import DropdownMenu from './DropdownMenu'; import DropdownMenu from './DropdownMenu';
const StatusLabel = ({ status, onChange, showDropdown = true }) => { const StatusLabel = ({ status, onChange, showDropdown = true, parent }) => {
const [dropdownOpen, setDropdownOpen] = useState(false); const [dropdownOpen, setDropdownOpen] = useState(false);
const statusOptions = [
{ value: 1, label: 'A envoyer' }, // Définir les options de statut en fonction de la prop `parent`
{ value: 2, label: 'En attente' }, const statusOptions = parent
{ value: 3, label: 'Signé' }, ? [
{ value: 4, label: 'A Relancer' }, { value: 2, label: 'Nouveau' },
{ value: 5, label: 'Validé' }, { value: 3, label: 'En validation' },
{ value: 6, label: 'Archivé' }, { value: 7, label: 'SEPA reçu' },
]; ]
: [
{ value: 1, label: 'A envoyer' },
{ value: 2, label: 'En attente' },
{ value: 3, label: 'Signé' },
{ value: 4, label: 'A Relancer' },
{ value: 5, label: 'Validé' },
{ value: 6, label: 'Archivé' },
{ value: 7, label: 'En attente SEPA' },
];
const currentStatus = statusOptions.find(option => option.value === status); const currentStatus = statusOptions.find(option => option.value === status);
// Définir les couleurs en fonction du statut
const getStatusClass = () => {
if (parent) {
return (
status === 2 && 'bg-orange-50 text-orange-600' ||
status === 3 && 'bg-purple-50 text-purple-600' ||
status === 7 && 'bg-yellow-50 text-yellow-600'
);
}
return (
status === 1 && 'bg-blue-50 text-blue-600' ||
status === 2 && 'bg-orange-50 text-orange-600' ||
status === 3 && 'bg-purple-50 text-purple-600' ||
status === 4 && 'bg-red-50 text-red-600' ||
status === 5 && 'bg-green-50 text-green-600' ||
status === 6 && 'bg-red-50 text-red-600' ||
status === 7 && 'bg-yellow-50 text-yellow-600'
);
};
return ( return (
<> <>
{showDropdown ? ( {showDropdown ? (
@ -28,27 +58,13 @@ const StatusLabel = ({ status, onChange, showDropdown = true }) => {
label: option.label, label: option.label,
onClick: () => onChange(option.value), onClick: () => onChange(option.value),
}))} }))}
buttonClassName={`w-[150px] flex items-center justify-center gap-2 px-2 py-2 rounded-md text-sm text-center font-medium ${ buttonClassName={`w-[150px] flex items-center justify-center gap-2 px-2 py-2 rounded-md text-sm text-center font-medium ${getStatusClass()}`}
status === 1 && 'bg-blue-50 text-blue-600' ||
status === 2 && 'bg-orange-50 text-orange-600' ||
status === 3 && 'bg-purple-50 text-purple-600' ||
status === 4 && 'bg-red-50 text-red-600' ||
status === 5 && 'bg-green-50 text-green-600' ||
status === 6 && 'bg-red-50 text-red-600'
}`}
menuClassName="absolute right-0 mt-2 w-48 bg-white border border-gray-200 rounded-md shadow-lg z-10" menuClassName="absolute right-0 mt-2 w-48 bg-white border border-gray-200 rounded-md shadow-lg z-10"
dropdownOpen={dropdownOpen} dropdownOpen={dropdownOpen}
setDropdownOpen={setDropdownOpen} setDropdownOpen={setDropdownOpen}
/> />
) : ( ) : (
<div className={`w-[150px] flex items-center justify-center gap-2 px-2 py-2 rounded-md text-sm text-center font-medium ${ <div className={`w-[150px] flex items-center justify-center gap-2 px-2 py-2 rounded-md text-sm text-center font-medium ${getStatusClass()}`}>
status === 1 && 'bg-blue-50 text-blue-600' ||
status === 2 && 'bg-orange-50 text-orange-600' ||
status === 3 && 'bg-purple-50 text-purple-600' ||
status === 4 && 'bg-red-50 text-red-600' ||
status === 5 && 'bg-green-50 text-green-600' ||
status === 6 && 'bg-red-50 text-red-600'
}`}>
{currentStatus ? currentStatus.label : 'Statut inconnu'} {currentStatus ? currentStatus.label : 'Statut inconnu'}
</div> </div>
)} )}

33
Front-End/src/components/Structure/Files/FileUpload.js
View File

@ -1,9 +1,9 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import ToggleSwitch from '@/components/ToggleSwitch'; // Import du composant ToggleSwitch import ToggleSwitch from '@/components/ToggleSwitch'; // Import du composant ToggleSwitch
import { fetchRegistrationFileGroups, createRegistrationTemplates, cloneTemplate } from '@/app/actions/registerFileGroupAction'; import { fetchRegistrationFileGroups, createRegistrationTemplates, cloneTemplate, generateToken } from '@/app/actions/registerFileGroupAction';
import { DocusealBuilder } from '@docuseal/react'; import { DocusealBuilder } from '@docuseal/react';
import logger from '@/utils/logger'; import logger from '@/utils/logger';
import { BE_DOCUSEAL_GET_JWT, BASE_URL } from '@/utils/Url'; import { BE_DOCUSEAL_GET_JWT, BASE_URL, FE_API_DOCUSEAL_GENERATE_TOKEN } from '@/utils/Url';
import Button from '@/components/Button'; // Import du composant Button import Button from '@/components/Button'; // Import du composant Button
import MultiSelect from '@/components/MultiSelect'; // Import du composant MultiSelect import MultiSelect from '@/components/MultiSelect'; // Import du composant MultiSelect
import { useCsrfToken } from '@/context/CsrfContext'; import { useCsrfToken } from '@/context/CsrfContext';
@ -33,27 +33,14 @@ export default function FileUpload({ handleCreateTemplateMaster, handleEditTempl
}, [fileToEdit]); }, [fileToEdit]);
useEffect(() => { useEffect(() => {
const body = fileToEdit const email = 'n3wt.school@gmail.com';
? JSON.stringify({ const id = fileToEdit ? fileToEdit.id : null;
user_email: 'n3wt.school@gmail.com',
id: fileToEdit.id generateToken(email, id)
}) .then((data) => {
: JSON.stringify({ setToken(data.token);
user_email: 'n3wt.school@gmail.com' })
}); .catch((error) => console.error('Erreur lors de la génération du token:', error));
fetch('/api/docuseal/generateToken', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: body,
})
.then((response) => response.json())
.then((data) => {
setToken(data.token);
})
.catch((error) => console.error(error));
}, [fileToEdit]); }, [fileToEdit]);
const handleFileNameChange = (event) => { const handleFileNameChange = (event) => {

1
Front-End/src/pages/api/docuseal/cloneTemplate.js
View File

@ -3,7 +3,6 @@ import { BE_DOCUSEAL_CLONE_TEMPLATE } from '@/utils/Url';
export default function handler(req, res) { export default function handler(req, res) {
if (req.method === 'POST') { if (req.method === 'POST') {
const { templateId, email, is_required } = req.body; const { templateId, email, is_required } = req.body;
console.log('coucou : ', req.body)
fetch(BE_DOCUSEAL_CLONE_TEMPLATE, { fetch(BE_DOCUSEAL_CLONE_TEMPLATE, {
method: 'POST', method: 'POST',

2
Front-End/src/utils/Url.js
View File

@ -73,6 +73,7 @@ export const FE_ADMIN_HOME_URL = `/admin`
// ADMIN/SUBSCRIPTIONS URL // ADMIN/SUBSCRIPTIONS URL
export const FE_ADMIN_SUBSCRIPTIONS_URL = `/admin/subscriptions` export const FE_ADMIN_SUBSCRIPTIONS_URL = `/admin/subscriptions`
export const FE_ADMIN_SUBSCRIPTIONS_EDIT_URL = `/admin/subscriptions/editInscription` export const FE_ADMIN_SUBSCRIPTIONS_EDIT_URL = `/admin/subscriptions/editInscription`
export const FE_ADMIN_SUBSCRIPTIONS_VALIDATE_URL = `/admin/subscriptions/validateSubscription`
//ADMIN/CLASSES URL //ADMIN/CLASSES URL
export const FE_ADMIN_CLASSES_URL = `/admin/classes` export const FE_ADMIN_CLASSES_URL = `/admin/classes`
@ -102,5 +103,6 @@ export const FE_PARENTS_SETTINGS_URL = `/parents/settings`
export const FE_PARENTS_EDIT_INSCRIPTION_URL = `/parents/editInscription` export const FE_PARENTS_EDIT_INSCRIPTION_URL = `/parents/editInscription`
// API DOCUSEAL // API DOCUSEAL
export const FE_API_DOCUSEAL_GENERATE_TOKEN = `/api/docuseal/generateToken`
export const FE_API_DOCUSEAL_CLONE_URL = `/api/docuseal/cloneTemplate` export const FE_API_DOCUSEAL_CLONE_URL = `/api/docuseal/cloneTemplate`
export const FE_API_DOCUSEAL_DOWNLOAD_URL = `/api/docuseal/downloadTemplate` export const FE_API_DOCUSEAL_DOWNLOAD_URL = `/api/docuseal/downloadTemplate`