Merge branch 'dev' into 'master'

Unleash the beast See merge request animath/si/plateforme-tfjm!9
2025-11-04 03:42:11 +01:00 · 2021-01-22 22:28:19 +00:00
parent 4c476a50ea 0cd7ff512f
commit 68a5467a35
9 changed files with 17 additions and 67 deletions
--- a/apps/participation/migrations/0001_initial.py
+++ b/apps/participation/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.11 on 2021-01-21 21:06
+# Generated by Django 3.0.11 on 2021-01-22 18:26

 import datetime
 import django.core.validators
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('round', models.PositiveSmallIntegerField(choices=[(1, 'Round 1'), (2, 'Round 2')], verbose_name='round')),
-                ('bbb_code', models.CharField(blank=True, default='', help_text='The code of the form xxx-xxx-xxx at the end of the BBB link.', max_length=11, validators=[django.core.validators.RegexValidator('[a-z]{3}-[a-z]{3}-[a-z]{3}')], verbose_name='BigBlueButton code')),
+                ('bbb_url', models.CharField(blank=True, default='', help_text='The link of the BBB visio for this pool.', max_length=255, verbose_name='BigBlueButton URL')),
            ],
            options={
                'verbose_name': 'pool',
@@ -99,6 +99,7 @@ class Migration(migrations.Migration):
                ('name', models.CharField(max_length=255, unique=True, verbose_name='name')),
                ('trigram', models.CharField(help_text='The trigram must be composed of three uppercase letters.', max_length=3, unique=True, validators=[django.core.validators.RegexValidator('[A-Z]{3}')], verbose_name='trigram')),
                ('access_code', models.CharField(help_text='The access code let other people to join the team.', max_length=6, verbose_name='access code')),
+                ('motivation_letter', models.FileField(blank=True, default='', upload_to=participation.models.get_motivation_letter_filename, verbose_name='motivation letter')),
            ],
            options={
                'verbose_name': 'team',
--- a/apps/participation/migrations/0002_auto_20210122_1926.py
+++ b/apps/participation/migrations/0002_auto_20210122_1926.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.11 on 2021-01-21 21:06
+# Generated by Django 3.0.11 on 2021-01-22 18:26

 import address.models
 from django.db import migrations, models
@@ -10,8 +10,8 @@ class Migration(migrations.Migration):
    initial = True

    dependencies = [
-        ('address', '0003_auto_20200830_1851'),
        ('registration', '0001_initial'),
+        ('address', '0003_auto_20200830_1851'),
        ('participation', '0001_initial'),
    ]

--- a/apps/participation/migrations/0003_team_motivation_letter.py
+++ b/apps/participation/migrations/0003_team_motivation_letter.py
@@ -1,19 +0,0 @@
-# Generated by Django 3.0.11 on 2021-01-22 08:15
-
-from django.db import migrations, models
-import participation.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('participation', '0002_auto_20210121_2206'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='team',
-            name='motivation_letter',
-            field=models.FileField(blank=True, default='', upload_to=participation.models.get_motivation_letter_filename, verbose_name='motivation letter'),
-        ),
-    ]
--- a/apps/participation/migrations/0004_auto_20210122_1827.py
+++ b/apps/participation/migrations/0004_auto_20210122_1827.py
@@ -1,22 +0,0 @@
-# Generated by Django 3.0.11 on 2021-01-22 17:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('participation', '0003_team_motivation_letter'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='pool',
-            name='bbb_code',
-        ),
-        migrations.AddField(
-            model_name='pool',
-            name='bbb_url',
-            field=models.CharField(blank=True, default='', help_text='The link of the BBB visio for this pool.', max_length=255, verbose_name='BigBlueButton URL'),
-        ),
-    ]
--- a/apps/participation/tables.py
+++ b/apps/participation/tables.py
@@ -74,6 +74,7 @@ class TournamentTable(tables.Table):
        }
        model = Tournament
        fields = ('name', 'date',)
+        order_by = ('name', )
        template_name = 'django_tables2/bootstrap4.html'


--- a/apps/registration/migrations/0001_initial.py
+++ b/apps/registration/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.11 on 2021-01-21 21:06
+# Generated by Django 3.0.11 on 2021-01-22 18:26

 import address.models
 import datetime
@@ -14,9 +14,9 @@ class Migration(migrations.Migration):
    initial = True

    dependencies = [
-        ('address', '0003_auto_20200830_1851'),
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ('contenttypes', '0002_remove_content_type_name'),
+        ('address', '0003_auto_20200830_1851'),
        ('participation', '0001_initial'),
    ]

@@ -40,6 +40,7 @@ class Migration(migrations.Migration):
            fields=[
                ('registration_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registration.Registration')),
                ('birth_date', models.DateField(default=datetime.date.today, verbose_name='birth date')),
+                ('gender', models.CharField(choices=[('female', 'Female'), ('male', 'Male'), ('other', 'Other')], default='other', max_length=6, verbose_name='gender')),
                ('phone_number', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, region=None, verbose_name='phone number')),
                ('photo_authorization', models.FileField(blank=True, default='', upload_to=registration.models.get_random_photo_filename, verbose_name='photo authorization')),
                ('address', address.models.AddressField(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='address.Address', verbose_name='address')),
--- a/apps/registration/migrations/0002_participantregistration_gender.py
+++ b/apps/registration/migrations/0002_participantregistration_gender.py
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.11 on 2021-01-22 08:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('registration', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='participantregistration',
-            name='gender',
-            field=models.CharField(choices=[('female', 'Female'), ('male', 'Male'), ('other', 'Other')], default='other', max_length=6, verbose_name='gender'),
-        ),
-    ]
--- a/apps/registration/templates/registration/user_detail.html
+++ b/apps/registration/templates/registration/user_detail.html
@@ -16,7 +16,7 @@

            <dt class="col-sm-6 text-right">{% trans "First name:" %}</dt>
            <dd class="col-sm-6">{{ user_object.first_name }}</dd>
-StudentRegistrationForm(
+
            <dt class="col-sm-6 text-right">{% trans "Email:" %}</dt>
            <dd class="col-sm-6"><a href="mailto:{{ user_object.email }}">{{ user_object.email }}</a>
                {% if not user_object.registration.email_confirmed %} (<em>{% trans "Not confirmed" %}, <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">{% trans "resend the validation link" %}</a></em>){% endif %}</dd>
--- a/tfjm/templates/base.html
+++ b/tfjm/templates/base.html
@@ -162,7 +162,13 @@
                {% endblocktrans %}
            </div>
        {% endif %}
-        <div id="messages"></div>
+        <div id="messages">
+            <div class="alert alert-success">
+                Les inscriptions sont désormais ouvertes ! Si jamais vous aviez essayé de vous inscrire le 22 janvier,
+                il est possible que votre compte ait été supprimé. Vous pouvez désormais le recréer. Merci pour votre
+                patience, et bon TFJM² ! :)
+            </div>
+        </div>
        <div id="content">
            {% block content %}
                <p>Default content...</p>