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

Reviewed-on: #815

.envrc

@@ -0,0 +1 @@
+use nix

.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

.gitlab-ci.yml

@@ -17,12 +17,15 @@ variables:
     # psql password authentication
     PGPASSWORD: $POSTGRES_PASSWORD
 
+    # apps to check migrations for
+    MIGRATION_APPS: "bda bds cofcms clubs events gestioncof kfet kfetauth kfetcms open petitscours shared"
+
 .test_template:
     before_script:
         - mkdir -p vendor/{pip,apt}
-        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
+        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
-        - sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' cof/settings/secret_example.py > cof/settings/secret.py
+        - sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' gestioasso/settings/secret_example.py > gestioasso/settings/secret.py
-        - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py
+        - sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' gestioasso/settings/secret.py
         # Remove the old test database if it has not been done yet
         - psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
         - pip install --upgrade -r requirements-prod.txt coverage tblib
@@ -40,19 +43,27 @@ 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: "cof.settings.cof_prod"
+        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
     extends: .test_template
     variables:
-        DJANGO_SETTINGS_MODULE: "cof.settings.bds_prod"
+        DJANGO_SETTINGS_MODULE: "gestioasso.settings.bds_prod"
     script:
         - coverage run manage.py test bds clubs events --parallel
 
@@ -63,23 +74,26 @@ linters:
         - pip install --upgrade black isort flake8
     script:
         - black --check .
-        - isort --recursive --check-only --diff bda bds clubs cof events gestioncof kfet petitscours provisioning shared
+        - isort --check --diff .
         # Print errors only
-        - flake8 --exit-zero bda bds clubs cof events gestioncof kfet petitscours provisioning shared
+        - flake8 --exit-zero bda bds clubs gestioasso events gestioncof kfet petitscours provisioning shared
     cache:
         key: linters
         paths:
             - vendor/
 
 # Check whether there are some missing migrations.
-.migration_checks_template:
+migration_checks:
+    stage: test
+    variables:
+        DJANGO_SETTINGS_MODULE: "gestioasso.settings.local"
     before_script:
         - mkdir -p vendor/{pip,apt}
-        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
+        - apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
-        - cp cof/settings/secret_example.py cof/settings/secret.py
+        - cp gestioasso/settings/secret_example.py gestioasso/settings/secret.py
-        - pip install --upgrade -r requirements-prod.txt
+        - pip install --upgrade -r requirements-devel.txt
         - python --version
-    script: python manage.py makemigrations --dry-run --check
+    script: python manage.py makemigrations --dry-run --check $MIGRATION_APPS
     services:
         # this should not be necessary…
         - postgres:11.7
@@ -87,15 +101,3 @@ linters:
         key: migration_checks
         paths:
             - vendor/
-
-cof_migration_checks:
-    stage: test
-    extends: .migration_checks_template
-    variables:
-        DJANGO_SETTINGS_MODULE: "cof.settings.cof_prod"
-
-bds_migration_checks:
-    stage: test
-    extends: .migration_checks_template
-    variables:
-        DJANGO_SETTINGS_MODULE: "cof.settings.bds_prod"

.pre-commit.sh

@@ -48,7 +48,7 @@ if type isort &>/dev/null; then
         ISORT_OUTPUT="/tmp/gc-isort-output.log"
         touch $ISORT_OUTPUT
 
-        if ! echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort --check-only &>$ISORT_OUTPUT; then
+        if ! echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort --check &>$ISORT_OUTPUT; then
             echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort &>$ISORT_OUTPUT
             printf "Reformatted.\n"
             formatter_updated=1

CHANGELOG.md

