mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2025-11-14 16:21:34 +01:00
Compare commits
4 Commits
ad7f25f6c9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27a4bdf98e | ||
|
|
af60d27402 | ||
|
|
49729485b7 | ||
|
|
c8eefb0991 |
File diff suppressed because it is too large
Load Diff
@@ -80,13 +80,17 @@ class ParticipationForm(forms.ModelForm):
|
||||
if settings.SINGLE_TOURNAMENT:
|
||||
del self.fields['tournament']
|
||||
self.helper = FormHelper()
|
||||
idf_text = _(
|
||||
'For the tournaments in the region "Île-de-France": registration is '
|
||||
'unified for each tournament. By choosing a tournament "Île-de-France", '
|
||||
"you're accepting that your team may be selected for one of these tournaments. "
|
||||
'In case of date conflict, please write them in your motivation letter.'
|
||||
)
|
||||
|
||||
idf_warning_banner = f"""
|
||||
<div class=\"alert alert-warning\">
|
||||
<h5 class=\"alert-heading\">{_("IMPORTANT")}</h4>
|
||||
{_("""For the tournaments in the region "Île-de-France": registration is
|
||||
unified for each tournament. By choosing a tournament "Île-de-France",
|
||||
you're accepting that your team may be selected for one of these tournaments.
|
||||
In case of date conflict, please write them in your motivation letter.""")}
|
||||
{idf_text}
|
||||
</div>
|
||||
"""
|
||||
unified_registration_tournament_ids = ",".join(
|
||||
|
||||
@@ -71,12 +71,20 @@ class Team(models.Model):
|
||||
def coaches(self):
|
||||
return self.participants.filter(coachregistration__isnull=False)
|
||||
|
||||
@property
|
||||
def scientific_coaches(self):
|
||||
return self.participants.filter(coachregistration__isnull=False, coachregistration__is_scientific_coach=True)
|
||||
|
||||
@property
|
||||
def accompanying_coaches(self):
|
||||
return self.participants.filter(coachregistration__isnull=False, coachregistration__is_accompanying_coach=True)
|
||||
|
||||
def can_validate(self):
|
||||
if any(not r.email_confirmed for r in self.participants.all()):
|
||||
return False
|
||||
if self.students.count() < 4:
|
||||
return False
|
||||
if not self.coaches.exists():
|
||||
if not self.scientific_coaches.exists():
|
||||
return False
|
||||
if not self.participation.tournament:
|
||||
return False
|
||||
|
||||
@@ -22,9 +22,18 @@
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Access code:" %}</dt>
|
||||
<dd class="col-sm-6">{{ team.access_code }}</dd>
|
||||
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Coaches:" %}</dt>
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Scientific coaches:" %}</dt>
|
||||
<dd class="col-sm-6">
|
||||
{% for coach in team.coaches.all %}
|
||||
{% for coach in team.scientific_coaches.all %}
|
||||
<a href="{% url "registration:user_detail" pk=coach.user.pk %}">{{ coach }}</a>{% if not forloop.last %},{% endif %}
|
||||
{% empty %}
|
||||
{% trans "any" %}
|
||||
{% endfor %}
|
||||
</dd>
|
||||
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Accompanying coaches:" %}</dt>
|
||||
<dd class="col-sm-6">
|
||||
{% for coach in team.accompanying_coaches.all %}
|
||||
<a href="{% url "registration:user_detail" pk=coach.user.pk %}">{{ coach }}</a>{% if not forloop.last %},{% endif %}
|
||||
{% empty %}
|
||||
{% trans "any" %}
|
||||
|
||||
@@ -285,6 +285,7 @@ class TestStudentParticipation(TestCase):
|
||||
self.coach.registration.vaccine_sheet = "authorization/vaccine/coach"
|
||||
self.coach.registration.photo_authorization = "authorization/photo/coach"
|
||||
self.coach.registration.email_confirmed = True
|
||||
self.coach.registration.is_scientific_coach = True
|
||||
self.coach.registration.save()
|
||||
|
||||
self.client.force_login(self.superuser)
|
||||
|
||||
@@ -61,7 +61,7 @@ class RegistrationAdmin(PolymorphicParentModelAdmin):
|
||||
|
||||
@admin.register(ParticipantRegistration)
|
||||
class ParticipantRegistrationAdmin(PolymorphicChildModelAdmin):
|
||||
list_display = ('user', 'first_name', 'last_name', 'type', 'team', 'email_confirmed',)
|
||||
list_display = ('user', 'first_name', 'last_name', 'type', 'team', 'email_confirmed')
|
||||
list_filter = ('email_confirmed',)
|
||||
search_fields = ('user__first_name', 'user__last_name', 'user__email',)
|
||||
autocomplete_fields = ('user', 'team',)
|
||||
@@ -93,7 +93,7 @@ class StudentRegistrationAdmin(PolymorphicChildModelAdmin):
|
||||
|
||||
@admin.register(CoachRegistration)
|
||||
class CoachRegistrationAdmin(PolymorphicChildModelAdmin):
|
||||
list_display = ('user', 'first_name', 'last_name', 'team', 'email_confirmed',)
|
||||
list_display = ('user', 'first_name', 'last_name', 'team', 'email_confirmed', 'is_accompanying_coach', 'is_scientific_coach')
|
||||
list_filter = ('email_confirmed',)
|
||||
search_fields = ('user__first_name', 'user__last_name', 'user__email',)
|
||||
autocomplete_fields = ('user', 'team',)
|
||||
|
||||
@@ -251,6 +251,18 @@ class CoachRegistrationForm(forms.ModelForm):
|
||||
"""
|
||||
A coach can tell its professional activity.
|
||||
"""
|
||||
ACCOMPANYING_CONFIRM_CHOICES = [
|
||||
("presence", _("I undertake to be present throughout the entire tournament weekend alongside the team (including overnight stays).")),
|
||||
("rules", _("I undertake to respond to the team's (non-mathematical) problems and not to hesitate to discuss them with the tournament organisers, who will be able to help.")),
|
||||
("cancelling", _("In case of absence, I undertake to notify the organisers as soon as possible, providing a replacement if possible.")),
|
||||
]
|
||||
|
||||
confirm_accompanying = forms.MultipleChoiceField(
|
||||
required=False,
|
||||
widget=forms.CheckboxSelectMultiple,
|
||||
choices=ACCOMPANYING_CONFIRM_CHOICES,
|
||||
label=_("Responsabilities of accompanying coaches")
|
||||
)
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
if not settings.SUGGEST_ANIMATH:
|
||||
@@ -258,9 +270,21 @@ class CoachRegistrationForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = CoachRegistration
|
||||
fields = ('team', 'gender', 'address', 'zip_code', 'city', 'country', 'phone_number',
|
||||
fields = ('team', 'is_scientific_coach', 'is_accompanying_coach', 'confirm_accompanying', 'gender', 'address', 'zip_code', 'city', 'country', 'phone_number',
|
||||
'last_degree', 'professional_activity', 'health_issues', 'housing_constraints',
|
||||
'give_contact_to_animath', 'email_confirmed',)
|
||||
'give_contact_to_animath', 'email_confirmed')
|
||||
|
||||
def clean(self):
|
||||
cleaned = super().clean()
|
||||
if cleaned.get("is_accompanying_coach"):
|
||||
selected = set(cleaned.get("confirm_accompanying") or [])
|
||||
required = {key for key, _ in self.ACCOMPANYING_CONFIRM_CHOICES}
|
||||
if selected != required:
|
||||
self.add_error(
|
||||
"confirm_accompanying",
|
||||
_("Please tick all the required confirmations."),
|
||||
)
|
||||
return cleaned
|
||||
|
||||
|
||||
class VolunteerRegistrationForm(forms.ModelForm):
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 5.2.8 on 2025-11-06 18:53
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('registration', '0015_alter_participantregistration_gender'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='coachregistration',
|
||||
name='is_accompanying_coach',
|
||||
field=models.BooleanField(default=False, help_text='Accompanies the team during the weekend and stays for the entire tournament.', verbose_name='Accompanying coach'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='coachregistration',
|
||||
name='is_scientific_coach',
|
||||
field=models.BooleanField(default=False, help_text='Provides scientific guidance: methodology, content review, and project mentoring during the preparation phase. <a href="https://tfjm.org/wp-content/uploads/2024/01/note____l_intention_des_encadrants.pdf" target="_blank" rel="noopener">see practical sheet</a>.', verbose_name='Scientific coach'),
|
||||
),
|
||||
]
|
||||
@@ -14,6 +14,8 @@ from django.urls import reverse, reverse_lazy
|
||||
from django.utils import timezone, translation
|
||||
from django.utils.crypto import get_random_string
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.functional import lazy
|
||||
from django.utils.html import format_html
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
from django.utils.text import format_lazy
|
||||
from django.utils.timezone import localtime
|
||||
@@ -23,6 +25,8 @@ from polymorphic.models import PolymorphicModel
|
||||
from tfjm import helloasso
|
||||
from tfjm.tokens import email_validation_token
|
||||
|
||||
format_html_lazy = lazy(format_html, str)
|
||||
|
||||
|
||||
class Registration(PolymorphicModel):
|
||||
"""
|
||||
@@ -527,6 +531,28 @@ class CoachRegistration(ParticipantRegistration):
|
||||
verbose_name=_("professional activity"),
|
||||
)
|
||||
|
||||
is_scientific_coach = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_("Scientific coach"),
|
||||
help_text=format_html_lazy(
|
||||
'{} <a href="{}" target="_blank" rel="noopener">{}</a>.',
|
||||
_("Provides scientific guidance: methodology, content review, and project mentoring during the preparation phase."),
|
||||
"https://tfjm.org/wp-content/uploads/2024/01/note____l_intention_des_encadrants.pdf",
|
||||
_("see practical sheet"),
|
||||
),
|
||||
)
|
||||
|
||||
is_accompanying_coach = models.BooleanField(
|
||||
default=False,
|
||||
verbose_name=_("Accompanying coach"),
|
||||
help_text=format_html_lazy(
|
||||
'{} <a href="{}" target="_blank" rel="noopener">{}</a>.',
|
||||
_("Accompanies the team during the weekend and stays for the entire tournament."),
|
||||
"https://tfjm.org/wp-content/uploads/2025/11/Fiches_pratiques_TFJM2.pdf",
|
||||
_("see practical sheet"),
|
||||
)
|
||||
)
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
return _("coach")
|
||||
|
||||
@@ -51,15 +51,33 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
let role_elem = document.getElementById("id_role")
|
||||
|
||||
function setup_requirements() {
|
||||
const main = document.getElementById('id_is_accompanying_coach');
|
||||
const group = document.getElementById('div_id_confirm_accompanying');
|
||||
function toggle(){
|
||||
if(main.checked) {
|
||||
group.style.display = "block";
|
||||
} else {
|
||||
group.style.display = "none";
|
||||
}
|
||||
}
|
||||
main.addEventListener('change', toggle);
|
||||
toggle();
|
||||
}
|
||||
|
||||
function updateView () {
|
||||
let selected_role = role_elem.options[role_elem.selectedIndex].value
|
||||
if (selected_role === "participant")
|
||||
document.getElementById("registration_form").innerHTML = document.getElementById("student_registration_form").innerHTML
|
||||
else
|
||||
document.getElementById("registration_form").innerHTML = document.getElementById("coach_registration_form").innerHTML
|
||||
setup_requirements();
|
||||
}
|
||||
role_elem.addEventListener('change', updateView)
|
||||
updateView()
|
||||
})
|
||||
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -151,6 +151,12 @@
|
||||
<dd class="col-sm-6"><a href="mailto:{{ email }}">{{ email }}</a></dd>
|
||||
{% endwith %}
|
||||
{% elif user_object.registration.coachregistration %}
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Scientific coach:" %}</dt>
|
||||
<dd class="col-sm-6">{{ user_object.registration.is_scientific_coach|yesno }}</dd>
|
||||
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Accompanying coach:" %}</dt>
|
||||
<dd class="col-sm-6">{{ user_object.registration.is_accompanying_coach|yesno }}</dd>
|
||||
|
||||
<dt class="col-sm-6 text-sm-end">{% trans "Most recent degree:" %}</dt>
|
||||
<dd class="col-sm-6">{{ user_object.registration.last_degree }}</dd>
|
||||
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
<div id="messages">
|
||||
<div class="alert alert-info fade show" role="alert">
|
||||
{% load i18n %}
|
||||
<h2>{% trans "Dates pending" %}</h2>
|
||||
|
||||
<p>{% blocktrans %}Since the dates for the tournaments in Bordeaux, Strasbourg, Metz and Occitanie have not yet been set, we kindly invite the teams concerned to wait a little longer. If you wish, you may register for another tournament and send us an email to let us know of your interest; we will keep you informed as soon as the final dates are confirmed.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
</div>
|
||||
{% for message in messages %}
|
||||
<div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
||||
|
||||
Reference in New Issue
Block a user