Remove unused variable

.envrc

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

.gitignore

@@ -5,7 +5,6 @@ cof/settings.py
 settings.py
 *~
 venv/
-.venv/
 .vagrant
 /src
 media/
@@ -19,5 +18,4 @@ media/
 .cache
 
 # VSCode
-.vscode/
+.vscode/
-.direnv

CHANGELOG.md

@@ -21,66 +21,10 @@ Liste des changements notables dans GestioCOF depuis la version 0.1 (septembre
 Uniquement un modèle simple de clubs avec des respos. Aucune gestion des
 adhérents ni des cotisations.
 
-## TODO Prod
+## Version 0.11
-
-- 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
-
-## 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:
@@ -97,6 +41,10 @@ adhérents ni des cotisations.
 
 ## Version 0.10 - 18/04/2021
 
+### TODO Prod
+
+- Créer un compte hCaptcha (https://www.hcaptcha.com/), au COF, et remplacer les secrets associés
+
 ### K-Fêt
 
 - On fait sauter la limite qui empêchait de vendre plus de 24 unités d'un item à

bda/admin.py

@@ -211,6 +211,7 @@ class AttributionAdminForm(forms.ModelForm):
 
 
 class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
+
     list_display = ("id", "spectacle", "participant", "given", "paid")
     search_fields = (
         "spectacle__title",

bda/algorithm.py

@@ -2,6 +2,7 @@ import random
 
 
 class Algorithm(object):
+
     shows = None
     ranks = None
     origranks = None

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,6 +6,7 @@ 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,6 +35,7 @@ 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,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("bda", "0002_add_tirage")]
 
     operations = [

bda/migrations/0004_mails-rappel.py

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

bda/migrations/0005_encoding.py

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

bda/migrations/0006_add_tirage_switch.py

@@ -18,6 +18,7 @@ def forwards_func(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("bda", "0005_encoding")]
 
     operations = [

bda/migrations/0007_extends_spectacle.py

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

bda/migrations/0008_py3.py

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

bda/migrations/0009_revente.py

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

bda/migrations/0010_spectaclerevente_shotgun.py

@@ -21,6 +21,7 @@ def forwards_func(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("bda", "0009_revente")]
 
     operations = [

bda/migrations/0011_tirage_appear_catalogue.py

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

bda/migrations/0012_notif_time.py

@@ -5,6 +5,7 @@ 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,6 +13,7 @@ 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,6 +6,7 @@ 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,6 +4,7 @@ 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,6 +29,7 @@ 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,6 +4,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("bda", "0015_move_bda_payment")]
 
     operations = [

bda/migrations/0017_participant_accepte_charte.py

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

bda/migrations/0018_auto_20201021_1818.py

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

bda/views.py

@@ -274,13 +274,13 @@ def do_tirage(tirage_elt, token):
     results = Algorithm(data["shows"], data["members"], choices)(token)
 
     # On compte les places attribuées et les déçus
-    for _, members, losers in results:
+    for (_, members, losers) in results:
         data["total_slots"] += len(members)
         data["total_losers"] += len(losers)
 
     # On calcule le déficit et les bénéfices pour le BdA
     # FIXME: le traitement de l'opéra est sale
-    for show, members, _ in results:
+    for (show, members, _) in results:
         deficit = (show.slots - len(members)) * show.price
         data["total_sold"] += show.slots * show.price
         if deficit >= 0:
@@ -293,8 +293,8 @@ def do_tirage(tirage_elt, token):
     # so assign a single object for each Participant id
     members_uniq = {}
     members2 = {}
-    for show, members, _ in results:
+    for (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] = []

bds/forms.py

@@ -36,6 +36,4 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = BDSProfile
         exclude = ["user"]
-        widgets = {
+        widgets = {"birthdate": forms.DateInput(attrs={"type": "date"})}
-            "birthdate": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d")
-        }

bds/migrations/0001_initial.py

@@ -8,6 +8,7 @@ import bds.models
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

bds/migrations/0002_bds_group.py

@@ -9,6 +9,7 @@ def create_bds_buro_group(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("bds", "0001_initial")]
 
     operations = [

bds/migrations/0003_staff_permission.py

@@ -4,6 +4,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("bds", "0002_bds_group"),
     ]

bds/migrations/0004_is_member_cotiz_type.py

@@ -4,6 +4,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("bds", "0003_staff_permission"),
     ]

bds/migrations/0005_remove_bdsprofile_certificate_file.py

@@ -4,6 +4,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("bds", "0004_is_member_cotiz_type"),
     ]

bds/migrations/0006_bdsprofile_comments.py

@@ -4,6 +4,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("bds", "0005_remove_bdsprofile_certificate_file"),
     ]

bds/models.py

@@ -3,7 +3,6 @@ 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
@@ -94,16 +93,6 @@ class BDSProfile(models.Model):
         ),
     )
 
