From: Yoan Le Clanche Date: Tue, 13 Oct 2026 11:05:06 +0000 (+0200) Subject: Update to register form X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fae-docker-dev;p=teleforma.git Update to register form --- diff --git a/teleforma/forms.py b/teleforma/forms.py index 3c59ad46..b9ce5192 100644 --- a/teleforma/forms.py +++ b/teleforma/forms.py @@ -239,7 +239,8 @@ else: training = ModelChoiceField(label='Formation', queryset=Training.objects.filter(available=True)) courses = ModelChoiceField(label='Matières', - queryset=Course.objects.filter(id__in=settings.TELEFORMA_REGISTER_COURSE_CHOICE)) + queryset=Course.objects.filter(id__in=settings.TELEFORMA_REGISTER_COURSE_CHOICE), + required=False) training_adaptability = forms.ChoiceField(choices=TRUE_FALSE_CHOICES, label="Avez-vous besoin d'adaptabilité de formation ?", @@ -250,8 +251,6 @@ else: required=False, widget=forms.Select()) - - promo_code = CharField(label=_('Code promo'), max_length=100, required=False) payment_schedule = ChoiceField(label=_(u'Échéancier de paiement'), choices=payment_schedule_choices, @@ -327,14 +326,14 @@ else: subscription_fees = training.cost student = Student(user=user, platform_only=platform_only, - promo_code=data.get('promo_code'), payment_schedule=data.get('payment_schedule'), training_adaptability=data.get('training_adaptability') == 'True', disability=data.get('disability') == 'True', subscription_fees=subscription_fees ) student.save() - student.courses.add(data.get('courses')) + if data.get('courses'): + student.courses.add(data.get('courses')) for course in Course.objects.filter(id__in=settings.TELEFORMA_REGISTER_COURSE_AUTOREGISTER): student.courses.add(course) student.trainings.add(data.get('training')) diff --git a/teleforma/templates/registration/registration_form.html b/teleforma/templates/registration/registration_form.html index bee05de4..58bbaa4b 100644 --- a/teleforma/templates/registration/registration_form.html +++ b/teleforma/templates/registration/registration_form.html @@ -129,11 +129,13 @@ href="http://crfpa.pre-barreau.com/tarifs/conditions-generales-dinscription">conditions générales d'inscription
+ {% if form.promo_code %} {{ form.promo_code.errors }} {{ form.promo_code }} + {% endif %} {{ form.captcha.errors }} diff --git a/teleforma/templates/registration/registration_pdf.html b/teleforma/templates/registration/registration_pdf.html index 3692e521..7f628e22 100644 --- a/teleforma/templates/registration/registration_pdf.html +++ b/teleforma/templates/registration/registration_pdf.html @@ -83,6 +83,7 @@ {% if student.disability %}Oui{% else %}Non{% endif %} + {% if not is_ae %} {% trans "Studying level" %} : {{ student.level }} @@ -91,6 +92,7 @@ {% trans "IEJ" %} : {{ student.iej.name }} + {% endif %} {% trans "Training" %} : {{ student.training.name }} @@ -109,10 +111,12 @@ {% trans "Registration date" %} : {{ student.date_registered}} + {% if not is_ae %} {% trans "PROMO code" %} : {{ student.promo_code}} + {% endif %} diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py index 19fd6dc1..ba21bbd0 100644 --- a/teleforma/views/crfpa.py +++ b/teleforma/views/crfpa.py @@ -35,6 +35,7 @@ import datetime import xlrd +from django.conf import settings from django.contrib.auth import get_backends, login from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.models import User @@ -623,6 +624,7 @@ class RegistrationPDFView(PDFTemplateResponseMixin, TemplateView): profile.save() context['student'] = student + context['is_ae'] = settings.TELEFORMA_E_LEARNING_TYPE == 'AE' return context class RegistrationPDFViewDownload(RegistrationPDFView):