mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2025-02-23 21:41:19 +00:00
Compare commits
4 Commits
a3545c53e0
...
603ee76664
Author | SHA1 | Date | |
---|---|---|---|
|
603ee76664 | ||
|
147cbff7f5 | ||
|
8878ae8d8d | ||
|
4c8347072c |
@ -3,7 +3,7 @@ FROM python:3.12-alpine
|
|||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
ENV DJANGO_ALLOW_ASYNC_UNSAFE 1
|
ENV DJANGO_ALLOW_ASYNC_UNSAFE 1
|
||||||
|
|
||||||
RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev npm postgresql-dev libmagic texlive texmf-dist-latexextra
|
RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev npm postgresql-dev libmagic texlive texmf-dist-fontsextra texmf-dist-latexextra
|
||||||
|
|
||||||
RUN apk add --no-cache bash
|
RUN apk add --no-cache bash
|
||||||
|
|
||||||
|
@ -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',)
|
||||||
|
@ -81,7 +81,7 @@ ETEAM commits itself, in accordance with the legal regulations in force relating
|
|||||||
\fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
|
\fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
|
||||||
\bigskip
|
\bigskip
|
||||||
|
|
||||||
Signature preceded by the words \og read and approved \fg{}
|
Signature preceded by the words "read and approved"
|
||||||
\medskip
|
\medskip
|
||||||
|
|
||||||
|
|
||||||
|
@ -81,12 +81,17 @@ ETEAM commits itself, in accordance with the legal regulations in force relating
|
|||||||
\fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
|
\fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
|
||||||
\bigskip
|
\bigskip
|
||||||
|
|
||||||
Signature preceded by the words \og read and approved \fg{}
|
Signature preceded by the words "read and approved"
|
||||||
\medskip
|
\medskip
|
||||||
|
|
||||||
|
|
||||||
\begin{minipage}[c]{0.5\textwidth}
|
\begin{minipage}[c]{0.5\textwidth}
|
||||||
|
|
||||||
|
\underline{Legal representative:}\\
|
||||||
|
|
||||||
|
\end{minipage}
|
||||||
|
\begin{minipage}[c]{0.5\textwidth}
|
||||||
|
|
||||||
\underline{The participant:}\\
|
\underline{The participant:}\\
|
||||||
|
|
||||||
|
|
||||||
|
@ -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",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user