-    @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/templates/bds/expired_members.html

@@ -1,22 +0,0 @@
-{% 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/home.html

@@ -36,8 +36,6 @@
 
         <a class=button href="{% url 'bds:export.members' %}">Télécharger la liste des membres (CSV)</a>
 
-        <a class=button href="{% url 'bds:members.expired' %}">Liste des adhésions expirées ({{ nb_expired }})</a>
-
         <br>
         <br>
 

bds/templates/bds/user_update.html

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

bds/urls.py

@@ -15,10 +15,4 @@ urlpatterns = [
     ),
     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

@@ -8,7 +8,7 @@ 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 DeleteView, ListView, RedirectView, TemplateView
+from django.views.generic import DeleteView, TemplateView
 
 from bds.autocomplete import bds_search
 from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm
@@ -30,7 +30,6 @@ class Home(StaffRequiredMixin, TemplateView):
     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
 
 
@@ -144,28 +143,6 @@ class UserDeleteView(StaffRequiredMixin, DeleteView):
         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")

clubs/migrations/0001_initial.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

events/migrations/0001_event.py

@@ -4,6 +4,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = []

events/migrations/0002_event_subscribers.py

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

events/migrations/0003_options_and_extra_fields.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0002_event_subscribers"),

events/migrations/0004_unique_constraints.py

@@ -5,6 +5,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0003_options_and_extra_fields"),

gestioasso/settings/cof_prod.py

@@ -7,8 +7,6 @@ Surcharge les settings définis dans common.py
 import os
 from datetime import timedelta
 
-from django.utils import timezone
-
 from .common import *  # NOQA
 from .common import (
     AUTHENTICATION_BACKENDS,
@@ -206,10 +204,6 @@ MAIL_DATA = {
         "REPLYTO": "cof@ens.fr",
     },
     "rappels": {"FROM": "Le BdA <bda@ens.fr>", "REPLYTO": "Le BdA <bda@ens.fr>"},
-    "kfet": {
-        "FROM": "La K-Fêt <chefs-k-fet@ens.fr>",
-        "REPLYTO": "La K-Fêt <chefs-k-fet@ens.fr>",
-    },
     "revente": {
         "FROM": "BdA-Revente <bda-revente@ens.fr>",
         "REPLYTO": "BdA-Revente <bda-revente@ens.fr>",
@@ -227,8 +221,3 @@ KFET_HISTORY_DATE_LIMIT = timedelta(days=7)
 # Limite plus longue pour les chefs/trez
 # (qui ont la permission kfet.access_old_history)
 KFET_HISTORY_LONG_DATE_LIMIT = timedelta(days=30)
-
-# These accounts don't represent actual people and can be freely accessed
-# Identification based on trigrammes
-KFET_HISTORY_NO_DATE_LIMIT_TRIGRAMMES = ["LIQ", "#13"]
-KFET_HISTORY_NO_DATE_LIMIT = timezone.datetime(1794, 10, 30)  # AKA the distant past

gestioasso/urls.py

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

gestioncof/cms/migrations/0001_initial.py

@@ -13,6 +13,7 @@ import gestioncof.cms.models
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [

gestioncof/cms/migrations/0002_auto_20190523_1521.py

@@ -4,6 +4,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("cofcms", "0001_initial")]
 
     operations = [

gestioncof/cms/migrations/0003_directory_entry_optional_links.py

@@ -6,6 +6,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("cofcms", "0002_auto_20190523_1521"),
     ]

gestioncof/cms/migrations/0004_auto_20200829_2314.py

@@ -6,6 +6,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("cofcms", "0003_directory_entry_optional_links"),
     ]

gestioncof/cms/templates/cofcms/base.html

@@ -16,7 +16,7 @@
         <link rel="stylesheet" type="text/css" href="{% static "fonts/SourceSansPro/sourceSansPro.css" %}"/>
         <link rel="stylesheet" type="text/css" href="{% static "cofcms/css/screen.css" %}"/>
         {% block extra_head %}{% endblock %}
-
+        
         <meta name="viewport" content="width=device-width, initial-scale=1.0; minimum-scale=1.0;">
     </head>
 
@@ -32,27 +32,27 @@
             <section class="bottom-menu">
                 <nav>
                     {% flat_menu "cof-nav-int" template="cofcms/base_nav.html" apply_active_classes=True %}
+                    
+			        {% get_current_language as curlang %}
 
-                    {% get_current_language as curlang %}
+			        <div class="lang-select">
-
-                    <div class="lang-select">
                         {% if curlang == 'en' %}
-                            {% language 'fr' %}
+			                {% language 'fr' %}
-                            <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
+			                <a href="{% pageurl self %}" title="Français"><img src="{% static "cofcms/images/fr.png" %}"></a>
-                            {% endlanguage %}
+			                {% endlanguage %}
                         {% else %}
-                            {% language 'en' %}
+			                {% language 'en' %}
-                            <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
+			                <a href="{% pageurl self %}" title="English"><img src="{% static "cofcms/images/en.png" %}"></a>
                             {% endlanguage %}
                         {% endif %}
-                    </div>
+			        </div>
                 </nav>
             </section>
         </header>
 
         <div class="container">
             {% block superaside %}{% endblock %}
-
+            
             <div class="content">
                 {% block content %}{% endblock %}
             </div>

gestioncof/cms/templates/cofcms/cof_actu_index_page.html

@@ -17,17 +17,17 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</div>
     </section>
 
     <section class="actulist">
         {% if actus.has_previous %}
-            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+	        <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
-        {% endif %}
+	    {% endif %}
         {% if actus.has_next %}
-            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+	        <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
-        {% endif %}
+	    {% endif %}
-
+        
         {% for actu in page.actus %}
             <article class="actu">
                 <div class="actu-image" {% if actu.image %}{% image actu.image fill-400x200 as img %}style="background-image:url('{{ img.url }}');"{% endif %}></div>
@@ -36,7 +36,7 @@
                     {% if actu.is_event %}
                         <p><span class="actu-dates">{{ actu|dates|capfirst }}</span><br />{{ actu.chapo }}</p>
                     {% else %}
-                        {{ actu.body|richtext|truncatewords_html:15 }}
+                        {{ actu.body|safe|truncatewords_html:15 }}
                     {% endif %}
                     <a href="{% pageurl actu %}">{% trans "Lire plus" %} &gt;</a>
                 </div>
@@ -44,10 +44,10 @@
         {% endfor %}
 
         {% if actus.has_previous %}
-            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+	        <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
-        {% endif %}
+	    {% endif %}
         {% if actus.has_next %}
-            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+	        <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
-        {% endif %}
+	    {% endif %}
     </section>
 {% endblock %}

gestioncof/cms/templates/cofcms/cof_actu_page.html

@@ -1,5 +1,5 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags i18n %}
+{% load wagtailimages_tags cofcms_tags i18n %}
 
 {% block content %}
     <section class="intro">
@@ -11,7 +11,7 @@
     <section class="pagecontent">
         <div class="image">{% image page.image width-700 %}</div>
         <article>
-            {{ page.body|richtext }}
+            {{ page.body|safe }}
         </article>
     </section>
 {% endblock %}

gestioncof/cms/templates/cofcms/cof_directory_page.html

@@ -1,5 +1,5 @@
 {% extends "cofcms/base_aside.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags static i18n %}
+{% load wagtailimages_tags cofcms_tags static i18n %}
 
 {% block extra_head %}
     {{ block.super }}
@@ -18,7 +18,7 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</div>
     </section>
 
     <section class="directory">
@@ -28,7 +28,7 @@
                     <div class="entry-image">{% image entry.image width-150 class="entry-img" %}</div>
                 {% endif %}
                 <h2>{{ entry.title }}</h2>
-                <div class="desc">{{ entry.body|richtext }}</div>
+                <div class="desc">{{ entry.body|safe }}</div>
                 {% if entry.links %}
                     <ul class="links">
                         {% for block in entry.links %}

gestioncof/cms/templates/cofcms/cof_page.html

@@ -1,10 +1,10 @@
 {% extends "cofcms/base.html" %}
-{% load wagtailcore_tags wagtailimages_tags cofcms_tags %}
+{% load wagtailimages_tags cofcms_tags %}
 
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</div>
     </section>
 
     <section class="pagecontent">
@@ -13,7 +13,7 @@
                 <h2>{{ block.value }}</h2>
             {% elif block.block_type == "paragraph" %}
                 <article class="paragraph">
-                    {{ block.value|richtext }}
+                    {{ block.value|safe }}
                 </article>
             {% elif block.block_type == "image" %}
                 <div class="image">

gestioncof/cms/templates/cofcms/cof_root_page.html

@@ -18,7 +18,7 @@
 {% block content %}
     <section class="intro">
         <h1>{{ page.title }}</h1>
-        <div>{{ page.introduction|richtext }}</div>
+        <div>{{ page.introduction|safe }}</div>
     </section>
 
     <section class="actuhome">
@@ -31,7 +31,7 @@
                     {% if actu.is_event %}
                         <span class="actu-minical">{% mini_calendar actu %}</span><span class="actu-dates">{{ actu|dates }}</span>
                     {% else %}
-                        {{ actu.body|richtext|truncatewords_html:10 }}
+                        {{ actu.body|safe|truncatewords_html:10 }}
                     {% endif %}
                 </div>
                 <a href="{% pageurl actu %}" class="actu-overlay"></a>

gestioncof/migrations/0001_initial.py

@@ -6,6 +6,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
 
     operations = [

gestioncof/migrations/0002_enable_unprocessed_demandes.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0001_initial")]
 
     operations = [

gestioncof/migrations/0003_event_image.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0002_enable_unprocessed_demandes")]
 
     operations = [

gestioncof/migrations/0004_registration_mail.py

@@ -25,6 +25,7 @@ def create_mail(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0003_event_image")]
 
     operations = [

gestioncof/migrations/0005_encoding.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0004_registration_mail")]
 
     operations = [

gestioncof/migrations/0006_add_calendar.py

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

gestioncof/migrations/0007_alter_club.py

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

gestioncof/migrations/0008_py3.py

@@ -10,6 +10,7 @@ def forwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0007_alter_club")]
 
     operations = [

gestioncof/migrations/0009_delete_clipper.py

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

gestioncof/migrations/0010_delete_custommail.py

@@ -4,6 +4,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0009_delete_clipper")]
 
     operations = [migrations.DeleteModel(name="CustomMail")]

gestioncof/migrations/0011_longer_clippers.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0010_delete_custommail")]
 
     operations = [

gestioncof/migrations/0011_remove_cofprofile_num.py

@@ -5,6 +5,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0010_delete_custommail")]
 
     operations = [migrations.RemoveField(model_name="cofprofile", name="num")]

gestioncof/migrations/0012_merge.py

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

gestioncof/migrations/0013_pei.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0012_merge")]
 
     operations = [

gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py

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

gestioncof/migrations/0015_psql_choices_niveaux.py

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

gestioncof/migrations/0016_unique_clippers.py

@@ -16,6 +16,7 @@ def null_clippers_to_empty(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0015_psql_choices_niveaux")]
 
     operations = [

gestioncof/migrations/0017_petitscours_uniqueness.py

@@ -5,6 +5,7 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("gestioncof", "0016_unique_clippers"),

gestioncof/migrations/0018_petitscours_email.py

@@ -4,6 +4,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("gestioncof", "0017_petitscours_uniqueness"),
     ]

gestioncof/migrations/0019_cofprofile_date_adhesion.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.28 on 2023-05-22 09:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("gestioncof", "0018_petitscours_email"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="cofprofile",
-            name="date_adhesion",
-            field=models.DateField(
-                blank=True, null=True, verbose_name="Date d'adhésion"
-            ),
-        ),
-    ]

gestioncof/models.py

@@ -50,7 +50,6 @@ class CofProfile(models.Model):
         "Login clipper", max_length=32, blank=True, unique=True, null=True
     )
     is_cof = models.BooleanField("Membre du COF", default=False)
-    date_adhesion = models.DateField("Date d'adhésion", blank=True, null=True)
     phone = models.CharField("Téléphone", max_length=20, blank=True)
     occupation = models.CharField(
         _("Occupation"),

gestioncof/tests/test_views.py

@@ -1,5 +1,5 @@
 import uuid
-from datetime import date, timedelta
+from datetime import timedelta
 
 from django.contrib import messages
 from django.contrib.auth import get_user_model
@@ -484,7 +484,6 @@ class ExportMembersViewTests(CSVResponseMixin, ViewTestCaseMixin, TestCase):
         u1.last_name = "last"
         u1.email = "user@mail.net"
         u1.save()
-        u1.profile.date_adhesion = date(2023, 5, 22)
         u1.profile.phone = "0123456789"
         u1.profile.departement = "Dept"
         u1.profile.save()
@@ -506,9 +505,8 @@ class ExportMembersViewTests(CSVResponseMixin, ViewTestCaseMixin, TestCase):
                     "1A",
                     "Dept",
                     "normalien",
-                    "2023-05-22",
                 ],
-                [str(u2.pk), "staff", "", "", "", "", "1A", "", "normalien", "None"],
+                [str(u2.pk), "staff", "", "", "", "", "1A", "", "normalien"],
             ],
         )
 
@@ -550,6 +548,7 @@ class ExportMegaOrgasViewTests(MegaHelperMixin, ViewTestCaseMixin, TestCase):
     auth_forbidden = [None, "user", "member"]
 
     def test(self):
+
         r = self.client.get(self.url)
 
         self.assertEqual(r.status_code, 200)

gestioncof/views.py

@@ -1,6 +1,6 @@
 import csv
 import uuid
-from datetime import date, timedelta
+from datetime import timedelta
 from smtplib import SMTPRecipientsRefused
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
@@ -86,7 +86,6 @@ class ResetComptes(BuroRequiredMixin, TemplateView):
         nb_adherents = CofProfile.objects.filter(is_cof=True).count()
         CofProfile.objects.update(
             is_cof=False,
-            date_adhesion=None,
             mailing_cof=False,
             mailing_bda=False,
             mailing_bda_revente=False,
@@ -576,9 +575,6 @@ def registration(request):
                 profile = profile_form.save()
                 if profile.is_cof and not was_cof:
                     notify_new_member(request, member)
-                    profile.date_adhesion = date.today()
-                    profile.save()
-
                 # Enregistrement des inscriptions aux événements
                 for form in event_formset:
                     if "status" not in form.cleaned_data:
@@ -719,7 +715,6 @@ def export_members(request):
             profile.occupation,
             profile.departement,
             profile.type_cotiz,
-            profile.date_adhesion,
         ]
         writer.writerow([str(bit) for bit in bits])
 

kfet/auth/migrations/0001_initial.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("auth", "0006_require_contenttypes_0002"),
         # Following dependency allows using Account model to set up the kfet

kfet/auth/migrations/0002_kfetgroup_kfetpermission.py

@@ -7,6 +7,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("auth", "0011_update_proxy_permissions"),
         ("kfetauth", "0001_initial"),

kfet/auth/migrations/0003_existing_groups.py

@@ -13,6 +13,7 @@ def existing_groups(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("kfetauth", "0002_kfetgroup_kfetpermission"),
     ]

kfet/cms/management/commands/kfet_loadwagtail.py

@@ -11,6 +11,7 @@ class Command(BaseCommand):
         parser.add_argument("--file", default="kfet_wagtail_02_19")
 
     def handle(self, *args, **options):
+
         self.stdout.write("Import des données wagtail")
 
         # Nettoyage des données initiales posées par Wagtail dans la migration

kfet/cms/migrations/0001_initial.py

@@ -11,6 +11,7 @@ import kfet.cms.models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ("wagtailcore", "0033_remove_golive_expiry_help_text"),
         ("wagtailimages", "0019_delete_filter"),

kfet/cms/migrations/0002_alter_kfetpage_colcount.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("kfetcms", "0001_initial")]
 
     operations = [

kfet/cms/models.py

@@ -97,6 +97,7 @@ class KFetStreamBlock(ChoicesStreamBlock):
 
 
 class KFetPage(Page):
+
     content = StreamField(KFetStreamBlock, verbose_name=_("Contenu"))
 
     # Layout fields

kfet/forms.py

@@ -45,47 +45,6 @@ class DateTimeWidget(forms.DateTimeInput):
         js = ("kfet/vendor/bootstrap/bootstrap-datetimepicker.min.js",)
 
 
-class ContactForm(forms.Form):
-    from_email = forms.EmailField(
-        label="Adresse mail",
-        help_text="Si aucune adresse mail n'est renseignée, la soumission sera anonyme.",
-        required=False,
-    )
-    subject = forms.CharField(label="Objet", required=True)
-    message = forms.CharField(widget=forms.Textarea, required=True)
-
-    def clean_from_email(self):
-        return self.cleaned_data["from_email"] or "Anonyme <k-fet@ens.psl.eu>"
-
-
-class DemandeSoireeForm(forms.Form):
-    HORAIRE_CHOICES = map(lambda s: (s, s), ("22h", "23h", "00h", "01h", "02h", "03h"))
-    SERVICE_CHOICES = (
-        ("K-Fêt", "K-Fêt standard (L'équipe K-Fêt fait le service normal au bar)"),
-        ("Kalô", "Type Kalô (Vous ramenez vos propres boissons et servez vous-mêmes)"),
-    )
-
-    nom = forms.CharField()
-    from_email = forms.EmailField(label="Adresse mail de contact")
-
-    contact_boum = forms.BooleanField(label="Contacter le Boum", required=False)
-    contact_pls = forms.BooleanField(label="Contacter PLS", required=False)
-
-    theme = forms.CharField(label="Thème de la soirée")
-    horaire_fin = forms.ChoiceField(label="Horaire de fin", choices=HORAIRE_CHOICES)
-    service = forms.ChoiceField(label="Mode de service", choices=SERVICE_CHOICES)
-    date = forms.CharField(label="Date souhaitée")
-
-    respo1 = forms.CharField(label="Nom de la personne respo n°1")
-    respo2 = forms.CharField(label="Nom de la personne respo n°2")
-    respo3 = forms.CharField(label="Nom de la personne respo n°3")
-    respo4 = forms.CharField(label="Nom de la personne respo n°4")
-
-    remarques = forms.CharField(
-        label="Remarques supplémentaires", widget=forms.Textarea
-    )
-
-
 # -----
 # Account forms
 # -----
@@ -502,6 +461,7 @@ class AddcostForm(forms.Form):
 
 
 class KFetConfigForm(ConfigForm):
+
     kfet_reduction_cof = forms.DecimalField(
         label="Réduction COF",
         initial=Decimal("20"),

kfet/management/commands/createopes.py

@@ -41,6 +41,7 @@ class Command(BaseCommand):
         )
 
     def handle(self, *args, **options):
+
         self.stdout.write("Génération d'opérations")
 
         # Output log vars
@@ -73,6 +74,7 @@ class Command(BaseCommand):
         opegroup_list = []
 
         for i in range(num_ops):
+
             # Randomly pick account
             if random.random() > 0.25:
                 account = random.choice(accounts)
@@ -172,6 +174,7 @@ class Command(BaseCommand):
         at_list = []
 
         for i in range(num_transfers):
+
             # Randomly pick time
             at = now - timedelta(seconds=random.randint(0, time))
 

kfet/management/commands/loadkfetdevdata.py

@@ -63,7 +63,7 @@ class Command(MyBaseCommand):
         created_accounts = 0
         team_accounts = 0
 
-        for profile, trigramme in zip(gaulois, gaulois_trigramme):
+        for (profile, trigramme) in zip(gaulois, gaulois_trigramme):
             account, created = Account.objects.get_or_create(
                 trigramme=trigramme,
                 cofprofile=profile,
@@ -74,7 +74,7 @@ class Command(MyBaseCommand):
             if profile.user.first_name == "Abraracourcix":
                 profile.user.groups.add(group_chef)
 
-        for profile, trigramme in zip(romains, romains_trigramme):
+        for (profile, trigramme) in zip(romains, romains_trigramme):
             account, created = Account.objects.get_or_create(
                 trigramme=trigramme,
                 cofprofile=profile,

kfet/management/commands/sendrappelsnegatifs.py

@@ -1,57 +0,0 @@
-"""
-Gestion en ligne de commande des mails de rappel K-Fet.
-"""
-
-import smtplib
-from datetime import timedelta
-
-from django.core.management.base import BaseCommand
-from django.utils import timezone
-
-from kfet.models import AccountNegative
-
-
-def send_mail(neg: AccountNegative, stdout) -> None:
-    try:
-        neg.send_rappel()
-        stdout.write(f"Mail de rappel pour {neg.account} envoyé avec succès.")
-    except smtplib.SMTPException:
-        stdout.write(f"Erreur lors de l'envoi du mail de rappel pour {neg.account}.")
-
-
-class Command(BaseCommand):
-    help = (
-        "Envoie un mail de rappel aux personnes en négatif.\n"
-        "Envoie un mail au bout de 24h, puis un mail par semaine."
-    )
-    leave_locale_alone = True
-
-    def handle(self, *args, **options):
-        now = timezone.now()
-
-        # Le premier mail est envoyé après 24h de négatif, puis toutes les semaines
-        first_delay = timedelta(days=1)
-        periodic_delay = timedelta(weeks=1)
-
-        # On n'envoie des mails qu'aux comptes qui ont un négatif vraiment actif
-        # et dont la balance est négative
-        # On ignore les comptes gelés qui signinfient une adresse mail plus valide
-        account_negatives = AccountNegative.objects.filter(
-            account__balance__lt=0, account__is_frozen=False
-        ).exclude(end__lte=now)
-
-        accounts_first_mail = account_negatives.filter(
-            start__lt=now - first_delay, last_rappel__isnull=True
-        )
-        accounts_periodic_mail = account_negatives.filter(
-            last_rappel__lt=now - periodic_delay
-        )
-
-        for neg in accounts_first_mail:
-            send_mail(neg, self.stdout)
-
-        for neg in accounts_periodic_mail:
-            send_mail(neg, self.stdout)
-
-        if not (accounts_first_mail.exists() or accounts_periodic_mail.exists()):
-            self.stdout.write("Aucun mail à envoyer.")

kfet/migrations/0001_initial.py

@@ -9,6 +9,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("gestioncof", "0007_alter_club")]
 
     operations = [

kfet/migrations/0002_auto_20160802_2139.py

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

kfet/migrations/0003_auto_20160802_2142.py

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

kfet/migrations/0004_auto_20160802_2144.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("kfet", "0003_auto_20160802_2142")]
 
     operations = [

kfet/migrations/0005_auto_20160802_2154.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("kfet", "0004_auto_20160802_2144")]
 
     operations = [

kfet/migrations/0006_auto_20160804_0600.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("kfet", "0005_auto_20160802_2154")]
 
     operations = [

kfet/migrations/0007_auto_20160804_0641.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [("kfet", "0006_auto_20160804_0600")]
 
     operations = [

kfet/migrations/0008_auto_20160804_1736.py

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

kfet/migrations/0009_auto_20160805_0720.py

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