@@ -16,25 +16,210 @@ Liste des changements notables dans GestioCOF depuis la version 0.1 (septembre
 - Vue d'inscription à un événement **ou** intégration propre dans la vue
   "inscription d'un nouveau membre"
 
-### Nouveau module BDS
-
-Uniquement un modèle BDSProfile pour le moment…
-
 ### Nouveau module de gestion des clubs
 
 Uniquement un modèle simple de clubs avec des respos. Aucune gestion des
 adhérents ni des cotisations.
 
-## Upcoming
+## 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
+
+- Répare un problème de rendu sur le wagtail du COF
+
+### K-Fêt
+
+- Ajoute de mails de rappels pour les comptes en négatif
+- La recherche de comptes sur K-Psul remarche normalement
+- Le pointeur de la souris change de forme quand on survole un item d'autocomplétion
+- Modification du gel de compte:
+    - on ne peut plus geler/dégeler son compte soi-même (il faut la permission "Gérer les permissions K-Fêt")
+    - on ne peut rien compter sur un compte gelé (aucune override possible), et les K-Fêteux·ses dont le compte est gelé perdent tout accès à K-Psul
+    - les comptes actuellement gelés (sur l'ancien système) sont dégelés automatiquement
+- Modification du fonctionnement des négatifs
+    - impossible d'avoir des négatifs inférieurs à `kfet_config.overdraft_amount`
+    - il n'y a plus de limite de temps sur les négatifs
+    - supression des autorisations de négatif
+    - il n'est plus possible de réinitialiser la durée d'un négatif en faisant puis en annulant une charge
+- La gestion des erreurs passe du client au serveur, ce qui permet d'avoir des messages plus explicites
+- La supression d'opérations anciennes est réparée
+
+## Version 0.10 - 18/04/2021
+
+### K-Fêt
+
+- On fait sauter la limite qui empêchait de vendre plus de 24 unités d'un item à
+  la fois.
+- L'interface indique plus clairement quand on fait une erreur en modifiant un
+  compte.
+- On supprime la fonction "décalage de balance".
+- L'accès à l'historique est maintenant limité à 7 jours pour raison de
+  confidentialité. Les chefs/trez peuvent disposer d'une permission
+  supplémentaire pour accéder à jusqu'à 30 jours en cas de problème de compta.
+  L'accès à son historique personnel n'est pas limité. Les durées sont
+  configurables dans `settings/cof_prod.py`.
+
+### COF
+
+- Le Captcha sur la page de demande de petits cours utilise maintenant hCaptcha
+  au lieu de ReCaptcha, pour mieux respecter la vie privée des utilisateur·ices
+
+## Version 0.9 - 06/02/2020
+
+### COF / BdA
+
+- Le COF peut remettre à zéro la liste de ses adhérents en août (sans passer par
+  KDE).
+- La page d'accueil affiche la date de fermeture des tirages BdA.
+- On peut revendre une place dès qu'on l'a payée, plus besoin de payer toutes
+  ses places pour pouvoir revendre.
+- On s'assure que l'email fourni lors d'une demande de petit cours est valide.
+
+### BDS
+
+- Le burô peut maintenant accorder ou révoquer le statut de membre du Burô
+  en modifiant le profil d'un membre du BDS.
+- Le burô peut exporter la liste de ses membres avec email au format CSV depuis
+  la page d'accueil.
+
+### K-Fêt
+
+- On affiche les articles actuellement en vente en premier lors des inventaires
+  et des commandes.
+- On peut supprimer un inventaire. Seuls les articles dont c'est le dernier
+  inventaire sont affectés.
+
+## Version 0.8 - 03/12/2020
+
+### COF
+
+- La page "Mes places" dans la section BdA indique quelles places sont sur
+  listing.
+- ergonomie de l'interface admin du BdA : moins d'options inutiles lors de
+  la sélection de participants.
+- les tirages sont maintenant archivables pour éviter d'avoir encore d'autres
+  options inutiles.
+- l'autocomplétion dans l'admin BdA est réparée.
+- Les icones de la page de gestion des petits cours sont (à nouveau) réparées.
+- On a supprimé la possibilité de modifier les mails automatiques depuis
+  l'interface admin car trop problématique. Faute de mieux, envoyer un mail à
+  KDE pour modifier ces mails.
+- corrige un crash sporadique sur la page d'inscription au système de petits
+  cours
+
+### K-Fêt
+
+- (fix partiel) Empêche la K-Fêt de modifier des données COF (e.g. nom, prénom,
+  username) lors de la création d'un nouveau compte.
+- Les statistiques de conso globales montrent deux courbes COF / non-COF au
+  lieu de LIQ / sur compte.
+- Un bug empêchait de fermer manuellement la K-Fêt depuis un compte non
+  privilégié en tapant un mot de passe. C'est corrigé.
+
+## Version 0.7.2 - 08/09/2020
+
+- Nouvelle page 404
+- Correction de bug en K-Fêt : le lien pour créer un nouveau compte exté apparaît
+  à nouveau dans l'autocomplétion
+
+## Version 0.7.1 - 05/09/2020
+
+Petits ajustements sur le site du COF :
+
+- Possibilité d'ajouter des champs d'infos supplémentaires en plus de l'email et
+  de la page web dans les annuaires (clubs et partenaires).
+- Corrige un bug d'affichage des adresses emails de clubs
+
+## Version 0.7 - 29/08/2020
+
+### GestioBDS
+
+- Ajout d'un bouton pour supprimer un compte
+- Le nombre d'adhérent⋅es est affiché sur la page d'accueil
+- le groupe BDS a les bonnes permissions
+
+### Site du COF
+
+- Captcha fonctionnel pour les mailing-listes
+
+### K-Fêt
+
+- L'autocomplétion pour la création de compte K-Fêt se lance à 3 caractères seulement,
+donc est plus rapide.
+
+## Version 0.6 - 27/07/2020
+
+Arrivée du BDS !
+GestioCOF et GestioBDS ont du code en commun mais tournent de façon séparée, les
+deux bases de données sont distinctes.
+
+## Version 0.5 - 11/07/2020
 
 ### Problèmes corrigés
 
+- La recherche d'utilisateurices (COF + K-Fêt) fonctionne de nouveau
 - Bug d'affichage quand on a beaucoup de clubs dans le cadre "Accès rapide" sur
-  la page des clubs
+  la page des clubs (nouveau site du COF)
 - Version mobile plus ergonimique sur le nouveau site du COF
 - Cliquer sur "visualiser" sur les pages de clubs dans wagtail ne provoque plus
-  d'erreurs 500.
+  d'erreurs 500 (nouveau site du COF)
-- L'historique des ventes des articles fonctionne à nouveau
+- L'historique des ventes des articles K-Fêt fonctionne à nouveau
 - Les montants en K-Fêt sont à nouveau affichés en UKF (et non en €).
 - Les boutons "afficher/cacher" des mails et noms des participant⋅e⋅s à un
   spectacle BdA fonctionnent à nouveau.
@@ -43,7 +228,7 @@ adhérents ni des cotisations.
 
 ### Nouvelles fonctionnalités
 
-- On n'affiche que 4 articles sur la pages "nouveautés"
+- On n'affiche que 4 articles sur la pages "nouveautés" (nouveau site du COF)
 - Plus de traductions sur le nouveau site du COF
 - Les transferts apparaissent maintenant dans l'historique K-Fêt et l'historique
   personnel.

README.md

@@ -1,4 +1,4 @@
-# GestioCOF
+# GestioCOF / GestioBDS
 
 [![pipeline status](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/pipeline.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
 [![coverage report](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/coverage.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
@@ -38,11 +38,11 @@ Vous pouvez maintenant installer les dépendances Python depuis le fichier
     pip install -U pip  # parfois nécessaire la première fois
     pip install -r requirements-devel.txt
 
-Pour terminer, copier le fichier `cof/settings/secret_example.py` vers
+Pour terminer, copier le fichier `gestioasso/settings/secret_example.py` vers
-`cof/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
+`gestioasso/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
 pour profiter de façon transparente des mises à jour du fichier:
 
-    ln -s secret_example.py cof/settings/secret.py
+    ln -s secret_example.py gestioasso/settings/secret.py
 
 Nous avons un git hook de pre-commit pour formatter et vérifier que votre code
 vérifie nos conventions. Pour bénéficier des mises à jour du hook, préférez

Vagrantfile

@@ -1,47 +1,19 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# Configuration de base pour GestioCOF.
-# configures the configuration version (we support older styles for
+# Voir https://docs.vagrantup.com pour plus d'informations.
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
 Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
+  # On se base sur Debian 10 (Buster) pour avoir le même environnement qu'en
-  # For a complete reference, please see the online documentation at
+  # production.
-  # https://docs.vagrantup.com.
+  config.vm.box = "debian/contrib-buster64"
-
-  config.vm.box = "ubuntu/xenial64"
 
   # On associe le port 80 dans la machine virtuelle avec le port 8080 de notre
   # ordinateur, et le port 8000 avec le port 8000.
   config.vm.network :forwarded_port, guest: 80, host: 8080
   config.vm.network :forwarded_port, guest: 8000, host: 8000
 
-  # Create a private network, which allows host-only access to the machine
+  # Le restes de la configuration (installation de paquets, etc) est géré un
-  # using a specific IP.
+  # script shell.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
   config.vm.provision :shell, path: "provisioning/bootstrap.sh"
 end

bda/admin.py

@@ -1,10 +1,11 @@
 from datetime import timedelta
 
-from custommail.shortcuts import send_mass_custom_mail
 from dal.autocomplete import ModelSelect2
 from django import forms
 from django.contrib import admin
+from django.core.mail import send_mass_mail
 from django.db.models import Count, Q, Sum
+from django.template import loader
 from django.template.defaultfilters import pluralize
 from django.utils import timezone
 
@@ -32,20 +33,6 @@ class ReadOnlyMixin(object):
             return readonly_fields + self.readonly_fields_update
 
 
-class ChoixSpectacleAdminForm(forms.ModelForm):
-    class Meta:
-        widgets = {
-            "participant": ModelSelect2(url="bda-participant-autocomplete"),
-            "spectacle": ModelSelect2(url="bda-spectacle-autocomplete"),
-        }
-
-
-class ChoixSpectacleInline(admin.TabularInline):
-    model = ChoixSpectacle
-    form = ChoixSpectacleAdminForm
-    sortable_field_name = "priority"
-
-
 class AttributionTabularAdminForm(forms.ModelForm):
     listing = None
 
@@ -93,14 +80,17 @@ class WithoutListingAttributionInline(AttributionInline):
 class ParticipantAdminForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["choicesrevente"].queryset = Spectacle.objects.select_related(
+        queryset = Spectacle.objects.select_related("location")
-            "location"
+
-        )
+        if self.instance.pk is not None:
+            queryset = queryset.filter(tirage=self.instance.tirage)
+
+        self.fields["choicesrevente"].queryset = queryset
 
 
 class ParticipantPaidFilter(admin.SimpleListFilter):
     """
-        Permet de filtrer les participants sur s'ils ont payé leurs places ou pas
+    Permet de filtrer les participants sur s'ils ont payé leurs places ou pas
     """
 
     title = "A payé"
@@ -169,19 +159,23 @@ class ParticipantAdmin(ReadOnlyMixin, admin.ModelAdmin):
     form = ParticipantAdminForm
 
     def send_attribs(self, request, queryset):
-        datatuple = []
+        emails = []
         for member in queryset.all():
+            subject = "Résultats du tirage au sort"
             attribs = member.attributions.all()
             context = {"member": member.user}
-            shortname = ""
+
+            template_name = ""
             if len(attribs) == 0:
-                shortname = "bda-attributions-decus"
+                template_name = "bda/mails/attributions-decus.txt"
             else:
-                shortname = "bda-attributions"
+                template_name = "bda/mails/attributions.txt"
                 context["places"] = attribs
-            print(context)
+
-            datatuple.append((shortname, context, "bda@ens.fr", [member.user.email]))
+            message = loader.render_to_string(template_name, context)
-        send_mass_custom_mail(datatuple)
+            emails.append((subject, message, "bda@ens.fr", [member.user.email]))
+
+        send_mass_mail(emails)
         count = len(queryset.all())
         if count == 1:
             message_bit = "1 membre a"
@@ -197,17 +191,6 @@ class ParticipantAdmin(ReadOnlyMixin, admin.ModelAdmin):
 
 
 class AttributionAdminForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if "spectacle" in self.fields:
-            self.fields["spectacle"].queryset = Spectacle.objects.select_related(
-                "location"
-            )
-        if "participant" in self.fields:
-            self.fields["participant"].queryset = Participant.objects.select_related(
-                "user", "tirage"
-            )
-
     def clean(self):
         cleaned_data = super().clean()
         participant = cleaned_data.get("participant")
@@ -220,9 +203,14 @@ class AttributionAdminForm(forms.ModelForm):
                 )
         return cleaned_data
 
+    class Meta:
+        widgets = {
+            "participant": ModelSelect2(url="bda-participant-autocomplete"),
+            "spectacle": ModelSelect2(url="bda-spectacle-autocomplete"),
+        }
+
 
 class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
-
     list_display = ("id", "spectacle", "participant", "given", "paid")
     search_fields = (
         "spectacle__title",
@@ -235,7 +223,7 @@ class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
 
 
 class ChoixSpectacleAdmin(admin.ModelAdmin):
-    form = ChoixSpectacleAdminForm
+    autocomplete_fields = ["participant", "spectacle"]
 
     def tirage(self, obj):
         return obj.participant.tirage
@@ -279,15 +267,14 @@ class SalleAdmin(admin.ModelAdmin):
 class SpectacleReventeAdminForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["confirmed_entry"].queryset = Participant.objects.select_related(
+        qset = Participant.objects.select_related("user", "tirage")
-            "user", "tirage"
+
-        )
+        if self.instance.pk is not None:
-        self.fields["seller"].queryset = Participant.objects.select_related(
+            qset = qset.filter(tirage=self.instance.seller.tirage)
-            "user", "tirage"
+
-        )
+        self.fields["confirmed_entry"].queryset = qset
-        self.fields["soldTo"].queryset = Participant.objects.select_related(
+        self.fields["seller"].queryset = qset
-            "user", "tirage"
+        self.fields["soldTo"].queryset = qset
-        )
 
 
 class SpectacleReventeAdmin(admin.ModelAdmin):

bda/algorithm.py

@@ -2,7 +2,6 @@ import random
 
 
 class Algorithm(object):
-
     shows = None
     ranks = None
     origranks = None
@@ -10,10 +9,10 @@ class Algorithm(object):
 
     def __init__(self, shows, members, choices):
         """Initialisation :
-            - on aggrège toutes les demandes pour chaque spectacle dans
+        - on aggrège toutes les demandes pour chaque spectacle dans
-              show.requests
+          show.requests
-            - on crée des tables de demandes pour chaque personne, afin de
+        - on crée des tables de demandes pour chaque personne, afin de
-              pouvoir modifier les rankings"""
+          pouvoir modifier les rankings"""
         self.max_group = 2 * max(choice.priority for choice in choices)
         self.shows = []
         showdict = {}

bda/forms.py

@@ -3,7 +3,7 @@ from django.forms.models import BaseInlineFormSet
 from django.template import loader
 from django.utils import timezone
 
-from bda.models import Attribution, Spectacle, SpectacleRevente
+from bda.models import SpectacleRevente
 
 
 class InscriptionInlineFormSet(BaseInlineFormSet):
@@ -77,7 +77,7 @@ class ResellForm(forms.Form):
         super().__init__(*args, **kwargs)
         self.fields["attributions"] = TemplateLabelField(
             queryset=participant.attribution_set.filter(
-                spectacle__date__gte=timezone.now()
+                spectacle__date__gte=timezone.now(), paid=True
             )
             .exclude(revente__seller=participant)
             .select_related("spectacle", "spectacle__location", "participant__user"),

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,

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 = [

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 = [

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 = [

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 = [

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 = [

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 = [

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 = [

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 = [

bda/migrations/0009_revente.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0008_py3")]
 
     operations = [

bda/migrations/0010_spectaclerevente_shotgun.py

@@ -12,15 +12,15 @@ def forwards_func(apps, schema_editor):
 
     for revente in SpectacleRevente.objects.all():
         is_expired = timezone.now() > revente.date_tirage()
-        is_direct = revente.attribution.spectacle.date >= revente.date and timezone.now() > revente.date + timedelta(
+        is_direct = (
-            minutes=15
+            revente.attribution.spectacle.date >= revente.date
+            and timezone.now() > revente.date + timedelta(minutes=15)
         )
         revente.shotgun = is_expired or is_direct
         revente.save()
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bda", "0009_revente")]
 
     operations = [

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 = [

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 = [

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 = [

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 = []

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 = [

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 = [

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 = [

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 = [

bda/migrations/0018_auto_20201021_1818.py

@@ -0,0 +1,37 @@
+# Generated by Django 2.2.12 on 2020-10-21 16:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bda", "0017_participant_accepte_charte"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="participant",
+            options={"ordering": ("-tirage", "user__last_name", "user__first_name")},
+        ),
+        migrations.AddField(
+            model_name="tirage",
+            name="archived",
+            field=models.BooleanField(default=False, verbose_name="Archivé"),
+        ),
+        migrations.AlterField(
+            model_name="participant",
+            name="tirage",
+            field=models.ForeignKey(
+                limit_choices_to={"archived": False},
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bda.Tirage",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="participant",
+            constraint=models.UniqueConstraint(
+                fields=("tirage", "user"), name="unique_tirage"
+            ),
+        ),
+    ]

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"
+            ),
+        ),
+    ]

bda/models.py

@@ -2,14 +2,14 @@ import calendar
 import random
 from datetime import timedelta
 
-from custommail.models import CustomMail
-from custommail.shortcuts import send_mass_custom_mail
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.core import mail
+from django.core.mail import EmailMessage, send_mass_mail
 from django.db import models
 from django.db.models import Count, Exists
+from django.template import loader
 from django.utils import formats, timezone
 
 
@@ -31,6 +31,7 @@ class Tirage(models.Model):
         "Tirage à afficher dans le catalogue", default=False
     )
     enable_do_tirage = models.BooleanField("Le tirage peut être lancé", default=False)
+    archived = models.BooleanField("Archivé", default=False)
 
     def __str__(self):
         return "%s - %s" % (
@@ -116,16 +117,19 @@ class Spectacle(models.Model):
         bda_generic.nb_attr = 1
         members.append(bda_generic)
         # On écrit un mail personnalisé à chaque participant
-        datatuple = [
+        mails = [
             (
-                "bda-rappel",
+                str(self),
-                {"member": member, "nb_attr": member.nb_attr, "show": self},
+                loader.render_to_string(
+                    "bda/mails/rappel.txt",
+                    context={"member": member, "nb_attr": member.nb_attr, "show": self},
+                ),
                 settings.MAIL_DATA["rappels"]["FROM"],
                 [member.email],
             )
             for member in members
         ]
-        send_mass_custom_mail(datatuple)
+        send_mass_mail(mails)
         # On enregistre le fait que l'envoi a bien eu lieu
         self.rappel_sent = timezone.now()
         self.save()
@@ -172,8 +176,8 @@ class Attribution(models.Model):
 
 class ParticipantPaidQueryset(models.QuerySet):
     """
-        Un manager qui annote le queryset avec un champ `paid`,
+    Un manager qui annote le queryset avec un champ `paid`,
-        indiquant si un participant a payé toutes ses attributions.
+    indiquant si un participant a payé toutes ses attributions.
     """
 
     def annotate_paid(self):
@@ -194,7 +198,9 @@ class Participant(models.Model):
     attributions = models.ManyToManyField(
         Spectacle, through="Attribution", related_name="attributed_to"
     )
-    tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
+    tirage = models.ForeignKey(
+        Tirage, on_delete=models.CASCADE, limit_choices_to={"archived": False}
+    )
     accepte_charte = models.BooleanField("A accepté la charte BdA", default=False)
     choicesrevente = models.ManyToManyField(
         Spectacle, related_name="subscribed", blank=True
@@ -205,6 +211,12 @@ class Participant(models.Model):
     def __str__(self):
         return "%s - %s" % (self.user, self.tirage.title)
 
+    class Meta:
+        ordering = ("-tirage", "user__last_name", "user__first_name")
+        constraints = [
+            models.UniqueConstraint(fields=("tirage", "user"), name="unique_tirage"),
+        ]
+
 
 DOUBLE_CHOICES = (
     ("1", "1 place"),
@@ -241,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"
 
@@ -348,21 +364,24 @@ class SpectacleRevente(models.Model):
         BdA-Revente à tous les intéressés.
         """
         inscrits = self.attribution.spectacle.subscribed.select_related("user")
-        datatuple = [
+        mails = [
             (
-                "bda-revente",
+                "BdA-Revente : {}".format(self.attribution.spectacle.title),
-                {
+                loader.render_to_string(
-                    "member": participant.user,
+                    "bda/mails/revente-new.txt",
-                    "show": self.attribution.spectacle,
+                    context={
-                    "revente": self,
+                        "member": participant.user,
-                    "site": Site.objects.get_current(),
+                        "show": self.attribution.spectacle,
-                },
+                        "revente": self,
+                        "site": Site.objects.get_current(),
+                    },
+                ),
                 settings.MAIL_DATA["revente"]["FROM"],
                 [participant.user.email],
             )
             for participant in inscrits
         ]
-        send_mass_custom_mail(datatuple)
+        send_mass_mail(mails)
         self.notif_sent = True
         self.notif_time = timezone.now()
         self.save()
@@ -373,20 +392,23 @@ class SpectacleRevente(models.Model):
         leur indiquer qu'il est désormais disponible au shotgun.
         """
         inscrits = self.attribution.spectacle.subscribed.select_related("user")
-        datatuple = [
+        mails = [
             (
-                "bda-shotgun",
+                "BdA-Revente : {}".format(self.attribution.spectacle.title),
-                {
+                loader.render_to_string(
-                    "member": participant.user,
+                    "bda/mails/revente-shotgun.txt",
-                    "show": self.attribution.spectacle,
+                    context={
-                    "site": Site.objects.get_current(),
+                        "member": participant.user,
-                },
+                        "show": self.attribution.spectacle,
+                        "site": Site.objects.get_current(),
+                    },
+                ),
                 settings.MAIL_DATA["revente"]["FROM"],
                 [participant.user.email],
             )
             for participant in inscrits
         ]
-        send_mass_custom_mail(datatuple)
+        send_mass_mail(mails)
         self.notif_sent = True
         self.notif_time = timezone.now()
         # Flag inutile, sauf si l'horloge interne merde
@@ -418,31 +440,30 @@ class SpectacleRevente(models.Model):
                     "show": spectacle,
                 }
 
-                c_mails_qs = CustomMail.objects.filter(
+                subject = "BdA-Revente : {}".format(spectacle.title)
-                    shortname__in=[
-                        "bda-revente-winner",
-                        "bda-revente-loser",
-                        "bda-revente-seller",
-                    ]
-                )
-
-                c_mails = {cm.shortname: cm for cm in c_mails_qs}
 
                 mails.append(
-                    c_mails["bda-revente-winner"].get_message(
+                    EmailMessage(
-                        context,
+                        subject=subject,
+                        body=loader.render_to_string(
+                            "bda/mails/revente-tirage-winner.txt",
+                            context=context,
+                        ),
                         from_email=settings.MAIL_DATA["revente"]["FROM"],
                         to=[winner.user.email],
                     )
                 )
-
                 mails.append(
-                    c_mails["bda-revente-seller"].get_message(
+                    EmailMessage(
-                        context,
+                        subject=subject,
+                        body=loader.render_to_string(
+                            "bda/mails/revente-tirage-seller.txt",
+                            context=context,
+                        ),
                         from_email=settings.MAIL_DATA["revente"]["FROM"],
                         to=[seller.user.email],
                         reply_to=[winner.user.email],
-                    )
+                    ),
                 )
 
                 # Envoie un mail aux perdants
@@ -452,11 +473,15 @@ class SpectacleRevente(models.Model):
                         new_context["acheteur"] = inscrit.user
 
                         mails.append(
-                            c_mails["bda-revente-loser"].get_message(
+                            EmailMessage(
-                                new_context,
+                                subject=subject,
+                                body=loader.render_to_string(
+                                    "bda/mails/revente-tirage-loser.txt",
+                                    context=new_context,
+                                ),
                                 from_email=settings.MAIL_DATA["revente"]["FROM"],
                                 to=[inscrit.user.email],
-                            )
+                            ),
                         )
 
                 mail_conn = mail.get_connection()

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" %}" />

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>

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>

bda/templates/bda/mails-rappel.html

@@ -26,13 +26,6 @@
     
     <hr \>
 
-    <p>
-      <em>Note :</em> le template de ce mail peut être modifié à
-      <a href="{% url 'admin:custommail_custommail_change' custommail.pk %}">cette adresse</a>
-    </p>
-
-    <hr \>
-
     <h3>Forme des mails</h3>
 
     <h4>Une seule place</h4>

bda/templates/bda/mails/attributions-decus.txt

@@ -0,0 +1,10 @@
+Cher-e {{ member.first_name }},
+
+Tu t'es inscrit-e pour le tirage au sort du BdA. Malheureusement, tu n'as
+obtenu aucune place.
+
+Nous proposons cependant de nombreuses offres hors-tirage tout au long de
+l'année, et nous t'invitons à nous contacter si l'une d'entre elles
+t'intéresse !
+-- 
+Le Bureau des Arts

bda/templates/bda/mails/attributions.txt

@@ -0,0 +1,31 @@
+Cher-e {{ member.first_name }},
+
+Tu t'es inscrit-e pour le tirage au sort du BdA. Tu as été sélectionné-e
+pour les spectacles suivants :
+{% for place in places %}
+- 1 place pour {{ place }}{% endfor %}
+
+*Paiement*
+L'intégralité de ces places de spectacles est à régler dès maintenant et AVANT
+vendredi prochain, au bureau du COF pendant les heures de permanences (du lundi au vendredi
+entre 12h et 14h, et entre 18h et 20h). Des facilités de paiement sont bien
+évidemment possibles : nous pouvons ne pas encaisser le chèque immédiatement,
+ou bien découper votre paiement en deux fois. Pour ceux qui ne pourraient pas
+venir payer au bureau, merci de nous contacter par mail.
+
+*Mode de retrait des places*
+Au moment du paiement, certaines places vous seront remises directement,
+d'autres seront à récupérer au cours de l'année, d'autres encore seront
+nominatives et à retirer le soir même dans les théâtres correspondants.
+Pour chaque spectacle, vous recevrez un mail quelques jours avant la
+représentation vous indiquant le mode de retrait.
+
+Nous vous rappelons que l'obtention de places du BdA vous engage à
+respecter les règles de fonctionnement :
+https://bda.ens.fr/lequipe/charte-bda/
+Un système de revente des places via les mails BdA-revente est disponible
+directement sur votre compte GestioCOF.
+
+En vous souhaitant de très beaux spectacles tout au long de l'année,
+-- 
+Le Bureau des Arts

bda/templates/bda/mails/rappel.txt

@@ -0,0 +1,23 @@
+Bonjour {{ member.first_name }},
+
+Nous te rappellons que tu as eu la chance d'obtenir {{ nb_attr|pluralize:"une place,deux places" }}
+pour {{ show.title }}, le {{ show.date }} au {{ show.location }}. N'oublie pas de t'y rendre !
+{% if nb_attr == 2 %}
+Tu as obtenu deux places pour ce spectacle. Nous te rappelons que
+ces places sont strictement réservées aux personnes de moins de 28 ans.
+{% endif %}
+{% if show.listing %}Pour ce spectacle, tu as reçu {{ nb_attr|pluralize:"une place,des places" }} sur
+listing. Il te faudra donc te rendre 15 minutes en avance sur les lieux de la représentation
+pour {{ nb_attr|pluralize:"la,les" }} retirer.
+{% else %}Pour assister à ce spectacle, tu dois présenter les billets qui ont
+été distribués au burô.
+{% endif %}
+
+Si tu ne peux plus assister à cette représentation, tu peux
+revendre ta place via BdA-revente, accessible directement sur
+GestioCOF (lien "revendre une place du premier tirage" sur la page
+d'accueil https://www.cof.ens.fr/gestion/).
+
+En te souhaitant un excellent spectacle,
+-- 
+Le Bureau des Arts

bda/templates/bda/mails/revente-new.txt

@@ -0,0 +1,12 @@
+Bonjour {{ member.first_name }}
+
+Une place pour le spectacle {{ show.title }} ({{ show.date }})
+a été postée sur BdA-Revente.
+
+Si ce spectacle t'intéresse toujours, merci de nous le signaler en cliquant
+sur ce lien : https://{{ site }}{% url "bda-revente-confirm" revente.id %}.
+Dans le cas où plusieurs personnes seraient intéressées, nous procèderons à
+un tirage au sort le {{ revente.date_tirage|date:"DATE_FORMAT" }}.
+
+Chaleureusement,
+Le BdA

bda/templates/bda/mails/revente-seller.txt

@@ -0,0 +1,13 @@
+Bonjour {{ vendeur.first_name }},
+
+Tu t’es bien inscrit·e pour revendre une place pour {{ show.title }}.
+
+{% with revente.date_tirage as time %}
+Le tirage au sort entre tout·e·s les racheteuse·eur·s potentiel·le·s aura lieu
+le {{ time|date:"DATE_FORMAT" }} à {{ time|time:"TIME_FORMAT" }} (dans {{time|timeuntil }}).
+Si personne ne s’est inscrit pour racheter la place, celle-ci apparaîtra parmi
+les « Places disponibles immédiatement à la revente » sur GestioCOF.
+{% endwith %}
+
+Bonne revente !
+Le Bureau des Arts

bda/templates/bda/mails/revente-shotgun-seller.txt

@@ -0,0 +1,6 @@
+Bonjour {{ vendeur.first_name }} !
+
+Je souhaiterais racheter ta place pour {{ show.title }} le {{ show.date }} ({{ show.location }}) à {{ show.price|floatformat:2 }}€.
+Contacte-moi si tu es toujours intéressé·e !
+
+{{ acheteur.get_full_name }} ({{ acheteur.email }})

bda/templates/bda/mails/revente-shotgun.txt

@@ -0,0 +1,11 @@
+Bonjour {{ member.first_name }}
+
+Une place pour le spectacle {{ show.title }} ({{ show.date }})
+a été postée sur BdA-Revente.
+
+Puisque ce spectacle a lieu dans moins de 24h, il n'y a pas de tirage au sort pour
+cette place : elle est disponible immédiatement à l'adresse
+https://{{ site }}{% url "bda-revente-buy" show.id %}, à la disposition de tous.
+
+Chaleureusement,
+Le BdA

bda/templates/bda/mails/revente-tirage-loser.txt

@@ -0,0 +1,9 @@
+Bonjour {{ acheteur.first_name }},
+
+Tu t'étais inscrit·e pour la revente de la place de {{ vendeur.get_full_name }}
+pour {{ show.title }}.
+Malheureusement, une autre personne a été tirée au sort pour racheter la place.
+Tu pourras certainement retenter ta chance pour une autre revente !
+
+À très bientôt,
+Le Bureau des Arts

bda/templates/bda/mails/revente-tirage-seller.txt

@@ -0,0 +1,7 @@
+Bonjour {{ vendeur.first_name }},
+
+La personne tirée au sort pour racheter ta place pour {{ show.title }} est {{ acheteur.get_full_name }}.
+Tu peux le/la contacter à l'adresse {{ acheteur.email }}, ou en répondant à ce mail.
+
+Chaleureusement,
+Le BdA

bda/templates/bda/mails/revente-tirage-winner.txt

@@ -0,0 +1,7 @@
+Bonjour {{ acheteur.first_name }},
+
+Tu as été tiré·e au sort pour racheter une place pour {{ show.title }} le {{ show.date }} ({{ show.location }}) à {{ show.price|floatformat:2 }}€.
+Tu peux contacter le/la vendeur·se à l'adresse {{ vendeur.email }}.
+
+Chaleureusement,
+Le BdA

bda/templates/bda/participants.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
     <h2>{{ spectacle }}</h2>
@@ -16,7 +16,7 @@
         <tbody>
         {% for participant in participants %}
             <tr>
-                <td data-sort-value="{{ participan.name}}">{{participant.name}}</td>
+                <td data-sort-value="{{ participant.name}}">{{participant.name}}</td>
                 <td data-sort-value="{{participant.nb_places}}">{{participant.nb_places}} place{{participant.nb_places|pluralize}}</td>
                 <td data-sort-value="{{participant.email}}">{{participant.email}}</td>
                 <td data-sort-value="{{ participant.paid}}" class={%if participant.paid %}"greenratio"{%else%}"redratio"{%endif%}>

bda/templates/bda/resume_places.html

@@ -10,6 +10,7 @@
                 <td>{{place.spectacle.location}}</td>
                 <td>{{place.spectacle.date}}</td>
                 <td>{% if place.double %}deux places{%else%}une place{% endif %}</td>
+                <td>{% if place.spectacle.listing %}sur listing{% else %}place physique{% endif %}</td>
             </tr>
         {% endfor %}
     </table>

bda/templates/bda/revente/confirm-shotgun.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 
 {%block realcontent %}

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>

bda/templates/bda/revente/mail-success.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

bda/templates/bda/revente/manage.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

bda/templates/bda/revente/notpaid.html

@@ -1,6 +0,0 @@
-{% extends "base_title.html" %}
-
-{% block realcontent %}
-    <h2><strong>Nope</strong></h2>
-    <p>Avant de revendre des places, il faut aller les payer !</p>
-{% endblock %}

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>

bda/templates/bda/revente/tirages.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block realcontent %}
 

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" %}" />

bda/tests/mixins.py

@@ -1,7 +1,3 @@
-import os
-
-from django.conf import settings
-from django.core.management import call_command
 from django.utils import timezone
 
 from shared.tests.mixins import ViewTestCaseMixin
@@ -28,12 +24,6 @@ class BdATestHelpers:
         if self.bda_testdata:
             self.load_bda_testdata()
 
-    def require_custommails(self):
-        data_file = os.path.join(
-            settings.BASE_DIR, "gestioncof", "management", "data", "custommail.json"
-        )
-        call_command("syncmails", data_file, verbosity=0)
-
     def load_bda_testdata(self):
         self.tirage = Tirage.objects.create(
             title="Test tirage",

bda/tests/test_models.py

@@ -19,8 +19,6 @@ User = get_user_model()
 
 
 class SpectacleReventeTests(TestCase):
-    fixtures = ["gestioncof/management/data/custommail.json"]
-
     def setUp(self):
         now = timezone.now()
 

bda/tests/test_views.py

@@ -29,7 +29,7 @@ class InscriptionViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/inscription/{}".format(self.tirage.id)
+        return "/gestion/bda/inscription/{}".format(self.tirage.id)
 
     def test_get_opened(self):
         self.tirage.ouverture = timezone.now() - timedelta(days=1)
@@ -149,7 +149,7 @@ class PlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/places/{}".format(self.tirage.id)
+        return "/gestion/bda/places/{}".format(self.tirage.id)
 
 
 class EtatPlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
@@ -166,7 +166,7 @@ class EtatPlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/etat-places/{}".format(self.tirage.id)
+        return "/gestion/bda/etat-places/{}".format(self.tirage.id)
 
 
 class TirageViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
@@ -185,7 +185,7 @@ class TirageViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/tirage/{}".format(self.tirage.id)
+        return "/gestion/bda/tirage/{}".format(self.tirage.id)
 
     def test_perform_tirage_disabled(self):
         # Cannot be performed if disabled
@@ -225,7 +225,7 @@ class SpectacleListViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/spectacles/{}".format(self.tirage.id)
+        return "/gestion/bda/spectacles/{}".format(self.tirage.id)
 
 
 class SpectacleViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
@@ -242,7 +242,7 @@ class SpectacleViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/spectacles/{}/{}".format(self.tirage.id, self.show1.id)
+        return "/gestion/bda/spectacles/{}/{}".format(self.tirage.id, self.show1.id)
 
 
 class UnpaidViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
@@ -259,7 +259,7 @@ class UnpaidViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/spectacles/unpaid/{}".format(self.tirage.id)
+        return "/gestion/bda/spectacles/unpaid/{}".format(self.tirage.id)
 
 
 class SendRemindersViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
@@ -276,10 +276,9 @@ class SendRemindersViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
 
     @property
     def url_expected(self):
-        return "/bda/mails-rappel/{}".format(self.show1.id)
+        return "/gestion/bda/mails-rappel/{}".format(self.show1.id)
 
     def test_post(self):
-        self.require_custommails()
         resp = self.client.post(self.url)
         self.assertEqual(200, resp.status_code)
         # TODO: check that emails are sent
@@ -292,7 +291,7 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
     bda_testdata = True
 
     def test_api_list(self):
-        url_list = "/bda/catalogue/list"
+        url_list = "/gestion/bda/catalogue/list"
         resp = self.client.get(url_list)
         self.assertJSONEqual(
             resp.content.decode("utf-8"),
@@ -300,7 +299,7 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
         )
 
     def test_api_details(self):
-        url_details = "/bda/catalogue/details?id={}".format(self.tirage.id)
+        url_details = "/gestion/bda/catalogue/details?id={}".format(self.tirage.id)
         resp = self.client.get(url_details)
         self.assertJSONEqual(
             resp.content.decode("utf-8"),
@@ -311,7 +310,9 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
         )
 
     def test_api_descriptions(self):
-        url_descriptions = "/bda/catalogue/descriptions?id={}".format(self.tirage.id)
+        url_descriptions = "/gestion/bda/catalogue/descriptions?id={}".format(
+            self.tirage.id
+        )
         resp = self.client.get(url_descriptions)
         raw = resp.content.decode("utf-8")
         try:
@@ -355,7 +356,9 @@ class TestReventeManageTest(TestCase):
 
     def test_can_get(self):
         client = Client()
-        client.force_login(self.user)
+        client.force_login(
+            self.user, backend="django.contrib.auth.backends.ModelBackend"
+        )
         r = client.get(self.url)
         self.assertEqual(r.status_code, 200)
 

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"),
+    re_path(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"),
+    re_path(
-    url(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
+        r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"
-    url(
+    ),
+    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"),
+    re_path(
-    url(r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"),
+        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"
+    ),
 ]

bda/views.py

@@ -4,17 +4,17 @@ import random
 import time
 from collections import defaultdict
 
-from custommail.models import CustomMail
-from custommail.shortcuts import send_custom_mail, send_mass_custom_mail
 from django.conf import settings
 from django.contrib import messages
 from django.core import serializers
 from django.core.exceptions import NON_FIELD_ERRORS
+from django.core.mail import send_mail, send_mass_mail
 from django.db import transaction
 from django.db.models import Count, Prefetch
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
+from django.template import loader
 from django.template.defaultfilters import pluralize
 from django.urls import reverse
 from django.utils import formats, timezone
@@ -42,7 +42,7 @@ from bda.models import (
     Tirage,
 )
 from gestioncof.decorators import BuroRequiredMixin, buro_required, cof_required
-from shared.views.autocomplete import Select2QuerySetView
+from shared.views import Select2QuerySetView
 
 
 @cof_required
@@ -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 show, members, _ in results:
-        for (member, _, _, _) in members:
+        for member, _, _, _ in members:
             if member.id not in members_uniq:
                 members_uniq[member.id] = member
                 members2[member] = []
@@ -385,12 +385,6 @@ def revente_manage(request, tirage_id):
         user=request.user, tirage=tirage
     )
 
-    # If the participant has just been created, the `paid` field is not
-    # automatically added by our custom ObjectManager. Skip the check in this
-    # scenario.
-    if not created and not participant.paid:
-        return render(request, "bda/revente/notpaid.html", {})
-
     resellform = ResellForm(participant, prefix="resell")
     annulform = AnnulForm(participant, prefix="annul")
     soldform = SoldForm(participant, prefix="sold")
@@ -400,7 +394,7 @@ def revente_manage(request, tirage_id):
         if "resell" in request.POST:
             resellform = ResellForm(participant, request.POST, prefix="resell")
             if resellform.is_valid():
-                datatuple = []
+                mails = []
                 attributions = resellform.cleaned_data["attributions"]
                 with transaction.atomic():
                     for attribution in attributions:
@@ -415,16 +409,17 @@ def revente_manage(request, tirage_id):
                             "show": attribution.spectacle,
                             "revente": revente,
                         }
-                        datatuple.append(
+                        mails.append(
                             (
-                                "bda-revente-new",
+                                "BdA-Revente : {}".format(attribution.spectacle),
-                                context,
+                                loader.render_to_string(
+                                    "bda/mails/revente-seller.txt", context=context
+                                ),
                                 settings.MAIL_DATA["revente"]["FROM"],
                                 [participant.user.email],
                             )
                         )
-                        revente.save()
+                    send_mass_mail(mails)
-                    send_mass_custom_mail(datatuple)
         # On annule une revente
         elif "annul" in request.POST:
             annulform = AnnulForm(participant, request.POST, prefix="annul")
@@ -643,12 +638,16 @@ def revente_buy(request, spectacle_id):
             "acheteur": request.user,
             "vendeur": revente.seller.user,
         }
-        send_custom_mail(
+
-            "bda-buy-shotgun",
+        send_mail(
-            "bda@ens.fr",
+            "BdA-Revente : {}".format(spectacle.title),
+            loader.render_to_string(
+                "bda/mails/revente-shotgun-seller.txt", context=context
+            ),
+            request.user.email,
             [revente.seller.user.email],
-            context=context,
         )
+
         return render(
             request,
             "bda/revente/mail-success.html",
@@ -701,7 +700,7 @@ def spectacle(request, tirage_id, spectacle_id):
             "username": participant.user.username,
             "email": participant.user.email,
             "given": int(attrib.given),
-            "paid": True,
+            "paid": attrib.paid,
             "nb_places": 1,
         }
         if participant.id in participants:
@@ -751,19 +750,21 @@ class UnpaidParticipants(BuroRequiredMixin, ListView):
 def send_rappel(request, spectacle_id):
     show = get_object_or_404(Spectacle, id=spectacle_id)
     # Mails d'exemples
-    custommail = CustomMail.objects.get(shortname="bda-rappel")
+    subject = show.title
-    exemple_mail_1place = custommail.render(
+    body_mail_1place = loader.render_to_string(
-        {"member": request.user, "show": show, "nb_attr": 1}
+        "bda/mails/rappel.txt",
+        context={"member": request.user, "show": show, "nb_attr": 1},
     )
-    exemple_mail_2places = custommail.render(
+    body_mail_2places = loader.render_to_string(
-        {"member": request.user, "show": show, "nb_attr": 2}
+        "bda/mails/rappel.txt",
+        context={"member": request.user, "show": show, "nb_attr": 2},
     )
+
     # Contexte
     ctxt = {
         "show": show,
-        "exemple_mail_1place": exemple_mail_1place,
+        "exemple_mail_1place": (subject, body_mail_1place),
-        "exemple_mail_2places": exemple_mail_2places,
+        "exemple_mail_2places": (subject, body_mail_2places),
-        "custommail": custommail,
     }
     # Envoi confirmé
     if request.method == "POST":

bds/apps.py

@@ -1,5 +1,28 @@
-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
+
+
+def bds_group_perms(app_config, apps=global_apps, **kwargs):
+    try:
+        Permission = apps.get_model("auth", "Permission")
+        Group = apps.get_model("auth", "Group")
+
+        group = Group.objects.get(name="Burô du BDS")
+        perms = Permission.objects.filter(
+            Q(content_type__app_label="bds")
+            | Q(content_type__app_label="auth") & Q(content_type__model="user")
+        )
+        group.permissions.set(perms)
+        group.save()
+
+    except (LookupError, Group.DoesNotExist):
+        return
 
 
 class BdsConfig(AppConfig):
     name = "bds"
+    verbose_name = "Gestion des adhérent·e·s du BDS"
+
+    def ready(self):
+        post_migrate.connect(bds_group_perms, sender=self)

bds/autocomplete.py

@@ -1,7 +1,11 @@
+from urllib.parse import urlencode
+
 from django.contrib.auth import get_user_model
 from django.db.models import Q
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
-from shared.views import autocomplete
+from shared import autocomplete
 
 User = get_user_model()
 
@@ -9,28 +13,50 @@ User = get_user_model()
 class BDSMemberSearch(autocomplete.ModelSearch):
     model = User
     search_fields = ["username", "first_name", "last_name"]
+    verbose_name = _("Membres du BDS")
 
     def get_queryset_filter(self, *args, **kwargs):
         qset_filter = super().get_queryset_filter(*args, **kwargs)
         qset_filter &= Q(bds__is_member=True)
         return qset_filter
 
+    def result_uuid(self, user):
+        return user.username
+
+    def result_link(self, user):
+        return reverse("bds:user.update", args=(user.pk,))
+
 
 class BDSOthersSearch(autocomplete.ModelSearch):
     model = User
     search_fields = ["username", "first_name", "last_name"]
+    verbose_name = _("Non-membres du BDS")
 
     def get_queryset_filter(self, *args, **kwargs):
         qset_filter = super().get_queryset_filter(*args, **kwargs)
         qset_filter &= Q(bds__isnull=True) | Q(bds__is_member=False)
         return qset_filter
 
+    def result_uuid(self, user):
+        return user.username
+
+    def result_link(self, user):
+        return reverse("bds:user.update", args=(user.pk,))
+
+
+class BDSLDAPSearch(autocomplete.LDAPSearch):
+    def result_link(self, clipper):
+        url = reverse("bds:user.create.fromclipper", args=(clipper.clipper,))
+        get = {"fullname": clipper.fullname, "mail": clipper.mail}
+
+        return "{}?{}".format(url, urlencode(get))
+
 
 class BDSSearch(autocomplete.Compose):
     search_units = [
-        ("members", "username", BDSMemberSearch),
+        ("members", BDSMemberSearch()),
-        ("others", "username", BDSOthersSearch),
+        ("others", BDSOthersSearch()),
-        ("clippers", "clipper", autocomplete.LDAPSearch),
+        ("clippers", BDSLDAPSearch()),
     ]
 
 

bds/forms.py

@@ -1,30 +1,41 @@
 from django import forms
 from django.contrib.auth import get_user_model
+from django.contrib.auth.forms import UserCreationForm
+from django.utils.translation import gettext_lazy as _
 
 from bds.models import BDSProfile
 
 User = get_user_model()
 
 
-class BDSUserForm(forms.ModelForm):
+class UserForm(forms.ModelForm):
+    is_buro = forms.BooleanField(label=_("Membre du Burô"), required=False)
+
     class Meta:
         model = User
-        fields = ["first_name", "last_name", "email"]
+        fields = ["email", "first_name", "last_name"]
 
 
-class BDSProfileForm(forms.ModelForm):
+class UserFromClipperForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["username"].disabled = True
+
+    class Meta:
+        model = User
+        fields = ["username", "email", "first_name", "last_name"]
+
+
+class UserFromScratchForm(UserCreationForm):
+    class Meta:
+        model = User
+        fields = ["username", "email", "first_name", "last_name"]
+
+
+class ProfileForm(forms.ModelForm):
     class Meta:
         model = BDSProfile
-        fields = [
+        exclude = ["user"]
-            "phone",
+        widgets = {
-            "occupation",
+            "birthdate": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d")
-            "departement",
+        }
-            "birthdate",
-            "mails_bds",
-            "has_certificate",
-            "ASPSL_number",
-            "FFSU_number",
-            "is_member",
-            "cotisation_period",
-            "cotisation_type",
-        ]

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)]

bds/migrations/0002_bds_group.py

@@ -1,28 +1,14 @@
 # Generated by Django 2.2 on 2019-07-17 14:56
 
-from django.contrib.auth.management import create_permissions
 from django.db import migrations
-from django.db.models import Q
 
 
 def create_bds_buro_group(apps, schema_editor):
-    for app_config in apps.get_app_configs():
-        create_permissions(app_config, apps=apps, verbosity=0)
-
     Group = apps.get_model("auth", "Group")
-    Permission = apps.get_model("auth", "Permission")
+    Group.objects.get_or_create(name="Burô du BDS")
-    group, created = Group.objects.get_or_create(name="Burô du BDS")
-    if created:
-        perms = Permission.objects.filter(
-            Q(content_type__app_label="bds")
-            | Q(content_type__app_label="auth") & Q(content_type__model="user")
-        )
-        group.permissions.set(perms)
-        group.save()
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("bds", "0001_initial")]
 
     operations = [

bds/migrations/0003_staff_permission.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("bds", "0002_bds_group"),
     ]
@@ -18,5 +17,8 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Profils BDS",
             },
         ),
-        migrations.RemoveField(model_name="bdsprofile", name="is_buro",),
+        migrations.RemoveField(
+            model_name="bdsprofile",
+            name="is_buro",
+        ),
     ]

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"),
     ]

bds/migrations/0005_remove_bdsprofile_certificate_file.py

@@ -0,0 +1,16 @@
+# Generated by Django 2.2.14 on 2020-07-27 20:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bds", "0004_is_member_cotiz_type"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="bdsprofile",
+            name="certificate_file",
+        ),
+    ]

bds/migrations/0006_bdsprofile_comments.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.12 on 2020-08-28 12:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bds", "0005_remove_bdsprofile_certificate_file"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="bdsprofile",
+            name="comments",
+            field=models.TextField(
+                blank=True,
+                help_text="Attention : l'utilisateur·ice dispose d'un droit d'accès"
+                " aux données le/la concernant, dont le contenu de ce champ !",
+                verbose_name="commentaires",
+            ),
+        ),
+    ]

bds/mixins.py

@@ -1,5 +1,122 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.exceptions import ImproperlyConfigured
+from django.http import HttpResponseRedirect
+from django.views.generic.base import ContextMixin, TemplateResponseMixin, View
 
 
 class StaffRequiredMixin(PermissionRequiredMixin):
-    permission_required = "bds:is_team"
+    permission_required = "bds.is_team"
+
+
+class MultipleFormMixin(ContextMixin):
+    """Mixin pour gérer plusieurs formulaires dans la même vue.
+    Le fonctionnement est relativement identique à celui de
+    FormMixin, dont la documentation est disponible ici :
+    https://docs.djangoproject.com/en/3.0/ref/class-based-views/mixins-editing/
+
+    Les principales différences sont :
+    - au lieu de form_class, il faut donner comme attribut un dict de la forme
+    {<form_name>: <form_class>}, avec tous les formulaires à instancier. On
+    peut aussi redéfinir `get_form_classes`
+
+    - les données initiales se récupèrent pour chaque form via l'attribut
+    `<form_name>_initial` ou la fonction `get_<form_name>_initial`. De même,
+    si certaines forms sont des `ModelForm`s, on peut définir la fonction
+    `get_<form_name>_instance`.
+
+    - chaque form a un préfixe rajouté, par défaut <form_name>, mais qui peut
+    être customisé via `prefixes` ou `get_prefixes`.
+    """
+
+    form_classes = {}
+    prefixes = {}
+    initial = {}
+
+    success_url = None
+
+    def get_form_classes(self):
+        return self.form_classes
+
+    def get_initial(self, form_name):
+        initial_attr = "%s_initial" % form_name
+
+        initial_method = "get_%s_initial" % form_name
+        initial_method = getattr(self, initial_method, None)
+
+        if hasattr(self, initial_attr):
+            return getattr(self, initial_attr)
+        elif callable(initial_method):
+            return initial_method()
+        else:
+            return self.initial.copy()
+
+    def get_prefix(self, form_name):
+        return self.prefixes.get(form_name, form_name)
+
+    def get_instance(self, form_name):
+        # Au cas où certaines des forms soient des ModelForms
+        instance_method = "get_%s_instance" % form_name
+        instance_method = getattr(self, instance_method, None)
+
+        if callable(instance_method):
+            return instance_method()
+        else:
+            return None
+
+    def get_form_kwargs(self, form_name):
+        kwargs = {
+            "initial": self.get_initial(form_name),
+            "prefix": self.get_prefix(form_name),
+            "instance": self.get_instance(form_name),
+        }
+
+        if self.request.method in ("POST", "PUT"):
+            kwargs.update({"data": self.request.POST, "files": self.request.FILES})
+
+        return kwargs
+
+    def get_forms(self):
+        form_classes = self.get_form_classes()
+        return {
+            form_name: form_class(**self.get_form_kwargs(form_name))
+            for form_name, form_class in form_classes.items()
+        }
+
+    def get_success_url(self):
+        if not self.success_url:
+            raise ImproperlyConfigured("No URL to redirect to. Provide a success_url.")
+        return str(self.success_url)
+
+    def form_valid(self, forms):
+        # on garde le nom form_valid pour l'interface avec SuccessMessageMixin
+        return HttpResponseRedirect(self.get_success_url())
+
+    def form_invalid(self, forms):
+        """If the form is invalid, render the invalid form."""
+        return self.render_to_response(self.get_context_data(forms=forms))
+
+
+class ProcessMultipleFormView(View):
+    """Équivalent de `ProcessFormView` pour plusieurs forms.
+    Note : il faut que *tous* les formulaires soient valides pour
+    qu'ils soient sauvegardés !
+    """
+
+    def get(self, request, *args, **kwargs):
+        forms = self.get_forms()
+        return self.render_to_response(self.get_context_data(forms=forms))
+
+    def post(self, request, *args, **kwargs):
+        forms = self.get_forms()
+        if all(form.is_valid() for form in forms.values()):
+            return self.form_valid(forms)
+        else:
+            return self.form_invalid(forms)
+
+
+class BaseMultipleFormView(MultipleFormMixin, ProcessMultipleFormView):
+    pass
+
+
+class MultipleFormView(TemplateResponseMixin, BaseMultipleFormView):
+    pass

bds/models.py

@@ -3,6 +3,7 @@ from os.path import splitext
 
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from shared.utils import choices_length
@@ -62,14 +63,11 @@ class BDSProfile(models.Model):
         null=True,
     )
 
+    is_member = models.BooleanField(_("adhérent⋅e du BDS"), default=False)
+
     mails_bds = models.BooleanField(_("recevoir les mails du BDS"), default=False)
 
     has_certificate = models.BooleanField(_("certificat médical"), default=False)
-    certificate_file = models.FileField(
-        _("fichier de certificat médical"),
-        upload_to=get_certificate_filename,
-        blank=True,
-    )
 
     ASPSL_number = models.CharField(
         _("numéro AS PSL"), max_length=50, blank=True, null=True
@@ -77,8 +75,6 @@ class BDSProfile(models.Model):
     FFSU_number = models.CharField(
         _("numéro FFSU"), max_length=50, blank=True, null=True
     )
-
-    is_member = models.BooleanField(_("adhérent⋅e du BDS"), default=False)
     cotisation_period = models.CharField(
         _("inscription"), default="NO", choices=COTIZ_DURATION_CHOICES, max_length=3
     )
@@ -89,6 +85,25 @@ class BDSProfile(models.Model):
         _("type de cotisation"), choices=TYPE_COTIZ_CHOICES, max_length=9
     )
 
+    comments = models.TextField(
+        _("commentaires"),
+        blank=True,
+        help_text=_(
+            "Attention : l'utilisateur·ice dispose d'un droit d'accès aux données "
+            "le/la concernant, dont le contenu de ce champ !"
+        ),
+    )
+
+    @classmethod
+    def expired_members(cls):
+        now = timezone.now()
+        qs = cls.objects.filter(is_member=True)
+        if now.month > 1 and now.month < 7:
+            return qs.filter(cotisation_period="SE1")
+        elif now.month < 2 or now.month > 8:
+            return qs.none()
+        return qs
+
     class Meta:
         verbose_name = _("Profil BDS")
         verbose_name_plural = _("Profils BDS")

bds/static/bds/images/logo_square.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   preserveAspectRatio="xMidYMid meet"
+   viewBox="0 0 2560 2560"
+   height="256"
+   width="256"
+   version="1.0">
+  <g
+     transform="translate(-220,50)"
+     stroke="none"
+     fill="#ffffff"
+     id="layer101">
+    <path
+       id="path2"
+       d="M 0,1230 V 0 H 1500 3000 V 1230 2460 H 1500 0 Z" />
+  </g>
+  <g
+     transform="translate(-220,50)"
+     stroke="none"
+     fill="#3e2263"
+     id="layer102">
+    <path
+       id="path5"
+       d="M 220,1230 V -50 H 1500 2780 V 1230 2510 H 1500 220 Z m 1496,765 c 103,-17 204,-46 284,-83 l 55,-25 -40,-8 c -80,-16 -169,-10 -245,16 -123,42 -232,59 -385,59 -126,0 -278,-18 -341,-40 -13,-5 -16,-4 -9,4 14,15 166,60 254,76 102,19 315,19 427,1 z m -703,-217 c 15,-6 27,-13 27,-17 0,-4 -37,-25 -82,-47 -86,-43 -182,-120 -193,-155 -8,-26 32,-113 78,-167 44,-52 46,-62 10,-62 -39,1 -106,33 -165,80 -40,31 -54,38 -64,29 -21,-18 -17,-50 16,-116 57,-113 151,-199 259,-235 49,-16 51,-18 16,-13 -123,19 -260,151 -322,310 -15,39 -14,-81 1,-147 25,-107 55,-176 112,-251 49,-65 52,-73 38,-88 -21,-23 -104,-62 -216,-100 -51,-18 -97,-35 -102,-40 -4,-4 32,-10 80,-14 106,-9 256,13 317,48 l 39,22 56,-33 c 32,-18 114,-61 184,-95 80,-39 126,-67 123,-74 -6,-19 12,-16 19,3 9,24 28,5 22,-22 -7,-26 8,-34 18,-9 11,29 28,16 21,-18 -6,-30 -5,-31 10,-13 8,11 15,24 15,29 0,4 5,5 10,2 6,-3 8,-18 4,-33 -5,-26 -5,-26 10,-8 15,19 18,19 118,-12 113,-35 284,-72 329,-72 24,0 29,4 29,25 0,34 -36,125 -63,158 l -22,28 -59,-30 c -74,-39 -165,-43 -233,-10 -24,11 -43,25 -43,30 0,4 28,6 63,2 49,-4 71,-2 98,12 46,23 79,55 79,75 0,16 -48,66 -135,139 l -40,33 43,-23 c 55,-30 166,-121 188,-154 9,-13 13,-29 9,-36 -15,-23 -100,-69 -129,-69 -17,0 -38,-5 -46,-10 -12,-8 -10,-10 10,-10 49,1 104,19 149,51 l 45,31 24,-28 c 33,-40 72,-128 79,-180 10,-79 -25,-96 -233,-114 -84,-7 -148,-7 -218,0 -106,12 -269,51 -317,76 -28,14 -31,13 -62,-10 -56,-43 -167,-89 -225,-94 l -55,-5 6,29 c 2,16 14,55 26,86 21,57 27,112 15,142 -3,9 -34,38 -68,64 l -62,49 -104,7 c -166,12 -192,34 -83,70 34,12 65,24 68,28 4,4 -7,27 -24,52 -118,171 -124,402 -16,571 18,29 50,88 70,131 42,93 99,154 168,184 82,35 212,44 280,18 z m 540,-39 c 60,-16 70,-41 75,-196 l 5,-134 -39,3 -39,3 -5,114 c -4,93 -8,116 -22,125 -31,19 -41,-7 -47,-126 l -6,-113 -32,-3 c -41,-4 -44,6 -34,151 9,143 25,172 101,186 3,0 22,-4 43,-10 z m 322,-34 c 0,-30 0,-30 -64,-33 l -64,-3 7,-130 7,-129 h -35 -36 v 165 166 l 93,-3 92,-3 z m 115,-55 5,-84 18,27 c 21,33 39,34 60,5 15,-22 16,-18 16,60 l 1,82 h 35 35 l -2,-162 -3,-163 h -40 c -38,0 -41,2 -53,43 -16,49 -24,48 -42,-7 -12,-38 -16,-41 -50,-41 -34,0 -38,3 -44,31 -8,43 -8,284 1,293 4,4 19,6 33,4 24,-3 25,-6 30,-88 z m 370,-42 c 193,-243 228,-505 100,-759 -61,-120 -195,-260 -328,-343 -66,-41 -60,-26 13,33 36,29 92,85 125,126 182,230 209,500 75,753 -42,79 -45,89 -45,163 0,44 4,79 9,79 5,0 28,-24 51,-52 z M 1249,1314 c 76,-30 94,-102 41,-156 -27,-27 -29,-32 -17,-47 34,-40 25,-100 -19,-120 -30,-13 -143,-15 -164,-1 -11,7 -15,42 -18,164 l -4,156 23,9 c 37,15 115,13 158,-5 z m 571,-9 c 84,-43 61,-135 -43,-173 -46,-18 -52,-23 -52,-48 0,-39 30,-42 79,-9 l 37,25 -3,-41 c -4,-49 -32,-76 -90,-85 -32,-6 -41,-2 -68,24 -24,25 -30,39 -30,74 0,57 21,85 87,114 40,18 54,29 51,42 -5,29 -71,28 -111,-2 -19,-14 -36,-26 -39,-26 -11,0 -16,55 -7,72 24,45 131,63 189,33 z m -303,-12 c 56,-26 75,-65 71,-150 -3,-67 -6,-75 -38,-108 -43,-44 -94,-61 -146,-48 l -39,9 -3,144 c -1,79 0,150 2,157 8,19 110,17 153,-4 z" />
+    <path
+       id="path7"
+       d="m 1503,633 c 4,-3 10,-3 14,0 3,4 0,7 -7,7 -7,0 -10,-3 -7,-7 z" />
+    <path
+       id="path9"
+       d="m 1532,448 c 3,-7 15,-14 29,-16 23,-2 23,-2 5,13 -24,18 -39,20 -34,3 z" />
+    <path
+       id="path11"
+       d="m 1140,1231 c 0,-45 10,-61 36,-61 26,0 64,32 64,53 0,23 -23,37 -62,37 -35,0 -38,-2 -38,-29 z" />
+    <path
+       id="path13"
+       d="m 1140,1070 c 0,-35 17,-45 56,-36 20,5 25,12 22,34 -3,23 -8,27 -40,30 -36,3 -38,2 -38,-28 z" />
+    <path
+       id="path15"
+       d="m 1430,1151 c 0,-72 3,-91 14,-91 28,0 47,13 61,41 31,60 10,121 -47,135 l -28,6 z" />
+  </g>
+</svg>

bds/static/bds/js/bds.js

@@ -0,0 +1,7 @@
+$(function () {
+    // Close notifications when delete button is pressed
+    $(".notification .delete").on("click", function () {
+        $(this).parent().remove();
+    });
+
+});

bds/static/src/sass/bds.scss

@@ -0,0 +1,152 @@
+// Compilation command : 
+// sass -I shared/static/src/ --watch bds/static/src/sass/bds.scss bds/static/bds/css/bds.css --style compressed
+
+$text: black;
+
+@import "bulma/bulma.sass";
+
+$primary_color: #3e2263;
+$background_color: #ddcecc;
+
+html, body {
+  background: $background_color;
+  font-size: 18px;
+}
+
+a {
+  text-decoration: none;
+  color: #a82305;
+}
+
+/* header */
+
+#search-bar {
+  background-color: $primary_color;
+  padding: 0 1em;
+  margin-bottom: 0;
+
+  #logout-mobile {
+    display: none;
+  }
+
+  @include mobile {
+    display: flex;
+    flex-wrap: wrap;
+
+    #logout-mobile {
+      display: flex;
+      flex-direction: row-reverse;
+      justify-content: space-between;
+    }
+
+    #logout {
+      display: none;
+    }
+
+    #search-input {
+      flex: 0 1 100%;
+    }
+  }
+
+  // Workaround : `justify-content : <left/right>` pas encore supporté
+  // Voir https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
+  & :first-child, & :last-child {
+    justify-content: space-between;
+  }
+
+  & :last-child {
+    flex-direction: row-reverse;
+  }
+
+  input {
+    border-radius: 0;
+    margin: 10px 0;
+  }
+}
+
+/* Autocomplétion du BDS */
+
+.highlight {
+  text-decoration: underline;
+  font-weight: bold;
+}
+
+.yourlabs-autocomplete {
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+
+    li {
+      height: 2em;
+      line-height: 2em;
+      padding: 0;
+
+      a {
+        color: inherit;
+      }
+    }
+
+    li.hilight {
+      background: #e8554e;
+    }
+  }
+}
+
+.autocomplete-item {
+  display: block;
+  width: 480px;
+  height: 100%;
+  padding: 2px 10px;
+  margin: 0;
+}
+
+.autocomplete-header {
+  background: #b497e1;
+}
+
+.autocomplete-value, .autocomplete-new, .autocomplete-more {
+  background: white;
+}
+
+/* --- Forms --- */
+
+$button_color: lighten($primary_color, 10);
+
+input[type="submit"] {
+    background-color: $button_color;
+    color: findColorInvert($button_color);
+
+    &:hover {
+      background-color: $primary_color;
+      color: findColorInvert($primary_color);
+    }
+}
+
+.button.is-primary {
+  background-color: $button_color;
+    color: findColorInvert($button_color);
+
+    &:hover {
+      background-color: $primary_color;
+      color: findColorInvert($primary_color);
+    }
+}
+
+/* --- Message styling --- */
+
+.notification {
+  padding: 0.5em 0;
+  font-size: 1.2em;
+  text-align: center;
+}
+
+/* --- Modals --- */
+
+.modal-card-head {
+  background-color: $primary_color;
+
+  .modal-card-title {
+    color: findColorInvert($primary_color);
+  }
+}

bds/templates/bds/base.html

@@ -1,4 +1,5 @@
-{% load staticfiles %}
+{% load static %}
+{% load bulma_utils %}
 
 <!DOCTYPE html>
 <html>
@@ -10,16 +11,40 @@
 
     {# CSS #}
     <link rel="stylesheet" href="{% static "bds/css/bds.css" %}">
-    <link rel="stylesheet" href="{% static "shared/css/messages.css" %}">
+    <link type="text/css" rel="stylesheet" href="{% static 'vendor/font-awesome/css/font-awesome.min.css' %}">
 
     {# Javascript #}
     <script src="{% static 'vendor/jquery/jquery-3.3.1.min.js' %}"></script>
     <script src="{% static "vendor/jquery/jquery.autocomplete-light.min.js" %}"></script>
+    <script src="{% static 'bds/js/bds.js' %}"></script>
+
+    {% block extra_head %}{% endblock extra_head %}
   </head>
   <body>
     {% include "bds/nav.html" %}
-    {% include "bds/messages.html" %}
+    {% block layout %}
+    <div class="columns">
+      <div class="column is-two-thirds is-offset-2">
+        <section class="section">
 
-    {% block content %}{% endblock %}
+          {% if messages %}
+            {% for message in messages %}
+              <div class="notification is-{{ message.level_tag|bulma_message_tag }}">
+                {% if 'safe' in message.tags %}
+                    {{ message|safe }}
+                {% else %}
+                    {{ message }}
+                {% endif %}
+                <button class="delete"></button>
+              </div>
+            {% endfor %}
+          {% endif %}
+
+          {% block content %}
+          {% endblock content %}
+        </section>
+      </div>
+    </div>
+    {% endblock layout %}
   </body>
 </html>

bds/templates/bds/expired_members.html

@@ -0,0 +1,22 @@
+{% extends "bds/base.html" %}
+
+
+{% block content %}
+
+<h1 class="title">Liste des adhésions expirées</h1>
+
+{% if object_list %}
+<div class="content">
+    <ul>
+        {% for p in object_list %}
+        <li>{{ p.user.first_name }} {{ p.user.last_name }} ({{ p.user.username }}), {{ p.get_cotisation_period_display }}</li>
+        {% endfor %}
+    </ul>
+</div>
+
+<div class="buttons is-centered">
+  <a class="button is-danger" href="{% url 'bds:members.reset' %}">Réinitialiser les adhésions expirées</a>
+</div>
+{% endif %}
+
+{% endblock %}

bds/templates/bds/forms/checkbox.html

@@ -0,0 +1,16 @@
+<div class="control">
+  {% if field.auto_id %}
+    <label class="checkbox {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+      {{ field }} {{ field.label }}
+    </label>
+  {% endif %}
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/field.html

@@ -0,0 +1,33 @@
+{% load bulma_utils %}
+
+<div class="field">
+  {% if field|is_checkbox %}
+
+    {% include "bds/forms/checkbox.html" with field=field %}
+
+  {% elif field|is_radio %}
+
+    {% include "bds/forms/radio.html" with field=field %}
+
+  {% elif field|is_input %}
+
+    {% include "bds/forms/input.html" with field=field %}
+
+  {% elif field|is_textarea %}
+
+    {% include "bds/forms/textarea.html" with field=field %}
+
+  {% elif field|is_select %}
+
+    {% include "bds/forms/select.html" with field=field %}
+
+  {% elif field|is_file %}
+
+    {% include "bds/forms/file.html" with field=field %}
+
+  {% else %}
+
+    {% include "bds/forms/other.html" with field=field %}
+
+  {% endif %}
+</div>

bds/templates/bds/forms/file.html

@@ -0,0 +1,31 @@
+{% load bulma_utils %}
+{% load i18n %}
+
+<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+  {{ field.label }}
+</label>
+
+<div class="control">
+
+  <label class="file-label">
+    {{ field|bulmafy:'file-input' }}
+    <span class="file-cta">
+      <span class="file-icon">
+        <i class="fa fa-upload"></i>
+      </span>
+      <span class="file-label">
+        {% trans "Choisissez un fichier..." %}
+      </span>
+    </span>
+  </label>
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/form.html

@@ -0,0 +1,22 @@
+{% if errors %}
+  {% if form.non_field_errors %}
+    <div class="message is-danger">
+      <div class="message-header">
+        <button class="delete" aria-label="delete"></button>
+      </div>
+      <div class="message-body">
+        {% for non_field_error in form.non_field_errors %}
+          {{ non_field_error }}
+        {% endfor %}
+      </div>
+    </div>
+  {% endif %}
+{% endif %}
+
+{% for field in form.hidden_fields %}
+  {{ field }}
+{% endfor %}
+
+{% for field in form.visible_fields %}
+  {% include 'bds/forms/field.html' %}
+{% endfor %}

bds/templates/bds/forms/input.html

@@ -0,0 +1,19 @@
+{% load bulma_utils %}
+
+<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+    {{ field.label }}
+</label>
+
+<div class="control">
+  {{ field|bulmafy:'input' }}
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/other.html

@@ -0,0 +1,19 @@
+{% if field.auto_id %}
+  <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">
+    {{ field.label }}
+  </label>
+{% endif %}
+
+<div class="control {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
+  {{ field }}
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/radio.html

@@ -0,0 +1,24 @@
+{% if field.auto_id %}
+  <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+    {{ field.label }}
+  </label>
+{% endif %}
+
+<div class="control">
+  {% for choice in field %}
+    <label class="radio">
+      {{ choice.tag }}
+      {{ choice.choice_label }}
+    </label>
+  {% endfor %}
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/select.html

@@ -0,0 +1,21 @@
+{% load bulma_utils %}
+
+<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+  {{ field.label }}
+</label>
+
+<div class="control">
+  <span class="select{% if field|is_multiple_select %} is-multiple{% endif %}{% if field.errors|length > 0 %} is-danger{% endif %}">
+    {{ field }}
+  </span>
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/forms/textarea.html

@@ -0,0 +1,19 @@
+{% load bulma_utils %}
+
+<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
+  {{ field.label }}
+</label>
+
+<div class="control">
+  {{ field|bulmafy:'textarea' }}
+
+  {% for error in field.errors %}
+    <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
+  {% endfor %}
+  
+  {% if field.help_text %}
+    <p class="help">
+      {{ field.help_text|safe }}
+    </p>
+  {% endif %}
+</div>

bds/templates/bds/home.html

@@ -1,22 +1,62 @@
 {% extends "bds/base.html" %}
+{% load bulma_utils %}
 
-{% block content %}
+{% block layout %}
-<div style="width: 60%; margin: auto; padding-top: 2em;">
+<div class="columns">
-  Bienvenue sur GestioBDS&#8239;!
+  <div class="column is-2">
+    <section class="section">
+      <div class="box">
+        <div class="content has-text-centered">
+          <h1>{{ member_count }}</h1>
+          adhérent·e·s
+        </div>
+      </div>
+    </section>
+  </div>
+  <div class="column is-two-thirds">
+    <section class="section">
 
-  <br>
+      {% if messages %}
-  <br>
+        {% for message in messages %}
+          <div class="notification is-{{ message.level_tag|bulma_message_tag }}">
+            {% if 'safe' in message.tags %}
+                {{ message|safe }}
+            {% else %}
+                {{ message }}
+            {% endif %}
+            <button class="delete"></button>
+          </div>
+        {% endfor %}
+      {% endif %}
+      <div class="container">
+        Bienvenue sur GestioBDS&#8239;!
 
-  Le site est encore en développement.
+        <br>
-  <br>
+        <br>
-  Suivez notre avancement sur
+
-  <a href="https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/merge_requests?milestone_title=Int%C3%A9gration+du+BDS">
+        <a class=button href="{% url 'bds:export.members' %}">Télécharger la liste des membres (CSV)</a>
-  cette milestone</a> sur le gitlab de l'ENS.
+
-  <br>
+        <a class=button href="{% url 'bds:members.expired' %}">Liste des adhésions expirées ({{ nb_expired }})</a>
-  Faites vos remarques par mail à
+
-  <a href="mailto:klub-dev@ens.fr"><tt>klub-dev@ens.fr</tt></a>
+        <br>
-  ou en ouvrant une
+        <br>
-  <a href="#https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/issues?milestone_title=Int%C3%A9gration+du+BDS">
+
-  issue</a>.
+        Le site est encore en développement.
+        <br>
+        Suivez notre avancement sur
+        <a href="https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/merge_requests?milestone_title=Int%C3%A9gration+du+BDS">
+        cette milestone</a> sur le gitlab de l'ENS.
+        <br>
+        Faites vos remarques par mail à
+        <a href="mailto:klub-dev@ens.fr"><tt>klub-dev@ens.fr</tt></a>
+        ou en ouvrant une
+        <a href="#https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/issues?milestone_title=Int%C3%A9gration+du+BDS">
+        issue</a>.
+      </div>
+    </section>
+  </div>
 </div>
-{% endblock %}
+{% endblock layout %}
+
+
+

bds/templates/bds/messages.html

@@ -1,9 +0,0 @@
-{% if messages %}
-  {% for message in messages %}
-    <div class="messages">
-      <div class="alert alert-{{ message.level_tag }} alert-dismissible fade in{% if message.tags %} {{ message.tags }}{% endif %}">
-        {{ message }}
-      </div>
-    </div>
-  {% endfor %}
-{% endif %}

bds/templates/bds/nav.html

@@ -1,13 +1,26 @@
 {% load i18n %}
 {% load static %}
 
-<nav id="search-bar">
+<nav id="search-bar" class="level">
-  <a href="{% url "bds:home" %}">
+  <div class="level-item" id="logo">
-    <img src="{% static "bds/images/logo.svg" %}" alt="bds-logo">
+    <figure class="image is-64x64">
-  </a>
+      <a href="{% url "bds:home" %}">
+        <img src="{% static "bds/images/logo_square.svg" %}" alt="bds-logo">
+      </a>
+    </figure>
+  </div>
 
-  <div>
+  <div class="level-item" id="logout-mobile">
+    <figure class="image is-64x64">
+      <a href="{% url 'authens:logout' %}">
+        <img src="{% static "bds/images/logout.svg" %}" alt="logout">
+      </a>
+    </figure>
+  </div>
+
+  <div class="level-item" id="search-input">
     <input
+      class="input"
       type="text"
       name="q"
       id="search_autocomplete"
@@ -16,9 +29,13 @@
     <div class="yourlabs-autocomplete"></div>
   </div>
 
-  <a href="#TODO">
+  <div class="level-item" id="logout">
-    <img src="{% static "bds/images/logout.svg" %}" alt="logout">
+    <figure class="image is-64x64">
-  </a>
+      <a href="{% url 'authens:logout' %}">
+        <img src="{% static "bds/images/logout.svg" %}" alt="logout">
+      </a>
+    </figure>
+  </div>
 </nav>
 
 <script type="text/javascript">

bds/templates/bds/search_results.html

@@ -1,73 +1,21 @@
+{% extends "shared/search_results.html" %}
 {% load i18n %}
-{% load search_utils %}
 
-<ul>
+{% block extra_section %}
-  {% if members %}
+  <li class="autocomplete-header">
-    <li class="autocomplete-header">
+    {% if not results %}
-      <span class="autocomplete-item">{% trans "Membres" %}</span>
+      <span class="autocomplete-item">
-    </li>
+        {% trans "Aucune correspondance trouvée" %}
-    {% for user in members %}
+      </span>
-      {% if forloop.counter < 5 %}
+    {% else %}
-        <li class="autocomplete-value">
+      <span class="autocomplete-item">
-          <a class="autocomplete-item" href="{% url "bds:user.update"  user.id %}">
+        {% trans "Pas dans la liste ?" %}
-            {{ user|highlight_user:q }}
+      </span>
-          </a>
+    {% endif %}
-        </li>
-      {% elif forloop.counter == 5 %}
-        <li class="autocomplete-more">
-          <span class="autocomplete-item">...</span>
-        </li>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-
-  {% if others %}
-    <li class="autocomplete-header">
-      <span class="autocomplete-item">{% trans "Non-membres" %}</span>
-    </li>
-    {% for user in others %}
-      {% if forloop.counter < 5 %}
-        <li class="autocomplete-value">
-          <a class="autocomplete-item" href="{% url "bds:user.update" user.id %}">
-            {{ user|highlight_user:q }}
-          </a>
-        </li>
-      {% elif forloop.counter == 5 %}
-        <li class="autocomplete-more">
-          <span class="autocomplete-item">...</span>
-        </li>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-
-  {% if clippers %}
-    <li class="autocomplete-header">{% trans "Utilisateurs <tt>clipper</tt>" %}</li>
-    {% for clipper in clippers %}
-      {% if forloop.counter < 5 %}
-        <li class="autocomplete-value">
-          <a class="autocomplete-item" href="#TODO">
-            {{ clipper|highlight_clipper:q }}
-          </a>
-        </li>
-      {% elif forloop.counter == 5 %}
-        <li class="autocomplete-more">
-          <span class="autocomplete-item">...</span>
-        </li>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-
-  {% if total %}
-    <li class="autocomplete-header">
-      <span class="autocomplete-item">{% trans "Pas dans la liste ?" %}</span>
-    </li>
-  {% else %}
-    <li class="autocomplete-header">
-      <span class="autocomplete-item">{% trans "Aucune correspondance trouvée" %}</span>
-    </li>
-  {% endif %}
-
-  <li class="autocomplete-new">
-    <a class="autocomplete-item" href="#TODO">{% trans "Créer un compte" %}</a>
   </li>
-</ul>
+  <li class="autocomplete-new">
+    <a class="autocomplete-item" href="{% url "bds:user.create" %}">
+      {% trans "Créer un compte" %}
+    </a>
+  </li>
+{% endblock %}

bds/templates/bds/user_create.html

@@ -0,0 +1,33 @@
+{% extends "bds/base.html" %}
+{% load i18n %}
+
+
+{% block content %}
+
+{% for form in forms.values %}
+  {% for error in form.non_field_errors %}
+    <div class="notification is-danger">
+      {{ error }}
+    </div>
+  {% endfor %}
+{% endfor %}
+
+<h1 class="title">{% trans "Création d'un profil" %}</h1>
+
+<div class="container">
+  <form action="" method="post">
+    {% csrf_token %}
+
+    {% for form in forms.values %}
+      {% include "bds/forms/form.html" with form=form errors=False %}
+    {% endfor %}
+
+    <div class="field">
+      <p class="control">
+        <input class="button is-fullwidth" type="submit" value="Enregistrer">
+      </p>
+    </div>
+  </form>
+</div>
+
+{% endblock %}

bds/templates/bds/user_update.html

@@ -1,31 +1,104 @@
 {% extends "bds/base.html" %}
 {% load i18n %}
 
+
 {% block content %}
-  <form action="" method="post">
-    {% csrf_token %}
 
-    {% for field in user_form %}
+{% for form in forms.values %}
-      <div class="form-field">
+{% for error in form.non_field_errors %}
-        {{ field.errors }}
+<div class="notification is-danger">
-        {{ field.label_tag }}
+    {{ error }}
-        {{ field }}
+</div>
-        {% if field.help_text %}
+{% endfor %}
-          <p class="help">{{ field.help_text|safe }}</p>
+{% endfor %}
-        {% endif %}
-      </div>
-    {% endfor %}
 
-    {% for field in profile_form %}
+<h1 class="title">{% trans "Modification du profil " %}{{ view.user.username }}</h1>
-      <div class="form-field">
+
-        {{ field.errors }}
+<div class="container">
-        {{ field.label_tag }} {{ field }}
+    <form method="post" action="" id="user-update-form">
-        {% if field.help_text %}
+        {% csrf_token %}
-          <p class="help">{{ field.help_text|safe }}</p>
+
-        {% endif %}
+        {% for form in forms.values %}
-      </div>
+        {% include "bds/forms/form.html" with form=form errors=False %}
-    {% endfor %}
+        {% endfor %}
+    </form>
+
+    <form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
+        {% csrf_token %}
+    </form>
+
+    <div class="columns is-gapless mt-5">
+        <div class="column is-5">
+            <button id="user-update-button" class="button is-fullwidth is-primary">Enregistrer</button>
+        </div>
+        <div class="column is-2">
+        </div>
+        <div class="column is-5">
+            <button id="user-delete-button" class="button is-fullwidth is-danger">Supprimer</button>
+        </div>
+    </div>
+</div>
+
+<!-- Hidden by default -->
+<div id="confirm-delete-modal" class="modal">
+    <div class="modal-background"></div>
+    <div class="modal-card">
+        <header class="modal-card-head">
+            <p class="modal-card-title">Confirmer la suppression</p>
+            <button id="modal-close" class="delete" aria-label="close"></button>
+        </header>
+        <section class="modal-card-body">
+            Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
+        </section>
+        <footer class="modal-card-foot">
+            <button id="confirm-delete-button" class="button is-primary">Supprimer</button>
+            <button id="cancel-delete-button" class="button">Annuler</button>
+        </footer>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        "use strict";
+
+        // Adapted from https://bulma.io/lib/main.js
+        function openModal(target) {
+            $(document).addClass('is-clipped');
+            $(`#${target}`).addClass('is-active');
+        }
+
+        function closeModals() {
+            $(document).removeClass('is-clipped');
+            $(".modal").removeClass('is-active');
+        }
+
+        // Si on clique sur enregistrer, ça marche
+        $("#user-update-button").on("click", function() {
+            $("#user-update-form").submit();
+        })
+
+        // Si on clique sur supprimer, confirmation demandée
+        $("#user-delete-button").on("click", function() {
+            openModal("confirm-delete-modal");
+        });
+
+        $(".modal-background, #modal-close, #cancel-delete-button").on("click", closeModals);
+
+        $("#confirm-delete-button").on("click", function() {
+            $("#user-delete-form").submit();
+        });
+
+        $(document).on("keydown", function(e) {
+            if (e.key == "Escape") {
+                closeModals();
+            }
+
+            if (e.key == "Enter") {
+                $("#user-update-form").submit();
+            }
+        });
+
+    });
+</script>
 
-    <input type="submit" value="{% trans "Enregistrer" %}">
-  </form>
 {% endblock %}

bds/templatetags/bulma_utils.py

@@ -0,0 +1,74 @@
+from django import forms, template
+
+register = template.Library()
+
+
+@register.filter
+def widget_type(field):
+    return field.field.widget
+
+
+@register.filter
+def is_select(field):
+    return isinstance(field.field.widget, forms.Select)
+
+
+@register.filter
+def is_multiple_select(field):
+    return isinstance(field.field.widget, forms.SelectMultiple)
+
+
+@register.filter
+def is_textarea(field):
+    return isinstance(field.field.widget, forms.Textarea)
+
+
+@register.filter
+def is_input(field):
+    return isinstance(
+        field.field.widget,
+        (
+            forms.TextInput,
+            forms.NumberInput,
+            forms.EmailInput,
+            forms.PasswordInput,
+            forms.URLInput,
+        ),
+    )
+
+
+@register.filter
+def is_checkbox(field):
+    return isinstance(field.field.widget, forms.CheckboxInput)
+
+
+@register.filter
+def is_multiple_checkbox(field):
+    return isinstance(field.field.widget, forms.CheckboxSelectMultiple)
+
+
+@register.filter
+def is_radio(field):
+    return isinstance(field.field.widget, forms.RadioSelect)
+
+
+@register.filter
+def is_file(field):
+    return isinstance(field.field.widget, forms.FileInput)
+
+
+@register.filter
+def bulmafy(field, css_class):
+    if len(field.errors) > 0:
+        css_class += " is-danger"
+    field_classes = field.field.widget.attrs.get("class", "")
+    field_classes += f" {css_class}"
+    return field.as_widget(attrs={"class": field_classes})
+
+
+@register.filter
+def bulma_message_tag(tag):
+    if tag == "error":
+        return "danger"
+
+    return tag

bds/tests/test_views.py

@@ -0,0 +1,76 @@
+from unittest import mock
+
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Permission
+from django.test import Client, TestCase
+from django.urls import reverse, reverse_lazy
+
+User = get_user_model()
+
+
+def give_bds_buro_permissions(user: User) -> None:
+    perm = Permission.objects.get(content_type__app_label="bds", codename="is_team")
+    user.user_permissions.add(perm)
+
+
+def login_url(next=None):
+    login_url = reverse_lazy(settings.LOGIN_URL)
+    if next is None:
+        return login_url
+    else:
+        return "{}?next={}".format(login_url, next)
+
+
+class TestHomeView(TestCase):
+    @mock.patch("gestioncof.signals.messages")
+    def test_get(self, mock_messages):
+        user = User.objects.create_user(username="random_user")
+        give_bds_buro_permissions(user)
+        self.client.force_login(
+            user, backend="django.contrib.auth.backends.ModelBackend"
+        )
+        resp = self.client.get(reverse("bds:home"))
+        self.assertEqual(resp.status_code, 200)
+
+
+class TestRegistrationView(TestCase):
+    @mock.patch("gestioncof.signals.messages")
+    def test_get_autocomplete(self, mock_messages):
+        user = User.objects.create_user(username="toto")
+        url = reverse("bds:autocomplete") + "?q=foo"
+        client = Client()
+
+        # Anonymous GET
+        resp = client.get(url)
+        self.assertRedirects(resp, login_url(next=url))
+
+        # Logged-in but unprivileged GET
+        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
+        resp = client.get(url)
+        self.assertEqual(resp.status_code, 403)
+
+        # Burô user GET
+        give_bds_buro_permissions(user)
+        resp = client.get(url)
+        self.assertEqual(resp.status_code, 200)
+
+    @mock.patch("gestioncof.signals.messages")
+    def test_get(self, mock_messages):
+        user = User.objects.create_user(username="toto")
+        url = reverse("bds:user.update", args=(user.id,))
+        client = Client()
+
+        # Anonymous GET
+        resp = client.get(url)
+        self.assertRedirects(resp, login_url(next=url))
+
+        # Logged-in but unprivileged GET
+        client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
+        resp = client.get(url)
+        self.assertEqual(resp.status_code, 403)
+
+        # Burô user GET
+        give_bds_buro_permissions(user)
+        resp = client.get(url)
+        self.assertEqual(resp.status_code, 200)

bds/urls.py

@@ -5,6 +5,20 @@ from bds import views
 app_name = "bds"
 urlpatterns = [
     path("", views.Home.as_view(), name="home"),
-    path("autocomplete", views.AutocompleteView.as_view(), name="autocomplete"),
+    path("autocomplete", views.BDSAutocompleteView.as_view(), name="autocomplete"),
-    path("user/update/<pk>", views.UserUpdateView.as_view(), name="user.update"),
+    path("user/update/<int:pk>", views.UserUpdateView.as_view(), name="user.update"),
+    path("user/create/", views.UserCreateView.as_view(), name="user.create"),
+    path(
+        "user/create/<slug:clipper>",
+        views.UserCreateView.as_view(),
+        name="user.create.fromclipper",
+    ),
+    path("user/delete/<int:pk>", views.UserDeleteView.as_view(), name="user.delete"),
+    path("members", views.export_members, name="export.members"),
+    path(
+        "members/expired",
+        views.ResetMembershipListView.as_view(),
+        name="members.expired",
+    ),
+    path("members/reset", views.ResetMembershipView.as_view(), name="members.reset"),
 ]

bds/views.py

@@ -1,72 +1,184 @@
+import csv
+
 from django.contrib import messages
 from django.contrib.auth import get_user_model
-from django.http import Http404, HttpResponseRedirect
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.models import Permission
+from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
+from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import TemplateView
+from django.views.generic import DeleteView, ListView, RedirectView, TemplateView
 
 from bds.autocomplete import bds_search
-from bds.forms import BDSProfileForm, BDSUserForm
+from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm
-from bds.mixins import StaffRequiredMixin
+from bds.mixins import MultipleFormView, StaffRequiredMixin
+from bds.models import BDSProfile
+from shared.views import AutocompleteView
 
 User = get_user_model()
 
 
-class AutocompleteView(StaffRequiredMixin, TemplateView):
+class BDSAutocompleteView(StaffRequiredMixin, AutocompleteView):
     template_name = "bds/search_results.html"
-
+    search_composer = bds_search
-    def get_context_data(self, *args, **kwargs):
-        ctx = super().get_context_data(*args, **kwargs)
-        if "q" not in self.request.GET:
-            raise Http404
-        q = self.request.GET["q"]
-        ctx["q"] = q
-        results = bds_search.search(q.split())
-        ctx.update(results)
-        ctx["total"] = sum((len(r) for r in results.values()))
-        return ctx
 
 
 class Home(StaffRequiredMixin, TemplateView):
     template_name = "bds/home.html"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["member_count"] = BDSProfile.objects.filter(is_member=True).count()
+        context["nb_expired"] = BDSProfile.expired_members().count()
+        return context
 
-class UserUpdateView(StaffRequiredMixin, TemplateView):
+
+class UserUpdateView(StaffRequiredMixin, MultipleFormView):
     template_name = "bds/user_update.html"
 
-    def setup(self, *args, **kwargs):
+    form_classes = {
-        super().setup(*args, **kwargs)
+        "user": UserForm,
+        "profile": ProfileForm,
+    }
+
+    def get_user_initial(self):
+        return {"is_buro": self.get_user_instance().has_perm("bds.is_team")}
+
+    def dispatch(self, request, *args, **kwargs):
         self.user = get_object_or_404(User, pk=self.kwargs["pk"])
+        return super().dispatch(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
+    def get_user_instance(self):
-        ctx = super().get_context_data(**kwargs)
+        return self.user
 
-        form_data = self.request.POST if self.request.method == "POST" else None
+    def get_profile_instance(self):
-        profile = getattr(self.user, "bds", None)
+        return getattr(self.user, "bds", None)
-        ctx["user_form"] = BDSUserForm(prefix="user", intance=self.user, data=form_data)
-        ctx["profile_form"] = BDSProfileForm(
-            prefix="profile", instance=profile, data=form_data
-        )
 
-        return ctx
+    def get_success_url(self):
+        return reverse("bds:user.update", args=(self.user.pk,))
 
-    def post(self, *args, **kwargs):
+    def form_valid(self, forms):
-        ctx = self.get_context_data()
+        user = forms["user"].save()
-        user_form = ctx["user_form"]
+        profile = forms["profile"].save(commit=False)
-        profile_form = ctx["profile_form"]
+        perm = Permission.objects.get(content_type__app_label="bds", codename="is_team")
-
+        if forms["user"].cleaned_data["is_buro"]:
-        if user_form.is_valid() and profile_form.is_valid():
+            user.user_permissions.add(perm)
-            user_form.save()
-            profile_form.save()
-            messages.add_message(
-                self.request, messages.SUCCESS, _("Compte mis à jour avec succès !")
-            )
         else:
-            messages.add_message(
+            user.user_permissions.remove(perm)
-                self.request,
+        profile.user = user
-                messages.ERROR,
+        profile.save()
-                _("Le formulaire de mise à jour du compte contient des erreurs."),
+        messages.success(self.request, _("Profil mis à jour avec succès !"))
-            )
 
-        # Redirect here.
+        return super().form_valid(forms)
-        return HttpResponseRedirect("")
+
+    def form_invalid(self, forms):
+        messages.error(self.request, _("Veuillez corriger les erreurs ci-dessous"))
+        return super().form_invalid(forms)
+
+
+class UserCreateView(StaffRequiredMixin, MultipleFormView):
+    template_name = "bds/user_create.html"
+
+    def get_form_classes(self):
+        profile_class = ProfileForm
+
+        if "clipper" in self.kwargs:
+            user_class = UserFromClipperForm
+        else:
+            user_class = UserFromScratchForm
+
+        return {"user": user_class, "profile": profile_class}
+
+    def get_user_initial(self):
+        if "clipper" in self.kwargs:
+            clipper = self.kwargs["clipper"]
+            email = self.request.GET.get("mail", "{}@clipper.ens.fr".format(clipper))
+            fullname = self.request.GET.get("fullname", None)
+
+            if fullname:
+                # Heuristique : le premier mot est le prénom
+                first_name = fullname.split()[0]
+                last_name = " ".join(fullname.split()[1:])
+            else:
+                first_name = ""
+                last_name = ""
+
+            return {
+                "username": clipper,
+                "email": email,
+                "first_name": first_name,
+                "last_name": last_name,
+            }
+        else:
+            return {}
+
+    def get_success_url(self):
+        return reverse("bds:user.update", args=(self.user.pk,))
+
+    def form_valid(self, forms):
+        # On redéfinit self.user pour get_success_url
+        self.user = forms["user"].save()
+        profile = forms["profile"].save(commit=False)
+        profile.user = self.user
+        profile.save()
+        messages.success(self.request, _("Profil créé avec succès !"))
+
+        return super().form_valid(forms)
+
+    def form_invalid(self, forms):
+        messages.error(self.request, _("Veuillez corriger les erreurs ci-dessous"))
+        return super().form_invalid(forms)
+
+
+class UserDeleteView(StaffRequiredMixin, DeleteView):
+    model = User
+    success_url = reverse_lazy("bds:home")
+    success_message = "Profil supprimé avec succès !"
+
+    def delete(self, request, *args, **kwargs):
+        # SuccessMessageMixin does not work with DeleteView, see :
+        # https://code.djangoproject.com/ticket/21926
+        messages.success(request, self.success_message)
+
+        return super().delete(request, *args, **kwargs)
+
+
+class ResetMembershipListView(StaffRequiredMixin, ListView):
+    model = BDSProfile
+    template_name = "bds/expired_members.html"
+
+    def get_queryset(self):
+        return BDSProfile.expired_members()
+
+
+class ResetMembershipView(StaffRequiredMixin, RedirectView):
+    url = reverse_lazy("bds:members.expired")
+
+    def get(self, request, *args, **kwargs):
+        qs = BDSProfile.expired_members()
+        nb = qs.count()
+
+        qs.update(cotisation_period="NO", is_member=False, mails_bds=False)
+
+        messages.success(request, f"{nb} adhésions réinitialisées")
+
+        return super().get(request, *args, **kwargs)
+
+
+@permission_required("bds.is_team")
+def export_members(request):
+    response = HttpResponse(content_type="text/csv")
+    response["Content-Disposition"] = "attachment; filename=membres_bds.csv"
+
+    writer = csv.writer(response)
+    for profile in BDSProfile.objects.filter(is_member=True).all():
+        user = profile.user
+        bits = [
+            user.username,
+            user.get_full_name(),
+            user.email,
+        ]
+        writer.writerow([str(bit) for bit in bits])
+
+    return response

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)]