mirror of
				https://gitlab.com/animath/si/plateforme.git
				synced 2025-10-31 08:09:52 +01:00 
			
		
		
		
	Allow to remove the checkbox to be recontacted by Animath
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
		| @@ -2,6 +2,7 @@ | |||||||
| # SPDX-License-Identifier: GPL-3.0-or-later | # SPDX-License-Identifier: GPL-3.0-or-later | ||||||
|  |  | ||||||
| from django import forms | from django import forms | ||||||
|  | from django.conf import settings | ||||||
| from django.contrib.auth.forms import UserCreationForm | from django.contrib.auth.forms import UserCreationForm | ||||||
| from django.contrib.auth.models import User | from django.contrib.auth.models import User | ||||||
| from django.core.exceptions import ValidationError | from django.core.exceptions import ValidationError | ||||||
| @@ -103,6 +104,8 @@ class StudentRegistrationForm(forms.ModelForm): | |||||||
|     def __init__(self, *args, **kwargs): |     def __init__(self, *args, **kwargs): | ||||||
|         super().__init__(*args, **kwargs) |         super().__init__(*args, **kwargs) | ||||||
|         self.fields["birth_date"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d') |         self.fields["birth_date"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d') | ||||||
|  |         if not settings.SUGGEST_ANIMATH: | ||||||
|  |             del self.fields["give_contact_to_animath"] | ||||||
|  |  | ||||||
|     class Meta: |     class Meta: | ||||||
|         model = StudentRegistration |         model = StudentRegistration | ||||||
| @@ -248,6 +251,11 @@ class CoachRegistrationForm(forms.ModelForm): | |||||||
|     """ |     """ | ||||||
|     A coach can tell its professional activity. |     A coach can tell its professional activity. | ||||||
|     """ |     """ | ||||||
|  |     def __init__(self, *args, **kwargs): | ||||||
|  |         super().__init__(*args, **kwargs) | ||||||
|  |         if not settings.SUGGEST_ANIMATH: | ||||||
|  |             del self.fields["give_contact_to_animath"] | ||||||
|  |  | ||||||
|     class Meta: |     class Meta: | ||||||
|         model = CoachRegistration |         model = CoachRegistration | ||||||
|         fields = ('team', 'gender', 'address', 'zip_code', 'city', 'country', 'phone_number', |         fields = ('team', 'gender', 'address', 'zip_code', 'city', 'country', 'phone_number', | ||||||
| @@ -259,6 +267,11 @@ class VolunteerRegistrationForm(forms.ModelForm): | |||||||
|     """ |     """ | ||||||
|     A volunteer can also tell its professional activity. |     A volunteer can also tell its professional activity. | ||||||
|     """ |     """ | ||||||
|  |     def __init__(self, *args, **kwargs): | ||||||
|  |         super().__init__(*args, **kwargs) | ||||||
|  |         if not settings.SUGGEST_ANIMATH: | ||||||
|  |             del self.fields["give_contact_to_animath"] | ||||||
|  |  | ||||||
|     class Meta: |     class Meta: | ||||||
|         model = VolunteerRegistration |         model = VolunteerRegistration | ||||||
|         fields = ('professional_activity', 'admin', 'give_contact_to_animath', 'email_confirmed',) |         fields = ('professional_activity', 'admin', 'give_contact_to_animath', 'email_confirmed',) | ||||||
|   | |||||||
| @@ -165,8 +165,10 @@ | |||||||
|                 <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd> |                 <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd> | ||||||
|             {% endif %} |             {% endif %} | ||||||
|  |  | ||||||
|  |             {% if TFJM.SUGGEST_ANIMATH %} | ||||||
|                 <dt class="col-sm-6 text-sm-end">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt> |                 <dt class="col-sm-6 text-sm-end">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt> | ||||||
|                 <dd class="col-sm-6">{{ user_object.registration.give_contact_to_animath|yesno }}</dd> |                 <dd class="col-sm-6">{{ user_object.registration.give_contact_to_animath|yesno }}</dd> | ||||||
|  |             {% endif %} | ||||||
|         </dl> |         </dl> | ||||||
|  |  | ||||||
|         {% if TFJM.PAYMENT_MANAGEMENT and user_object.registration.participates and user_object.registration.team.participation.valid %} |         {% if TFJM.PAYMENT_MANAGEMENT and user_object.registration.participates and user_object.registration.team.participation.valid %} | ||||||
|   | |||||||
| @@ -14,5 +14,6 @@ def tfjm_context(request): | |||||||
|             'HEALTH_SHEET_REQUIRED': settings.HEALTH_SHEET_REQUIRED, |             'HEALTH_SHEET_REQUIRED': settings.HEALTH_SHEET_REQUIRED, | ||||||
|             'VACCINE_SHEET_REQUIRED': settings.VACCINE_SHEET_REQUIRED, |             'VACCINE_SHEET_REQUIRED': settings.VACCINE_SHEET_REQUIRED, | ||||||
|             'MOTIVATION_LETTER_REQUIRED': settings.MOTIVATION_LETTER_REQUIRED, |             'MOTIVATION_LETTER_REQUIRED': settings.MOTIVATION_LETTER_REQUIRED, | ||||||
|  |             'SUGGEST_ANIMATH': settings.SUGGEST_ANIMATH, | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -355,6 +355,7 @@ if TFJM_APP == "TFJM": | |||||||
|     HEALTH_SHEET_REQUIRED = True |     HEALTH_SHEET_REQUIRED = True | ||||||
|     VACCINE_SHEET_REQUIRED = True |     VACCINE_SHEET_REQUIRED = True | ||||||
|     MOTIVATION_LETTER_REQUIRED = True |     MOTIVATION_LETTER_REQUIRED = True | ||||||
|  |     SUGGEST_ANIMATH = True | ||||||
|  |  | ||||||
|     PROBLEMS = [ |     PROBLEMS = [ | ||||||
|         "Triominos", |         "Triominos", | ||||||
| @@ -376,7 +377,7 @@ elif TFJM_APP == "ETEAM": | |||||||
|     HEALTH_SHEET_REQUIRED = False |     HEALTH_SHEET_REQUIRED = False | ||||||
|     VACCINE_SHEET_REQUIRED = False |     VACCINE_SHEET_REQUIRED = False | ||||||
|     MOTIVATION_LETTER_REQUIRED = False |     MOTIVATION_LETTER_REQUIRED = False | ||||||
|  |     SUGGEST_ANIMATH = False | ||||||
|  |  | ||||||
|     PROBLEMS = [ |     PROBLEMS = [ | ||||||
|         "Exploring Flatland", |         "Exploring Flatland", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user