mirror of
https://git.v0id.ovh/n3wt-innov/n3wt-school.git
synced 2026-01-28 23:43:22 +00:00
feat: Gestion de la création d'un nouveau guardian, de l'association
avec un guardian dumême établissement, et de l'association avec un guardian d'un autre établissement
This commit is contained in:
@ -16,7 +16,24 @@ class ProfileSerializer(serializers.ModelSerializer):
|
||||
|
||||
def get_roles(self, obj):
|
||||
roles = ProfileRole.objects.filter(profile=obj)
|
||||
return [{'role_type': role.role_type, 'establishment': role.establishment.id, 'establishment_name': role.establishment.name, 'is_active': role.is_active} for role in roles]
|
||||
roles_data = []
|
||||
for role in roles:
|
||||
# Récupérer l'ID de l'associated_person en fonction du type de rôle
|
||||
if role.role_type == ProfileRole.RoleType.PROFIL_PARENT:
|
||||
guardian = Guardian.objects.filter(profile_role=role).first()
|
||||
id_associated_person = guardian.id if guardian else None
|
||||
else:
|
||||
teacher = Teacher.objects.filter(profile_role=role).first()
|
||||
id_associated_person = teacher.id if teacher else None
|
||||
|
||||
roles_data.append({
|
||||
'id_associated_person': id_associated_person,
|
||||
'role_type': role.role_type,
|
||||
'establishment': role.establishment.id,
|
||||
'establishment_name': role.establishment.name,
|
||||
'is_active': role.is_active,
|
||||
})
|
||||
return roles_data
|
||||
|
||||
def create(self, validated_data):
|
||||
user = Profile(
|
||||
@ -107,6 +124,7 @@ class ProfileRoleSerializer(serializers.ModelSerializer):
|
||||
"registration_status": registration_status
|
||||
})
|
||||
return {
|
||||
"id": guardian.id,
|
||||
"guardian_name": f"{guardian.last_name} {guardian.first_name}",
|
||||
"students": students_list
|
||||
}
|
||||
@ -118,6 +136,7 @@ class ProfileRoleSerializer(serializers.ModelSerializer):
|
||||
specialities = teacher.specialities.all()
|
||||
specialities_list = [{"name": speciality.name, "color_code": speciality.color_code} for speciality in specialities]
|
||||
return {
|
||||
"id": teacher.id,
|
||||
"teacher_name": f"{teacher.last_name} {teacher.first_name}",
|
||||
"classes": classes_list,
|
||||
"specialities": specialities_list
|
||||
|
||||
@ -4,7 +4,6 @@ from django.http.response import JsonResponse
|
||||
from django.views.decorators.csrf import ensure_csrf_cookie, csrf_exempt, csrf_protect
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.cache import cache
|
||||
from django.middleware.csrf import get_token
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.parsers import JSONParser
|
||||
@ -24,7 +23,6 @@ from rest_framework.decorators import action, api_view
|
||||
|
||||
from Auth.serializers import ProfileSerializer, ProfileRoleSerializer
|
||||
from Subscriptions.models import RegistrationForm
|
||||
from Subscriptions.signals import clear_cache
|
||||
import Subscriptions.mailManager as mailer
|
||||
import Subscriptions.util as util
|
||||
import logging
|
||||
@ -204,7 +202,6 @@ class LoginView(APIView):
|
||||
|
||||
login(request, user)
|
||||
user.save()
|
||||
clear_cache()
|
||||
retour = ''
|
||||
|
||||
# Récupérer tous les rôles de l'utilisateur avec le type spécifié
|
||||
@ -423,7 +420,6 @@ class SubscribeView(APIView):
|
||||
else:
|
||||
return JsonResponse(role_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
clear_cache()
|
||||
retour = error.returnMessage[error.MESSAGE_ACTIVATION_PROFILE]
|
||||
retourErreur = ''
|
||||
return JsonResponse({'message': retour, 'errorMessage': retourErreur, "errorFields": errorFields, "id": profil.id}, safe=False)
|
||||
@ -473,7 +469,6 @@ class NewPasswordView(APIView):
|
||||
profil.code = util.genereRandomCode(12)
|
||||
profil.datePeremption = util.calculeDatePeremption(util._now(), settings.EXPIRATION_URL_NB_DAYS)
|
||||
profil.save()
|
||||
clear_cache()
|
||||
retourErreur = ''
|
||||
retour = error.returnMessage[error.MESSAGE_REINIT_PASSWORD] % (newProfilConnection.get('email'))
|
||||
mailer.envoieReinitMotDePasse(newProfilConnection.get('email'), profil.code)
|
||||
@ -527,7 +522,6 @@ class ResetPasswordView(APIView):
|
||||
profil.code = ''
|
||||
profil.datePeremption = ''
|
||||
profil.save()
|
||||
clear_cache()
|
||||
retourErreur = ''
|
||||
|
||||
return JsonResponse({'message': retour, "errorMessage": retourErreur, "errorFields": errorFields}, safe=False)
|
||||
|
||||
Reference in New Issue
Block a user