Merge pull request 'Thubrecht/daphne' (#815 ) from thubrecht/daphne into master

Reviewed-on: DGNum/gestioCOF#815
dev: update requirements and directly read the files
2024-07-30 18:40:56 +02:00 · 2024-07-12 14:54:14 +02:00 · 2024-07-12 14:54:14 +02:00 · 2024-07-12 14:54:14 +02:00 · 2024-07-12 14:54:14 +02:00 · 2024-07-12 14:54:14 +02:00
262 changed files with 1997 additions and 646 deletions
--- a/.envrc
+++ b/.envrc
@ -0,0 +1 @@
+use nix
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@ cof/settings.py
 settings.py
 *~
 venv/
+.venv/
 .vagrant
 /src
 media/
@ -18,4 +19,5 @@ media/
 .cache

 # VSCode
-.vscode/
+.vscode/
+.direnv
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -43,13 +43,21 @@ variables:
    # Keep this disabled for now, as it may kill GitLab...
    # coverage: '/TOTAL.*\s(\d+\.\d+)\%$/'

+kfettest:
+    stage: test
+    extends: .test_template
+    variables:
+        DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
+    script:
+        - coverage run manage.py test kfet
+
 coftest:
    stage: test
    extends: .test_template
    variables:
        DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
    script:
-        - coverage run manage.py test gestioncof bda kfet petitscours shared --parallel
+        - coverage run manage.py test gestioncof bda petitscours shared --parallel

 bdstest:
    stage: test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -23,8 +23,60 @@ adhérents ni des cotisations.

 ## TODO Prod

+- Lancer `python manage.py update_translation_fields` après la migration
+- Mettre à jour les units systemd `daphne.service` et `worker.service`
+
 - Créer un compte hCaptcha (https://www.hcaptcha.com/), au COF, et remplacer les secrets associés

+## Version ??? - ??/??/????
+
+## Version 0.15.1 - 15/06/2023
+
+### K-Fêt
+
+- Rattrape les erreurs d'envoi de mail de négatif
+- Utilise l'adresse chefs pour les envois de négatifs
+
+## Version 0.15 - 22/05/2023
+
+### K-Fêt
+
+- Rajoute un formulaire de contact
+- Rajoute un formulaire de demande de soirée
+- Désactive les mails d'envoi de négatifs sur les comptes gelés
+
+## Version 0.14 - 19/05/2023
+
+- Répare les dépendances en spécifiant toutes les versions
+
+### K-Fêt
+
+- Répare la gestion des changement d'heure via moment.js
+
+## Version 0.13 - 19/02/2023
+
+### K-Fêt
+
+- Rajoute la valeur des inventaires
+- Résout les problèmes de négatif ne disparaissant pas
+- Affiche son surnom s'il y en a un
+- Bugfixes
+
+## Version 0.12.1 - 03/10/2022
+
+### K-Fêt
+
+- Fixe un problème de rendu causé par l'agrandissement du menu
+
+- Mise à jour vers Channels 3.x et Django 3.2
+
+## Version 0.12 - 17/06/2022
+
+### K-Fêt
+
+- Ajoute une exception à la limite d'historique pour les comptes `LIQ` et `#13`
+- Répare le problème des étiquettes LIQ/Comptes K-Fêt inversées dans les stats des articles K-Fêt
+
 ## Version 0.11 - 26/10/2021

 ### COF
--- a/bda/admin.py
+++ b/bda/admin.py
@ -211,7 +211,6 @@ class AttributionAdminForm(forms.ModelForm):


 class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
-
    list_display = ("id", "spectacle", "participant", "given", "paid")
    search_fields = (
        "spectacle__title",
--- a/bda/algorithm.py
+++ b/bda/algorithm.py
@ -2,7 +2,6 @@ import random


 class Algorithm(object):
-
    shows = None
    ranks = None
    origranks = None
--- a/bda/management/commands/loadbdadevdata.py
+++ b/bda/management/commands/loadbdadevdata.py
@ -81,7 +81,7 @@ class Command(MyBaseCommand):
                shows = random.sample(
                    list(tirage.spectacle_set.all()), tirage.spectacle_set.count() // 2
                )
-                for (rank, show) in enumerate(shows):
+                for rank, show in enumerate(shows):
                    choices.append(
                        ChoixSpectacle(
                            participant=part,
--- a/bda/migrations/0001_initial.py
+++ b/bda/migrations/0001_initial.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

    operations = [
--- a/bda/migrations/0002_add_tirage.py
+++ b/bda/migrations/0002_add_tirage.py
@ -35,7 +35,6 @@ def fill_tirage_fields(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0001_initial")]

    operations = [
--- a/bda/migrations/0003_update_tirage_and_spectacle.py
+++ b/bda/migrations/0003_update_tirage_and_spectacle.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0002_add_tirage")]

    operations = [
--- a/bda/migrations/0004_mails-rappel.py
+++ b/bda/migrations/0004_mails-rappel.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0003_update_tirage_and_spectacle")]

    operations = [
--- a/bda/migrations/0005_encoding.py
+++ b/bda/migrations/0005_encoding.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0004_mails-rappel")]

    operations = [
--- a/bda/migrations/0006_add_tirage_switch.py
+++ b/bda/migrations/0006_add_tirage_switch.py
@ -18,7 +18,6 @@ def forwards_func(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0005_encoding")]

    operations = [
--- a/bda/migrations/0007_extends_spectacle.py
+++ b/bda/migrations/0007_extends_spectacle.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0006_add_tirage_switch")]

    operations = [
--- a/bda/migrations/0008_py3.py
+++ b/bda/migrations/0008_py3.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0007_extends_spectacle")]

    operations = [
--- a/bda/migrations/0009_revente.py
+++ b/bda/migrations/0009_revente.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0008_py3")]

    operations = [
--- a/bda/migrations/0010_spectaclerevente_shotgun.py
+++ b/bda/migrations/0010_spectaclerevente_shotgun.py
@ -21,7 +21,6 @@ def forwards_func(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0009_revente")]

    operations = [
--- a/bda/migrations/0011_tirage_appear_catalogue.py
+++ b/bda/migrations/0011_tirage_appear_catalogue.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0010_spectaclerevente_shotgun")]

    operations = [
--- a/bda/migrations/0012_notif_time.py
+++ b/bda/migrations/0012_notif_time.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0011_tirage_appear_catalogue")]

    operations = [
--- a/bda/migrations/0012_swap_double_choice.py
+++ b/bda/migrations/0012_swap_double_choice.py
@ -13,7 +13,6 @@ def swap_double_choice(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0011_tirage_appear_catalogue")]

    operations = [
--- a/bda/migrations/0013_merge_20180524_2123.py
+++ b/bda/migrations/0013_merge_20180524_2123.py
@ -6,7 +6,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0012_notif_time"), ("bda", "0012_swap_double_choice")]

    operations = []
--- a/bda/migrations/0014_attribution_paid_field.py
+++ b/bda/migrations/0014_attribution_paid_field.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0013_merge_20180524_2123")]

    operations = [
--- a/bda/migrations/0015_move_bda_payment.py
+++ b/bda/migrations/0015_move_bda_payment.py
@ -29,7 +29,6 @@ def set_participant_payment(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0014_attribution_paid_field")]

    operations = [
--- a/bda/migrations/0016_delete_participant_paid.py
+++ b/bda/migrations/0016_delete_participant_paid.py
@ -4,7 +4,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0015_move_bda_payment")]

    operations = [
--- a/bda/migrations/0017_participant_accepte_charte.py
+++ b/bda/migrations/0017_participant_accepte_charte.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("bda", "0016_delete_participant_paid")]

    operations = [
--- a/bda/migrations/0018_auto_20201021_1818.py
+++ b/bda/migrations/0018_auto_20201021_1818.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bda", "0017_participant_accepte_charte"),
    ]
--- a/bda/migrations/0019_auto_20220630_1245.py
+++ b/bda/migrations/0019_auto_20220630_1245.py
@ -0,0 +1,23 @@
+# Generated by Django 3.2.13 on 2022-06-30 10:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bda", "0018_auto_20201021_1818"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="choixspectacle",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="choixspectacle",
+            constraint=models.UniqueConstraint(
+                fields=("participant", "spectacle"), name="unique_participation"
+            ),
+        ),
+    ]
--- a/bda/models.py
+++ b/bda/models.py
@ -253,7 +253,11 @@ class ChoixSpectacle(models.Model):

    class Meta:
        ordering = ("priority",)
-        unique_together = (("participant", "spectacle"),)
+        constraints = [
+            models.UniqueConstraint(
+                fields=["participant", "spectacle"], name="unique_participation"
+            )
+        ]
        verbose_name = "voeu"
        verbose_name_plural = "voeux"

--- a/bda/templates/bda-attrib.html
+++ b/bda/templates/bda-attrib.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block extra_head %}
 	<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
--- a/bda/templates/bda/etat-places.html
+++ b/bda/templates/bda/etat-places.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}
  <h2>État des inscriptions BdA</h2>
--- a/bda/templates/bda/inscription-tirage.html
+++ b/bda/templates/bda/inscription-tirage.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block extra_head %}
 <script type="text/javascript" src="{% static 'vendor/jquery/jquery-ui.min.js' %}" ></script>
--- a/bda/templates/bda/participants.html
+++ b/bda/templates/bda/participants.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}
    <h2>{{ spectacle }}</h2>
--- a/bda/templates/bda/revente/confirm-shotgun.html
+++ b/bda/templates/bda/revente/confirm-shotgun.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}


 {%block realcontent %}
--- a/bda/templates/bda/revente/confirmed.html
+++ b/bda/templates/bda/revente/confirmed.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}
 <h2>Inscription à une revente</h2>
--- a/bda/templates/bda/revente/mail-success.html
+++ b/bda/templates/bda/revente/mail-success.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}

--- a/bda/templates/bda/revente/manage.html
+++ b/bda/templates/bda/revente/manage.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}

--- a/bda/templates/bda/revente/subscribe.html
+++ b/bda/templates/bda/revente/subscribe.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles%}
+{% load static %}

 {% block realcontent %}
  <h2>Inscriptions pour BdA-Revente</h2>
--- a/bda/templates/bda/revente/tirages.html
+++ b/bda/templates/bda/revente/tirages.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block realcontent %}

--- a/bda/templates/spectacle_list.html
+++ b/bda/templates/spectacle_list.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block extra_head %}
    <link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
--- a/bda/urls.py
+++ b/bda/urls.py
@ -1,74 +1,80 @@
-from django.conf.urls import url
+from django.urls import re_path

 from bda import views
 from bda.views import SpectacleListView
 from gestioncof.decorators import buro_required

 urlpatterns = [
-    url(
+    re_path(
        r"^inscription/(?P<tirage_id>\d+)$",
        views.inscription,
        name="bda-tirage-inscription",
    ),
-    url(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
-    url(r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"),
-    url(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
-    url(
+    re_path(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
+    re_path(
+        r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"
+    ),
+    re_path(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
+    re_path(
        r"^spectacles/(?P<tirage_id>\d+)$",
        buro_required(SpectacleListView.as_view()),
        name="bda-liste-spectacles",
    ),
-    url(
+    re_path(
        r"^spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$",
        views.spectacle,
        name="bda-spectacle",
    ),
-    url(
+    re_path(
        r"^spectacles/unpaid/(?P<tirage_id>\d+)$",
        views.UnpaidParticipants.as_view(),
        name="bda-unpaid",
    ),
-    url(
+    re_path(
        r"^spectacles/autocomplete$",
        views.spectacle_autocomplete,
        name="bda-spectacle-autocomplete",
    ),
-    url(
+    re_path(
        r"^participants/autocomplete$",
        views.participant_autocomplete,
        name="bda-participant-autocomplete",
    ),
    # Urls BdA-Revente
-    url(
+    re_path(
        r"^revente/(?P<tirage_id>\d+)/manage$",
        views.revente_manage,
        name="bda-revente-manage",
    ),
-    url(
+    re_path(
        r"^revente/(?P<tirage_id>\d+)/subscribe$",
        views.revente_subscribe,
        name="bda-revente-subscribe",
    ),
-    url(
+    re_path(
        r"^revente/(?P<tirage_id>\d+)/tirages$",
        views.revente_tirages,
        name="bda-revente-tirages",
    ),
-    url(
+    re_path(
        r"^revente/(?P<spectacle_id>\d+)/buy$",
        views.revente_buy,
        name="bda-revente-buy",
    ),
-    url(
+    re_path(
        r"^revente/(?P<revente_id>\d+)/confirm$",
        views.revente_confirm,
        name="bda-revente-confirm",
    ),
-    url(
+    re_path(
        r"^revente/(?P<tirage_id>\d+)/shotgun$",
        views.revente_shotgun,
        name="bda-revente-shotgun",
    ),
-    url(r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"),
-    url(r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"),
+    re_path(
+        r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"
+    ),
+    re_path(
+        r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"
+    ),
 ]
--- a/bda/views.py
+++ b/bda/views.py
@ -274,13 +274,13 @@ def do_tirage(tirage_elt, token):
    results = Algorithm(data["shows"], data["members"], choices)(token)

    # On compte les places attribuées et les déçus
-    for (_, members, losers) in results:
+    for _, members, losers in results:
        data["total_slots"] += len(members)
        data["total_losers"] += len(losers)

    # On calcule le déficit et les bénéfices pour le BdA
    # FIXME: le traitement de l'opéra est sale
-    for (show, members, _) in results:
+    for show, members, _ in results:
        deficit = (show.slots - len(members)) * show.price
        data["total_sold"] += show.slots * show.price
        if deficit >= 0:
@ -293,8 +293,8 @@ def do_tirage(tirage_elt, token):
    # so assign a single object for each Participant id
    members_uniq = {}
    members2 = {}
-    for (show, members, _) in results:
-        for (member, _, _, _) in members:
+    for show, members, _ in results:
+        for member, _, _, _ in members:
            if member.id not in members_uniq:
                members_uniq[member.id] = member
                members2[member] = []
--- a/bds/init.py
+++ b/bds/init.py
@ -1 +0,0 @@
-default_app_config = "bds.apps.BdsConfig"
--- a/bds/apps.py
+++ b/bds/apps.py
@ -1,5 +1,4 @@
-from django import apps as global_apps
-from django.apps import AppConfig
+from django.apps import AppConfig, apps as global_apps
 from django.db.models import Q
 from django.db.models.signals import post_migrate

--- a/bds/migrations/0001_initial.py
+++ b/bds/migrations/0001_initial.py
@ -8,7 +8,6 @@ import bds.models


 class Migration(migrations.Migration):
-
    initial = True

    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
--- a/bds/migrations/0002_bds_group.py
+++ b/bds/migrations/0002_bds_group.py
@ -9,7 +9,6 @@ def create_bds_buro_group(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("bds", "0001_initial")]

    operations = [
--- a/bds/migrations/0003_staff_permission.py
+++ b/bds/migrations/0003_staff_permission.py
@ -4,7 +4,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bds", "0002_bds_group"),
    ]
--- a/bds/migrations/0004_is_member_cotiz_type.py
+++ b/bds/migrations/0004_is_member_cotiz_type.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bds", "0003_staff_permission"),
    ]
--- a/bds/migrations/0005_remove_bdsprofile_certificate_file.py
+++ b/bds/migrations/0005_remove_bdsprofile_certificate_file.py
@ -4,7 +4,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bds", "0004_is_member_cotiz_type"),
    ]
--- a/bds/migrations/0006_bdsprofile_comments.py
+++ b/bds/migrations/0006_bdsprofile_comments.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bds", "0005_remove_bdsprofile_certificate_file"),
    ]
--- a/bds/templates/bds/base.html
+++ b/bds/templates/bds/base.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load bulma_utils %}

 <!DOCTYPE html>
--- a/bds/tests/test_views.py
+++ b/bds/tests/test_views.py
@ -31,7 +31,7 @@ class TestHomeView(TestCase):
            user, backend="django.contrib.auth.backends.ModelBackend"
        )
        resp = self.client.get(reverse("bds:home"))
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)


 class TestRegistrationView(TestCase):
@ -48,12 +48,12 @@ class TestRegistrationView(TestCase):
        # Logged-in but unprivileged GET
        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
        resp = client.get(url)
-        self.assertEquals(resp.status_code, 403)
+        self.assertEqual(resp.status_code, 403)

        # Burô user GET
        give_bds_buro_permissions(user)
        resp = client.get(url)
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)

    @mock.patch("gestioncof.signals.messages")
    def test_get(self, mock_messages):
@ -68,9 +68,9 @@ class TestRegistrationView(TestCase):
        # Logged-in but unprivileged GET
        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
        resp = client.get(url)
-        self.assertEquals(resp.status_code, 403)
+        self.assertEqual(resp.status_code, 403)

        # Burô user GET
        give_bds_buro_permissions(user)
        resp = client.get(url)
-        self.assertEquals(resp.status_code, 200)
+        self.assertEqual(resp.status_code, 200)
--- a/clubs/migrations/0001_initial.py
+++ b/clubs/migrations/0001_initial.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    initial = True

    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
--- a/events/migrations/0001_event.py
+++ b/events/migrations/0001_event.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    initial = True

    dependencies = []
--- a/events/migrations/0002_event_subscribers.py
+++ b/events/migrations/0002_event_subscribers.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("events", "0001_event"),
--- a/events/migrations/0003_options_and_extra_fields.py
+++ b/events/migrations/0003_options_and_extra_fields.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("events", "0002_event_subscribers"),
--- a/events/migrations/0004_unique_constraints.py
+++ b/events/migrations/0004_unique_constraints.py
@ -5,7 +5,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("events", "0003_options_and_extra_fields"),
--- a/events/migrations/0005_auto_20220630_1239.py
+++ b/events/migrations/0005_auto_20220630_1239.py
@ -0,0 +1,63 @@
+# Generated by Django 3.2.13 on 2022-06-30 10:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0004_unique_constraints"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="extrafield",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="extrafieldcontent",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="option",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="optionchoice",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="registration",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="extrafield",
+            constraint=models.UniqueConstraint(
+                fields=("event", "name"), name="unique_extra_field"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="extrafieldcontent",
+            constraint=models.UniqueConstraint(
+                fields=("field", "registration"), name="unique_extra_field_content"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="option",
+            constraint=models.UniqueConstraint(
+                fields=("event", "name"), name="unique_event_option"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="optionchoice",
+            constraint=models.UniqueConstraint(
+                fields=("option", "choice"), name="unique_option_choice"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="registration",
+            constraint=models.UniqueConstraint(
+                fields=("event", "user"), name="unique_registration"
+            ),
+        ),
+    ]
--- a/events/models.py
+++ b/events/models.py
@ -72,9 +72,13 @@ class Option(models.Model):
    multi_choices = models.BooleanField(_("choix multiples"), default=False)

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["event", "name"], name="unique_event_option"
+            )
+        ]
        verbose_name = _("option d'événement")
        verbose_name_plural = _("options d'événement")
-        unique_together = [["event", "name"]]

    def __str__(self):
        return self.name
@ -87,9 +91,13 @@ class OptionChoice(models.Model):
    choice = models.CharField(_("choix"), max_length=200)

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["option", "choice"], name="unique_option_choice"
+            )
+        ]
        verbose_name = _("choix d'option d'événement")
        verbose_name_plural = _("choix d'option d'événement")
-        unique_together = [["option", "choice"]]

    def __str__(self):
        return self.choice
@ -118,7 +126,9 @@ class ExtraField(models.Model):
    field_type = models.CharField(_("type de champ"), max_length=9, choices=FIELD_TYPE)

    class Meta:
-        unique_together = [["event", "name"]]
+        constraints = [
+            models.UniqueConstraint(fields=["event", "name"], name="unique_extra_field")
+        ]


 class ExtraFieldContent(models.Model):
@ -137,9 +147,13 @@ class ExtraFieldContent(models.Model):
            )

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["field", "registration"], name="unique_extra_field_content"
+            )
+        ]
        verbose_name = _("contenu d'un champ événement supplémentaire")
        verbose_name_plural = _("contenus d'un champ événement supplémentaire")
-        unique_together = [["field", "registration"]]

    def __str__(self):
        max_length = 50
@ -163,9 +177,13 @@ class Registration(models.Model):
            )

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["event", "user"], name="unique_registration"
+            )
+        ]
        verbose_name = _("inscription à un événement")
        verbose_name_plural = _("inscriptions à un événement")
-        unique_together = [["event", "user"]]

    def __str__(self):
        return "inscription de {} à {}".format(self.user, self.event)
--- a/gestioasso/asgi.py
+++ b/gestioasso/asgi.py
@ -1,8 +1,15 @@
+"""
+ASGI entrypoint. Configures Django and then runs the application
+defined in the ASGI_APPLICATION setting.
+"""
+
 import os

-from channels.asgi import get_channel_layer
+import django
+from channels.routing import get_default_application

 if "DJANGO_SETTINGS_MODULE" not in os.environ:
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gestioasso.settings.local")

-channel_layer = get_channel_layer()
+django.setup()
+application = get_default_application()
--- a/gestioasso/routing.py
+++ b/gestioasso/routing.py
@ -1,3 +1,20 @@
-from channels.routing import include
+from channels.auth import AuthMiddlewareStack
+from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
+from django.urls import path

-routing = [include("kfet.routing.routing", path=r"^/ws/k-fet")]
+from kfet.routing import KFRouter
+
+application = ProtocolTypeRouter(
+    {
+        # WebSocket chat handler
+        "websocket": AuthMiddlewareStack(
+            URLRouter(
+                [
+                    path("ws/k-fet", KFRouter),
+                ]
+            )
+        ),
+        "http": get_asgi_application(),
+    }
+)
--- a/gestioasso/settings/cof_prod.py
+++ b/gestioasso/settings/cof_prod.py
@ -7,6 +7,8 @@ Surcharge les settings définis dans common.py
 import os
 from datetime import timedelta

+from django.utils import timezone
+
 from .common import *  # NOQA
 from .common import (
    AUTHENTICATION_BACKENDS,
@ -83,7 +85,6 @@ MIDDLEWARE = (
    + MIDDLEWARE
    + [
        "djconfig.middleware.DjConfigMiddleware",
-        "wagtail.core.middleware.SiteMiddleware",
        "wagtail.contrib.redirects.middleware.RedirectMiddleware",
    ]
 )
@ -107,6 +108,8 @@ MEDIA_URL = "/gestion/media/"
 CORS_ORIGIN_WHITELIST = ("bda.ens.fr", "www.bda.ens.fr" "cof.ens.fr", "www.cof.ens.fr")


+ASGI_APPLICATION = "gestioasso.routing.application"
+
 # ---
 # Auth-related stuff
 # ---
@ -145,7 +148,7 @@ CACHES = {

 CHANNEL_LAYERS = {
    "default": {
-        "BACKEND": "asgi_redis.RedisChannelLayer",
+        "BACKEND": "shared.channels.ChannelLayer",
        "CONFIG": {
            "hosts": [
                (
@ -158,11 +161,9 @@ CHANNEL_LAYERS = {
                )
            ]
        },
-        "ROUTING": "gestioasso.routing.routing",
    }
 }

-
 # ---
 # reCAPTCHA settings
 # https://github.com/praekelt/django-recaptcha
@ -204,8 +205,9 @@ MAIL_DATA = {
        "REPLYTO": "cof@ens.fr",
    },
    "rappels": {"FROM": "Le BdA <bda@ens.fr>", "REPLYTO": "Le BdA <bda@ens.fr>"},
-    "rappel_negatif": {
-        "FROM": "La K-Fêt <k-fet@ens.fr>",
+    "kfet": {
+        "FROM": "La K-Fêt <chefs-k-fet@ens.fr>",
+        "REPLYTO": "La K-Fêt <chefs-k-fet@ens.fr>",
    },
    "revente": {
        "FROM": "BdA-Revente <bda-revente@ens.fr>",
@ -224,3 +226,8 @@ KFET_HISTORY_DATE_LIMIT = timedelta(days=7)
 # Limite plus longue pour les chefs/trez
 # (qui ont la permission kfet.access_old_history)
 KFET_HISTORY_LONG_DATE_LIMIT = timedelta(days=30)
+
+# These accounts don't represent actual people and can be freely accessed
+# Identification based on trigrammes
+KFET_HISTORY_NO_DATE_LIMIT_TRIGRAMMES = ["LIQ", "#13"]
+KFET_HISTORY_NO_DATE_LIMIT = timezone.datetime(1794, 10, 30)  # AKA the distant past
--- a/gestioasso/settings/common.py
+++ b/gestioasso/settings/common.py
@ -101,7 +101,7 @@ TEMPLATES = [

 DATABASES = {
    "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
        "NAME": DBNAME,
        "USER": DBUSER,
        "PASSWORD": DBPASSWD,
@ -111,6 +111,7 @@ DATABASES = {

 SITE_ID = 1

+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

 # ---
 # Internationalization
--- a/gestioasso/settings/local.py
+++ b/gestioasso/settings/local.py
@ -47,8 +47,7 @@ CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"
 # Use the default in memory asgi backend for local development
 CHANNEL_LAYERS = {
    "default": {
-        "BACKEND": "asgiref.inmemory.ChannelLayer",
-        "ROUTING": "gestioasso.routing.routing",
+        "BACKEND": "channels.layers.InMemoryChannelLayer",
    }
 }

--- a/gestioasso/urls.py
+++ b/gestioasso/urls.py
@ -35,7 +35,7 @@ app_dict = {
    "events": "gestion/event_v2/",  # the events module is still experimental !
    "authens": "gestion/authens/",
 }
-for (app_name, url_prefix) in app_dict.items():
+for app_name, url_prefix in app_dict.items():
    if app_name in settings.INSTALLED_APPS:
        urlpatterns += [path(url_prefix, include("{}.urls".format(app_name)))]

--- a/gestioncof/init.py
+++ b/gestioncof/init.py
@ -1 +0,0 @@
-default_app_config = "gestioncof.apps.GestioncofConfig"
--- a/gestioncof/admin.py
+++ b/gestioncof/admin.py
@ -6,7 +6,7 @@ from django.contrib.auth.models import Group, Permission, User
 from django.db.models import Q
 from django.urls import reverse
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from gestioncof.models import (
    Club,
--- a/gestioncof/cms/init.py
+++ b/gestioncof/cms/init.py
@ -1 +0,0 @@
-default_app_config = "gestioncof.cms.apps.COFCMSAppConfig"
--- a/gestioncof/cms/migrations/0001_initial.py
+++ b/gestioncof/cms/migrations/0001_initial.py
@ -13,7 +13,6 @@ import gestioncof.cms.models


 class Migration(migrations.Migration):
-
    initial = True

    dependencies = [
--- a/gestioncof/cms/migrations/0002_auto_20190523_1521.py
+++ b/gestioncof/cms/migrations/0002_auto_20190523_1521.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("cofcms", "0001_initial")]

    operations = [
--- a/gestioncof/cms/migrations/0003_directory_entry_optional_links.py
+++ b/gestioncof/cms/migrations/0003_directory_entry_optional_links.py
@ -6,7 +6,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        ("cofcms", "0002_auto_20190523_1521"),
    ]
--- a/gestioncof/cms/migrations/0004_auto_20200829_2314.py
+++ b/gestioncof/cms/migrations/0004_auto_20200829_2314.py
@ -6,7 +6,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        ("cofcms", "0003_directory_entry_optional_links"),
    ]
--- a/gestioncof/cms/templatetags/cofcms_tags.py
+++ b/gestioncof/cms/templatetags/cofcms_tags.py
@ -2,7 +2,7 @@ from datetime import date, timedelta

 from django import template
 from django.utils import formats, timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _

 from ..models import COFActuPage, COFRootPage

--- a/gestioncof/forms.py
+++ b/gestioncof/forms.py
@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import AuthenticationForm
 from django.forms.formsets import BaseFormSet, formset_factory
 from django.forms.widgets import CheckboxSelectMultiple, RadioSelect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from djconfig.forms import ConfigForm

 from bda.models import Spectacle
@ -276,7 +276,9 @@ class RegistrationProfileForm(forms.ModelForm):
        self.fields["mailing_bda_revente"].initial = True
        self.fields["mailing_unernestaparis"].initial = True

-        self.fields.keyOrder = [
+    class Meta:
+        model = CofProfile
+        fields = [
            "login_clipper",
            "phone",
            "occupation",
@ -290,22 +292,6 @@ class RegistrationProfileForm(forms.ModelForm):
            "comments",
        ]

-    class Meta:
-        model = CofProfile
-        fields = (
-            "login_clipper",
-            "phone",
-            "occupation",
-            "departement",
-            "is_cof",
-            "type_cotiz",
-            "mailing_cof",
-            "mailing_bda",
-            "mailing_bda_revente",
-            "mailing_unernestaparis",
-            "comments",
-        )
-

 STATUS_CHOICES = (
    ("no", "Non"),
--- a/gestioncof/migrations/0001_initial.py
+++ b/gestioncof/migrations/0001_initial.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

    operations = [
--- a/gestioncof/migrations/0002_enable_unprocessed_demandes.py
+++ b/gestioncof/migrations/0002_enable_unprocessed_demandes.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0001_initial")]

    operations = [
--- a/gestioncof/migrations/0003_event_image.py
+++ b/gestioncof/migrations/0003_event_image.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0002_enable_unprocessed_demandes")]

    operations = [
--- a/gestioncof/migrations/0004_registration_mail.py
+++ b/gestioncof/migrations/0004_registration_mail.py
@ -25,7 +25,6 @@ def create_mail(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0003_event_image")]

    operations = [
--- a/gestioncof/migrations/0005_encoding.py
+++ b/gestioncof/migrations/0005_encoding.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0004_registration_mail")]

    operations = [
--- a/gestioncof/migrations/0006_add_calendar.py
+++ b/gestioncof/migrations/0006_add_calendar.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("bda", "0004_mails-rappel"),
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
--- a/gestioncof/migrations/0007_alter_club.py
+++ b/gestioncof/migrations/0007_alter_club.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0006_add_calendar")]

    operations = [
--- a/gestioncof/migrations/0008_py3.py
+++ b/gestioncof/migrations/0008_py3.py
@ -10,7 +10,6 @@ def forwards(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0007_alter_club")]

    operations = [
--- a/gestioncof/migrations/0009_delete_clipper.py
+++ b/gestioncof/migrations/0009_delete_clipper.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0008_py3")]

    operations = [migrations.DeleteModel(name="Clipper")]
--- a/gestioncof/migrations/0010_delete_custommail.py
+++ b/gestioncof/migrations/0010_delete_custommail.py
@ -4,7 +4,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0009_delete_clipper")]

    operations = [migrations.DeleteModel(name="CustomMail")]
--- a/gestioncof/migrations/0011_longer_clippers.py
+++ b/gestioncof/migrations/0011_longer_clippers.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0010_delete_custommail")]

    operations = [
--- a/gestioncof/migrations/0011_remove_cofprofile_num.py
+++ b/gestioncof/migrations/0011_remove_cofprofile_num.py
@ -5,7 +5,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0010_delete_custommail")]

    operations = [migrations.RemoveField(model_name="cofprofile", name="num")]
--- a/gestioncof/migrations/0012_merge.py
+++ b/gestioncof/migrations/0012_merge.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("gestioncof", "0011_remove_cofprofile_num"),
        ("gestioncof", "0011_longer_clippers"),
--- a/gestioncof/migrations/0013_pei.py
+++ b/gestioncof/migrations/0013_pei.py
@ -5,7 +5,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0012_merge")]

    operations = [
--- a/gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py
+++ b/gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0013_pei")]

    operations = [
--- a/gestioncof/migrations/0015_psql_choices_niveaux.py
+++ b/gestioncof/migrations/0015_psql_choices_niveaux.py
@ -6,7 +6,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0014_cofprofile_mailing_unernestaparis")]

    operations = [
--- a/gestioncof/migrations/0016_unique_clippers.py
+++ b/gestioncof/migrations/0016_unique_clippers.py
@ -16,7 +16,6 @@ def null_clippers_to_empty(apps, schema_editor):


 class Migration(migrations.Migration):
-
    dependencies = [("gestioncof", "0015_psql_choices_niveaux")]

    operations = [
--- a/gestioncof/migrations/0017_petitscours_uniqueness.py
+++ b/gestioncof/migrations/0017_petitscours_uniqueness.py
@ -5,7 +5,6 @@ from django.db import migrations


 class Migration(migrations.Migration):
-
    dependencies = [
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
        ("gestioncof", "0016_unique_clippers"),
--- a/gestioncof/migrations/0018_petitscours_email.py
+++ b/gestioncof/migrations/0018_petitscours_email.py
@ -4,7 +4,6 @@ from django.db import migrations, models


 class Migration(migrations.Migration):
-
    dependencies = [
        ("gestioncof", "0017_petitscours_uniqueness"),
    ]
--- a/gestioncof/migrations/0019_auto_20220630_1241.py
+++ b/gestioncof/migrations/0019_auto_20220630_1241.py
@ -0,0 +1,43 @@
+# Generated by Django 3.2.13 on 2022-06-30 10:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("gestioncof", "0018_petitscours_email"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="eventregistration",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="petitcoursability",
+            unique_together=set(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="surveyanswer",
+            unique_together=set(),
+        ),
+        migrations.AddConstraint(
+            model_name="eventregistration",
+            constraint=models.UniqueConstraint(
+                fields=("user", "event"), name="unique_event_registration"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="petitcoursability",
+            constraint=models.UniqueConstraint(
+                fields=("user", "niveau", "matiere"), name="unique_competence_level"
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="surveyanswer",
+            constraint=models.UniqueConstraint(
+                fields=("user", "survey"), name="unique_survey_answer"
+            ),
+        ),
+    ]
--- a/gestioncof/migrations/0019_cofprofile_date_adhesion.py
+++ b/gestioncof/migrations/0019_cofprofile_date_adhesion.py
@ -0,0 +1,19 @@
+# Generated by Django 2.2.28 on 2023-05-22 09:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("gestioncof", "0018_petitscours_email"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="cofprofile",
+            name="date_adhesion",
+            field=models.DateField(
+                blank=True, null=True, verbose_name="Date d'adhésion"
+            ),
+        ),
+    ]
--- a/gestioncof/models.py
+++ b/gestioncof/models.py
@ -2,7 +2,7 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from bda.models import Spectacle
 from shared.utils import choices_length
@ -50,6 +50,7 @@ class CofProfile(models.Model):
        "Login clipper", max_length=32, blank=True, unique=True, null=True
    )
    is_cof = models.BooleanField("Membre du COF", default=False)
+    date_adhesion = models.DateField("Date d'adhésion", blank=True, null=True)
    phone = models.CharField("Téléphone", max_length=20, blank=True)
    occupation = models.CharField(
        _("Occupation"),
@ -193,8 +194,12 @@ class EventRegistration(models.Model):
    paid = models.BooleanField("A payé", default=False)

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "event"], name="unique_event_registration"
+            )
+        ]
        verbose_name = "Inscription"
-        unique_together = ("user", "event")

    def __str__(self):
        return "Inscription de {} à {}".format(self.user, self.event.title)
@ -246,8 +251,12 @@ class SurveyAnswer(models.Model):
    answers = models.ManyToManyField(SurveyQuestionAnswer, related_name="selected_by")

    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "survey"], name="unique_survey_answer"
+            )
+        ]
        verbose_name = "Réponses"
-        unique_together = ("user", "survey")

    def __str__(self):
        return "Réponse de %s sondage %s" % (
--- a/gestioncof/signals.py
+++ b/gestioncof/signals.py
@ -1,7 +1,7 @@
 from django.contrib import messages
 from django.contrib.auth.signals import user_logged_in
 from django.dispatch import receiver
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_cas_ng.signals import cas_user_authenticated


--- a/gestioncof/templates/base.html
+++ b/gestioncof/templates/base.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
--- a/gestioncof/templates/gestioncof/home.html
+++ b/gestioncof/templates/gestioncof/home.html
@ -51,7 +51,7 @@
                    {# TODO: Since Django 1.9, we can store result with "as", allowing proper value management (if None) #}
                    <li><a href="{% slugurl "k-fet" %}">Page d'accueil</a></li>
                    <li><a href="https://cof.ens.fr/gestion/k-fet/le-calendrier/">Calendrier</a></li>
-                    {% if perms.kfet.is_team and user.profile.is_cof %}
+                    {% if perms.kfet.is_team %}
                    <li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
                    {% endif %}
                </ul>
--- a/gestioncof/templates/registration.html
+++ b/gestioncof/templates/registration.html
@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}

 {% block page_size %}col-sm-8{% endblock %}

--- a/gestioncof/templates/tristate_js.html
+++ b/gestioncof/templates/tristate_js.html
@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
                <script type="text/javascript">
 var supernifty_tristate = function() {
  var
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
thubrecht	2126224e15	Merge pull request 'Thubrecht/daphne' (#815 ) from thubrecht/daphne into master Reviewed-on: DGNum/gestioCOF#815	2024-07-30 18:40:56 +02:00
Tom Hubrecht	d6109a9312	dev: update requirements and directly read the files	2024-07-12 14:54:14 +02:00
Tom Hubrecht	a69bd0426f	kfet/open: Add comment to test	2024-07-12 14:54:14 +02:00
Tom Hubrecht	81a4dbef7c	dev: set explicitely DJANGO_SETTINGS_MODULE	2024-07-12 14:54:14 +02:00
Tom Hubrecht	4fedf3453d	kfet: remove redundant static tag	2024-07-12 14:54:14 +02:00
Tom Hubrecht	8607d77c84	dev: update requirements	2024-07-12 14:54:14 +02:00
Tom Hubrecht	bc55a3067e	Remove useless migrations	2024-07-12 14:54:14 +02:00
Tom Hubrecht	dd68ad91cd	Update django-hCaptcha	2024-07-12 14:54:14 +02:00
Tom Hubrecht	2f71246509	assertDictContainsSubset is deprecated	2024-07-12 14:54:14 +02:00
Tom Hubrecht	a20a1c11d6	Explicitely set transform=repr in assertQuerysetEquals	2024-07-12 14:54:14 +02:00
Tom Hubrecht	0e1ff1765a	assertEquals is deprecated	2024-07-12 14:54:14 +02:00
Tom Hubrecht	177d413f4c	Use AutoField instead of BigAutoField	2024-07-12 14:54:14 +02:00
Tom Hubrecht	01dd16c795	url -> re_path	2024-07-12 14:54:14 +02:00
Tom Hubrecht	84c87c1b4b	Replace unique_together by UniqueConstraint	2024-07-12 14:54:14 +02:00
Tom Hubrecht	1b143b322f	Update changelog	2024-07-12 14:54:14 +02:00
Tom Hubrecht	f9456e3c29	cof has been renamed to gestioasso	2024-07-12 14:54:14 +02:00
Tom Hubrecht	dd1350f1c2	Fix typo	2024-07-12 14:54:14 +02:00
Tom Hubrecht	8f4cb68d31	Only run kf tests in sequential mode (to fix issues with channels)	2024-07-12 14:54:14 +02:00
Tom Hubrecht	3a3f96a8df	Try not running tests in parallel	2024-07-12 14:54:14 +02:00
Tom Hubrecht	7d8926e459	Try to flush old messages in tests	2024-07-12 14:54:14 +02:00
Tom Hubrecht	3fee014384	Update kfet.open tests	2024-07-12 14:54:14 +02:00
Tom Hubrecht	cd351786bb	Remove default_app_config	2024-07-12 14:54:14 +02:00
Tom Hubrecht	7362c2fa2a	Update django-djconfig	2024-07-12 14:54:14 +02:00
Tom Hubrecht	efbc947145	Change backend name as the old one is deprecated	2024-07-12 14:54:14 +02:00
Tom Hubrecht	0c45262fbc	ugettext -> gettext	2024-07-12 14:54:14 +02:00
Tom Hubrecht	cabd277b4a	Update redis, and implement a custom channel layer to send datetime/decimal objects	2024-07-12 14:54:14 +02:00
Tom Hubrecht	4108efe8c9	Fix kfet.ope tests	2024-07-12 14:54:14 +02:00
Tom Hubrecht	693e4252d5	Fix kpsul tests	2024-07-12 14:54:14 +02:00
Tom Hubrecht	3aa928e8f0	Simplify group_send for kpsul	2024-07-12 14:54:14 +02:00
Tom Hubrecht	5e2e68960b	Channels 3	2024-07-12 14:54:14 +02:00
Tom Hubrecht	91e9beee11	Add default django asgi handler	2024-07-12 14:54:14 +02:00
Tom Hubrecht	ac286209ed	Fix app import	2024-07-12 14:54:14 +02:00
Tom Hubrecht	b03cda5962	keyOrder is deprecated, using a list in Meta gives the correct order	2024-07-12 14:54:14 +02:00
Tom Hubrecht	4feb567af7	Update django-redis-cache and fix vagrant setup	2024-07-12 14:54:14 +02:00
Tom Hubrecht	1ac47885d0	Update django version	2024-07-12 14:54:14 +02:00
Tom Hubrecht	071c810605	Update base consumers	2024-07-12 14:54:14 +02:00
Tom Hubrecht	7f00ce0ff1	Add default http router	2024-07-12 14:54:14 +02:00
Tom Hubrecht	95136cb4eb	Update daphne version	2024-07-12 14:54:14 +02:00
Tom Hubrecht	e299997aa8	Update to django channels 2	2024-07-12 14:54:14 +02:00
Tom Hubrecht	40f34926bb	Fix vagrant setup w/ daphne	2024-07-12 14:54:14 +02:00
thubrecht	69976a878a	Merge pull request 'Envoi de mail lors de la création d'un trigramme' (#833 ) from agroudiev/mail-creation-trigramme into master Reviewed-on: DGNum/gestioCOF#833	2024-07-06 16:54:25 +02:00
Antoine Groudiev	6621ae3950	style(kfet): suppression de return	2024-07-06 16:49:35 +02:00
Antoine Groudiev	9288daaf9e	feat(kfet): envoi de mail lors de la création d'un trigramme	2024-07-06 12:14:49 +02:00
Tom Hubrecht	e92c500940	feat(shell.nix): Switch to python 3.9	2024-02-11 19:59:29 +01:00
Tom Hubrecht	d75eaf583f	Merge branch 'master' into 'master' Modification du délai pour l'indicateur K-Fêt ouverte See merge request klub-dev-ens/gestioCOF!529	2023-12-10 10:11:33 +01:00
soyouzpanda	55bd3ab51d	Modification du délai du websocket	2023-12-08 21:17:53 +01:00
Tom Hubrecht	f640a25f59	Merge branch 'petitcours-template-tweak' into 'master' [petitcours] Tweak `eleve.txt` template See merge request klub-dev-ens/gestioCOF!528	2023-10-03 15:20:40 +02:00
Leo Lanteri--Thauvin	f881c7cd8b	[petitcours] Tweak `eleve.txt` template	2023-09-11 16:44:45 +02:00
Tom Hubrecht	b548b87c25	Version 0.15.1 et Changelog	2023-06-15 13:52:53 +02:00
Tom Hubrecht	a72302291f	Merge branch 'send_neg' into 'master' feat(kfet): Change l'adresse utilisée pour envoyer les mails de négatif See merge request klub-dev-ens/gestioCOF!526	2023-06-15 13:33:44 +02:00
Tom Hubrecht	a0bde75f50	feat(kfet): Change l'adresse utilisée pour envoyer les mails de négatif	2023-06-15 13:03:54 +02:00
Tom Hubrecht	44b19c12e5	Merge branch 'send_neg' into 'master' fix(kfet): Récupère lors d'une erreur due à smtplib See merge request klub-dev-ens/gestioCOF!525	2023-06-15 10:48:23 +02:00
Tom Hubrecht	f97d339a1c	fix(kfet): Récupère lors d'une erreur due à smtplib	2023-06-14 20:56:25 +02:00
Tom Hubrecht	094116e88d	Merge branch 'thubrecht/date-adhesion' into 'master' Rajout de la date d'adhésion sur les profils COF Closes #303 See merge request klub-dev-ens/gestioCOF!521	2023-05-26 09:31:45 +02:00
Tom Hubrecht	b32a07fc22	Version 0.15 et mise à jour du Changelog	2023-05-22 20:42:23 +02:00
Tom Hubrecht	4fc9902cf6	Merge branch 'thubrecht/contact-soiree' into 'master' feat(kfet): Ajout d'un formulaire de demande de soirée See merge request klub-dev-ens/gestioCOF!523	2023-05-22 20:37:38 +02:00
Tom Hubrecht	7164cfa37a	feat(kfet): Ajout d'un formulaire de demande de soirée	2023-05-22 20:30:05 +02:00
Tom Hubrecht	90f96fb5c9	Merge branch 'thubrecht/contact' into 'master' feat(kfet): Ajoute un formulaire de contact Closes #302 See merge request klub-dev-ens/gestioCOF!520	2023-05-22 19:06:26 +02:00
Tom Hubrecht	e50249355d	feat(kfet): Ajoute un formulaire de contact	2023-05-22 18:59:46 +02:00
Tom Hubrecht	c304d734d9	Merge branch 'thubrecht/comptes-inactifs' into 'master' feat(kfet): Désactive l'envoi des mails pour les comptes gelés See merge request klub-dev-ens/gestioCOF!522	2023-05-22 18:34:51 +02:00
Tom Hubrecht	c36dd30bce	fix(kfet): Affiche la bonne information	2023-05-22 18:26:24 +02:00
Tom Hubrecht	2571cc955e	feat(kfet): Désactive l'envoi des mails pour les comptes gelés On utilise la fonctionnalité `is_frozen` pour marquer les comptes qui n'ont plus d'adresse valide, et on répare le formulaire de màj de compte.	2023-05-22 18:23:50 +02:00
Tom Hubrecht	3eaac5c68f	feat(cof): Rajoute la date d'adhésion dans les profils	2023-05-22 11:28:23 +02:00
Tom Hubrecht	af4c8e0744	Update shell.nix and use django-types	2023-05-22 10:57:11 +02:00
Tom Hubrecht	14e0a3ef0a	Version 0.14 et mise à jour du changelog	2023-05-19 20:18:11 +02:00
Tom Hubrecht	83078d4726	Merge branch 'thubrecht/date-js' into 'master' Thubrecht/date js See merge request klub-dev-ens/gestioCOF!518	2023-05-19 17:34:27 +02:00
Tom Hubrecht	cb262ad479	fix(kfet): Update timezone data for moment.js	2023-05-19 16:45:15 +02:00
Tom Hubrecht	5c47118834	Update gitignore and shell.nix	2023-05-19 15:14:55 +02:00
Tom Hubrecht	30e842ce80	shell.nix: Update to use virtualenv	2023-05-19 14:59:19 +02:00
Tom Hubrecht	892bf51163	Run black on all files	2023-05-19 14:57:48 +02:00
Tom Hubrecht	e20d7ca6c2	requirements: Fix required versions	2023-05-19 14:43:25 +02:00
Tom Hubrecht	1b09293206	Version 0.13 && Update changelog	2023-02-19 10:32:47 +01:00
Tom Hubrecht	e7da476697	Merge branch 'thubrecht/surnom' into 'master' Rend le surnom lisible par la personne Closes #297 See merge request klub-dev-ens/gestioCOF!506	2023-01-31 17:06:28 +01:00
Tom Hubrecht	761ab6df90	Merge branch '_aandres/inventory_sum_amounts' into 'master' Affiche les montants des valeurs des stocks sur l'affichage d'un inventaire See merge request klub-dev-ens/gestioCOF!515	2023-01-28 15:34:56 +01:00
Tom Hubrecht	a8d4035d33	Merge branch 'thubrecht/rappels_negatifs' into 'master' On n'envoie des mails de rappel que lorsque le négatif est toujours d'actualité Closes #298 See merge request klub-dev-ens/gestioCOF!509	2023-01-28 15:33:23 +01:00
Alice	b80426c56f	feat(kfet): message info about prices	2023-01-28 15:28:54 +01:00
Alice	429e611daa	feat(kfet): more values and formatting	2023-01-28 15:28:54 +01:00
Tom Hubrecht	5160da7862	Merge branch '292_fix_cancel_js' into 'master' fix(kfet): fix js error when cancelling already canceled operation Closes #292 See merge request klub-dev-ens/gestioCOF!516	2023-01-28 15:20:53 +01:00
Alice	aad3775222	fix(kfet): fix js error when cancelling already canceled operation	2023-01-28 15:13:55 +01:00
Alice	4b92716092	feat: poc inventory amount value and lint	2023-01-23 21:53:46 +01:00
Tom Hubrecht	dfa5b4bf69	changelog: add current date	2022-10-03 18:37:41 +02:00
Tom Hubrecht	1be5dcb6af	Merge branch 'thubrecht/kfetcms-css' into 'master' kfetcms: Update the fixtures and fix the navbar behaviour due to a longer menu See merge request klub-dev-ens/gestioCOF!513	2022-10-03 10:54:37 +02:00
Tom Hubrecht	a891ec56a6	dev: add nixos setup	2022-10-03 10:34:06 +02:00
Tom Hubrecht	7a52690a63	kfet: fix pipeline	2022-10-03 10:33:29 +02:00
Tom Hubrecht	a2f396ce7a	Changelog: Update	2022-10-03 10:33:04 +02:00
Tom Hubrecht	85e30056a6	kfetcms: Update the fixtures and fix the navbar behaviour due to a longer menu	2022-10-03 10:22:32 +02:00
Tom Hubrecht	69de48f285	Version 0.12	2022-06-17 21:45:34 +02:00
Tom Hubrecht	eba36f2712	Merge branch 'dodo/kfet-history-limit-exceptions' into 'master' Dodo/kfet history limit exceptions See merge request klub-dev-ens/gestioCOF!508	2022-05-20 12:08:59 +02:00
Dorian Lesbre	bfdb34aae7	Dodo/kfet history limit exceptions	2022-05-20 12:08:59 +02:00
Tom Hubrecht	fcf2002cd7	On n'affiche le négatif que s'il existe vraiment	2022-01-11 18:10:00 +01:00
Tom Hubrecht	b236d6a950	Si last_rappel vaut None il n'est pas inclus dans le __lt	2022-01-11 18:10:00 +01:00
Tom Hubrecht	4b29097f02	On sauvegarde la date de fin du négatif	2022-01-11 18:10:00 +01:00
Tom Hubrecht	87f383bef1	On n'envoie des mails de rappel que lorsque le négatif est toujours d'actualité	2022-01-11 18:10:00 +01:00
Tom Hubrecht	1ad025e046	Merge branch 'dodo/fix_stat_labels' into 'master' Dodo/fix stat labels Closes #296 See merge request klub-dev-ens/gestioCOF!510	2022-01-07 11:07:51 +01:00
Dorian Lesbre	b3c047738a	Ajout accent K-Fêt	2022-01-06 16:00:26 +01:00
Dorian Lesbre	17a9ae3302	Update CHANGELOG	2022-01-05 10:50:45 +01:00
Dorian Lesbre	e41bcbb6d7	Removed duplicate import to please flake8	2022-01-05 10:48:04 +01:00
Dorian Lesbre	e384bfb0f3	Fix issue #296	2022-01-05 10:45:32 +01:00
Tom Hubrecht	373ff1f62c	Rend le surnom lisible par la personne	2021-11-25 14:44:40 +01:00
				`@ -1 +0,0 @@`
				`default_app_config = "gestioncof.apps.GestioncofConfig"`
				`@ -1 +0,0 @@`
				`default_app_config = "gestioncof.cms.apps.COFCMSAppConfig"`