diff --git a/apps/participation/migrations/0001_initial.py b/apps/participation/migrations/0001_initial.py index 44441c6..3eb3749 100644 --- 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', diff --git a/apps/participation/migrations/0002_auto_20210121_2206.py b/apps/participation/migrations/0002_auto_20210122_1926.py similarity index 99% rename from apps/participation/migrations/0002_auto_20210121_2206.py rename to apps/participation/migrations/0002_auto_20210122_1926.py index 101af95..ac72117 100644 --- a/apps/participation/migrations/0002_auto_20210121_2206.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'), ] diff --git a/apps/participation/migrations/0003_team_motivation_letter.py b/apps/participation/migrations/0003_team_motivation_letter.py deleted file mode 100644 index fb298af..0000000 --- a/apps/participation/migrations/0003_team_motivation_letter.py +++ /dev/null @@ -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'), - ), - ] diff --git a/apps/participation/migrations/0004_auto_20210122_1827.py b/apps/participation/migrations/0004_auto_20210122_1827.py deleted file mode 100644 index 320c06e..0000000 --- a/apps/participation/migrations/0004_auto_20210122_1827.py +++ /dev/null @@ -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'), - ), - ] diff --git a/apps/participation/tables.py b/apps/participation/tables.py index 7dea78d..af0915a 100644 --- 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' diff --git a/apps/registration/migrations/0001_initial.py b/apps/registration/migrations/0001_initial.py index d0fd2db..f636a10 100644 --- 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')), diff --git a/apps/registration/migrations/0002_participantregistration_gender.py b/apps/registration/migrations/0002_participantregistration_gender.py deleted file mode 100644 index 0bf81fa..0000000 --- a/apps/registration/migrations/0002_participantregistration_gender.py +++ /dev/null @@ -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'), - ), - ] diff --git a/apps/registration/templates/registration/user_detail.html b/apps/registration/templates/registration/user_detail.html index 04b29d1..ba91172 100644 --- a/apps/registration/templates/registration/user_detail.html +++ b/apps/registration/templates/registration/user_detail.html @@ -16,7 +16,7 @@
{% trans "First name:" %}
{{ user_object.first_name }}
-StudentRegistrationForm( +
{% trans "Email:" %}
{{ user_object.email }} {% if not user_object.registration.email_confirmed %} ({% trans "Not confirmed" %}, {% trans "resend the validation link" %}){% endif %}
diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index 2c9f2f3..b42fdcd 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -162,7 +162,13 @@ {% endblocktrans %} {% endif %} -
+
+
+ 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² ! :) +
+
{% block content %}

Default content...