MODALITÉS DE PAIEMENT
- {% with paymentMethod=student|getStudentPaymentMethod %}
-
{{ paymentMethod }}
+
Frais d'inscription
+ {% with registrationPayment=student|getRegistrationPaymentMethod %}
+
{{ registrationPayment }}
+ {% endwith %}
+
Frais de scolarité
+ {% with tuitionPayment=student|getTuitionPaymentMethod %}
+
{{ tuitionPayment }}
{% endwith %}
diff --git a/Back-End/Subscriptions/templatetags/myTemplateTag.py b/Back-End/Subscriptions/templatetags/myTemplateTag.py
index 67db926..da1a88e 100644
--- a/Back-End/Subscriptions/templatetags/myTemplateTag.py
+++ b/Back-End/Subscriptions/templatetags/myTemplateTag.py
@@ -1,11 +1,17 @@
from Subscriptions.models import RegistrationForm, Student
+from School.models import PaymentModeType
from django import template
register = template.Library()
@register.filter
-def getStudentPaymentMethod(pk):
+def getRegistrationPaymentMethod(pk):
registerForm = RegistrationForm.objects.get(student=pk)
- return Student.PaymentMethod(int(registerForm.student.payment_method)).label
+ return PaymentModeType(registerForm.registration_payment).label
+
+@register.filter
+def getTuitionPaymentMethod(pk):
+ registerForm = RegistrationForm.objects.get(student=pk)
+ return PaymentModeType(registerForm.tuition_payment).label
@register.filter
def getStudentLevel(pk):
diff --git a/Back-End/Subscriptions/util.py b/Back-End/Subscriptions/util.py
index 21e0a0a..b440d5d 100644
--- a/Back-End/Subscriptions/util.py
+++ b/Back-End/Subscriptions/util.py
@@ -93,42 +93,35 @@ def getArgFromRequest(_argument, _request):
resultat = data[_argument]
return resultat
-def merge_files_pdf(filenames, output_filename):
+from io import BytesIO
+from PyPDF2 import PdfMerger
+
+def merge_files_pdf(file_paths):
"""
- Fusionne plusieurs fichiers PDF en un seul document.
- Vérifie l'existence des fichiers sources avant la fusion.
+ Fusionne plusieurs fichiers PDF et retourne le contenu fusionné en mémoire.
"""
merger = PdfMerger()
- valid_files = []
-
- # Vérifier l'existence des fichiers et ne garder que ceux qui existent
- print(f'filenames : {filenames}')
- for filename in filenames:
- print(f'check exists filename : {filename}')
- if os.path.exists(filename):
- print(f'append filename : {filename}')
- valid_files.append(filename)
-
- if not valid_files:
- raise FileNotFoundError("Aucun fichier valide à fusionner.")
# Ajouter les fichiers valides au merger
- for filename in valid_files:
- merger.append(filename)
+ for file_path in file_paths:
+ merger.append(file_path)
- # S'assurer que le dossier de destination existe
- os.makedirs(os.path.dirname(output_filename), exist_ok=True)
-
- # Sauvegarder le fichier fusionné
- merger.write(output_filename)
+ # Sauvegarder le fichier fusionné en mémoire
+ merged_pdf = BytesIO()
+ merger.write(merged_pdf)
merger.close()
- return output_filename
+ # Revenir au début du fichier en mémoire
+ merged_pdf.seek(0)
+
+ return merged_pdf
def rfToPDF(registerForm, filename):
"""
Génère le PDF d'un dossier d'inscription et l'associe au RegistrationForm.
"""
+ filename = filename.replace(" ", "_")
+
data = {
'pdf_title': f"Dossier d'inscription de {registerForm.student.first_name}",
'signatureDate': convertToStr(_now(), '%d-%m-%Y'),
@@ -136,9 +129,6 @@ def rfToPDF(registerForm, filename):
'student': registerForm.student,
}
- # S'assurer que le dossier parent existe
- os.makedirs(os.path.dirname(filename), exist_ok=True)
-
# Générer le PDF
pdf = renderers.render_to_pdf('pdfs/dossier_inscription.html', data)
@@ -147,19 +137,14 @@ def rfToPDF(registerForm, filename):
os.remove(registerForm.registration_file.path)
registerForm.registration_file.delete(save=False)
- # Écrire le fichier directement
- with open(filename, 'wb') as f:
- f.write(pdf.content)
+ # Enregistrer directement le fichier dans le champ registration_file
+ registerForm.registration_file.save(
+ os.path.basename(filename),
+ File(BytesIO(pdf.content)), # Utilisation de BytesIO pour éviter l'écriture sur le disque
+ save=True
+ )
- # Mettre à jour le champ registration_file du registerForm
- with open(filename, 'rb') as f:
- registerForm.registration_file.save(
- os.path.basename(filename),
- File(f),
- save=True
- )
-
- return filename
+ return registerForm.registration_file.path
def delete_registration_files(registerForm):
"""
diff --git a/Back-End/Subscriptions/views/register_form_views.py b/Back-End/Subscriptions/views/register_form_views.py
index b9c304e..bb30d4c 100644
--- a/Back-End/Subscriptions/views/register_form_views.py
+++ b/Back-End/Subscriptions/views/register_form_views.py
@@ -155,7 +155,7 @@ class RegisterFormView(APIView):
di = registerForm_serializer.save()
# Mise à jour de l'automate
- updateStateMachine(di, 'creationDI')
+ updateStateMachine(di, 'EVENT_INIT')
# Récupération du reponsable associé
for guardianId in guardiansId:
@@ -231,14 +231,25 @@ class RegisterFormWithIdView(APIView):
Modifie un dossier d'inscription donné.
"""
studentForm_data = JSONParser().parse(request)
+
_status = studentForm_data.pop('status', 0)
studentForm_data["last_update"] = str(util.convertToStr(util._now(), '%d-%m-%Y %H:%M'))
+
+ # Récupérer le dossier d'inscription
registerForm = bdd.getObject(_objectName=RegistrationForm, _columnName='student__id', _value=id)
+ if not registerForm:
+ return JsonResponse({"error": "Dossier d'inscription introuvable"}, status=status.HTTP_404_NOT_FOUND)
+
+ studentForm_serializer = RegistrationFormSerializer(registerForm, data=studentForm_data, partial=True)
+ if studentForm_serializer.is_valid():
+ studentForm_serializer.save()
+ else:
+ return JsonResponse(studentForm_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
if _status == RegistrationForm.RegistrationFormStatus.RF_UNDER_REVIEW:
try:
# Génération de la fiche d'inscription au format PDF
- base_dir = f"registration_files/dossier_rf_{registerForm.pk}"
+ base_dir = f"data/registration_files/dossier_rf_{registerForm.pk}"
os.makedirs(base_dir, exist_ok=True)
# Fichier PDF initial
@@ -248,46 +259,32 @@ class RegisterFormWithIdView(APIView):
# Récupération des fichiers d'inscription
fileNames = RegistrationTemplate.get_files_from_rf(registerForm.pk)
-
if registerForm.registration_file:
- fileNames.insert(0, registerForm.registration_file.path)
+ fileNames.insert(0, registerForm.registration_file.path)
# Création du fichier PDF Fusionné
- merged_pdf = f"{base_dir}/dossier_complet_{registerForm.pk}.pdf"
-
- util.merge_files_pdf(fileNames, merged_pdf)
+ merged_pdf_content = util.merge_files_pdf(fileNames)
# Mise à jour du champ registration_file avec le fichier fusionné
- with open(merged_pdf, 'rb') as f:
- registerForm.registration_file.save(
- os.path.basename(merged_pdf),
- File(f),
- save=True
- )
-
+ registerForm.registration_file.save(
+ f"dossier_complet_{registerForm.pk}.pdf",
+ File(merged_pdf_content),
+ save=True
+ )
# Mise à jour de l'automate
- updateStateMachine(registerForm, 'saisiDI')
+ updateStateMachine(registerForm, 'EVENT_SIGNATURE')
except Exception as e:
return JsonResponse({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
- elif _status == RegistrationForm.RegistrationFormStatus.RF_VALIDATED:
- # L'école a validé le dossier d'inscription
- # Mise à jour de l'automate
- updateStateMachine(registerForm, 'valideDI')
- elif _status == RegistrationForm.RegistrationFormStatus.RF_SENT:
- # Vérifier si l'étape précédente était RF_UNDER_REVIEW
- if registerForm.status == RegistrationForm.RegistrationFormStatus.RF_UNDER_REVIEW:
- # Mise à jour de l'automate
- updateStateMachine(registerForm, 'refuseDI')
- # Supprimer le fichier et le dossier associés
+ elif _status == RegistrationForm.RegistrationFormStatus.RF_VALIDATED:
+ updateStateMachine(registerForm, 'EVENT_VALIDATE')
+ elif _status == RegistrationForm.RegistrationFormStatus.RF_SENT:
+ if registerForm.status == RegistrationForm.RegistrationFormStatus.RF_UNDER_REVIEW:
+ updateStateMachine(registerForm, 'EVENT_REFUSE')
util.delete_registration_files(registerForm)
- studentForm_serializer = RegistrationFormSerializer(registerForm, data=studentForm_data)
- if studentForm_serializer.is_valid():
- studentForm_serializer.save()
- return JsonResponse(studentForm_serializer.data, safe=False)
-
- return JsonResponse(studentForm_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
+ # Retourner les données mises à jour
+ return JsonResponse(studentForm_serializer.data, safe=False)
@swagger_auto_schema(
responses={204: 'No Content'},
@@ -334,7 +331,7 @@ def send(request,id):
errorMessage = mailer.sendRegisterForm(email, register_form.establishment.pk)
if errorMessage == '':
register_form.last_update=util.convertToStr(util._now(), '%d-%m-%Y %H:%M')
- updateStateMachine(register_form, 'envoiDI')
+ updateStateMachine(register_form, 'EVENT_SEND')
return JsonResponse({"message": f"Le dossier d'inscription a bien été envoyé à l'addresse {email}"}, safe=False)
return JsonResponse({"errorMessage":errorMessage}, safe=False, status=status.HTTP_400_BAD_REQUEST)
return JsonResponse({"errorMessage":'Dossier d\'inscription non trouvé'}, safe=False, status=status.HTTP_404_NOT_FOUND)
@@ -356,7 +353,7 @@ def archive(request,id):
register_form = bdd.getObject(_objectName=RegistrationForm, _columnName='student__id', _value=id)
if register_form != None:
register_form.last_update=util.convertToStr(util._now(), '%d-%m-%Y %H:%M')
- updateStateMachine(register_form, 'archiveDI')
+ updateStateMachine(register_form, 'EVENT_ARCHIVE')
return JsonResponse({"message": "Le dossier a été archivé avec succès"}, safe=False)
return JsonResponse({"errorMessage":'Dossier d\'inscription non trouvé'}, safe=False, status=status.HTTP_404_NOT_FOUND)
diff --git a/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js b/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
index 72afd98..4f7ecd7 100644
--- a/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
+++ b/Front-End/src/app/[locale]/admin/subscriptions/editInscription/page.js
@@ -4,27 +4,21 @@ import { useSearchParams, useRouter } from 'next/navigation';
import InscriptionFormShared from '@/components/Inscription/InscriptionFormShared';
import { FE_ADMIN_SUBSCRIPTIONS_URL } from '@/utils/Url';
import { useCsrfToken } from '@/context/CsrfContext';
+import { useEstablishment } from '@/context/EstablishmentContext';
import { editRegisterForm } from '@/app/actions/subscriptionAction';
import logger from '@/utils/logger';
-const useFakeData = process.env.NEXT_PUBLIC_USE_FAKE_DATA === 'true';
export default function Page() {
const router = useRouter();
const searchParams = useSearchParams();
- const idProfil = searchParams.get('id');
const studentId = searchParams.get('studentId'); // Changé de codeDI à studentId
- const [initialData, setInitialData] = useState(null);
-
const [formErrors, setFormErrors] = useState({});
const csrfToken = useCsrfToken();
+ const { selectedEstablishmentId } = useEstablishment();
const handleSubmit = (data) => {
- if (useFakeData) {
- logger.debug('Fake submit:', data);
- return;
- }
editRegisterForm(studentId, data, csrfToken)
@@ -46,6 +40,7 @@ export default function Page() {