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

Reviewed-on: DGNum/gestioCOF#815

.gitignore

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

CHANGELOG.md

@@ -30,6 +30,40 @@ adhérents ni des cotisations.
 
 ## 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

bda/admin.py

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

bda/algorithm.py

@@ -2,7 +2,6 @@ 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,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

@@ -21,7 +21,6 @@ def forwards_func(apps, schema_editor):
 
 
 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

@@ -5,7 +5,6 @@ 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/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

@@ -9,7 +9,6 @@ def create_bds_buro_group(apps, schema_editor):
 
 
 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"),
     ]

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

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

bds/migrations/0006_bdsprofile_comments.py

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

bds/tests/test_views.py

@@ -1,4 +1,3 @@
-from datetime import date
 from unittest import mock
 
 from django.conf import settings
@@ -7,8 +6,6 @@ from django.contrib.auth.models import Permission
 from django.test import Client, TestCase
 from django.urls import reverse, reverse_lazy
 
-from bds.models import BDSProfile
-
 User = get_user_model()
 
 
@@ -27,7 +24,7 @@ def login_url(next=None):
 
 class TestHomeView(TestCase):
     @mock.patch("gestioncof.signals.messages")
-    def test_get(self, _):
+    def test_get(self, mock_messages):
         user = User.objects.create_user(username="random_user")
         give_bds_buro_permissions(user)
         self.client.force_login(
@@ -39,7 +36,7 @@ class TestHomeView(TestCase):
 
 class TestRegistrationView(TestCase):
     @mock.patch("gestioncof.signals.messages")
-    def test_get_autocomplete(self, _):
+    def test_get_autocomplete(self, mock_messages):
         user = User.objects.create_user(username="toto")
         url = reverse("bds:autocomplete") + "?q=foo"
         client = Client()
@@ -59,7 +56,7 @@ class TestRegistrationView(TestCase):
         self.assertEqual(resp.status_code, 200)
 
     @mock.patch("gestioncof.signals.messages")
-    def test_get(self, _):
+    def test_get(self, mock_messages):
         user = User.objects.create_user(username="toto")
         url = reverse("bds:user.update", args=(user.id,))
         client = Client()
@@ -77,174 +74,3 @@ class TestRegistrationView(TestCase):
         give_bds_buro_permissions(user)
         resp = client.get(url)
         self.assertEqual(resp.status_code, 200)
-
-
-class TestResetMemberships(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.admin = User.objects.create_user(username="bds_admin")
-
-        # Create users and profiles
-        cls.u_1 = User.objects.create_user(username="bds-01")
-        cls.p_1 = BDSProfile.objects.create(user=cls.u_1)
-
-        cls.u_2 = User.objects.create_user(username="bds-02")
-        cls.p_2 = BDSProfile.objects.create(user=cls.u_2)
-
-        cls.u_3 = User.objects.create_user(username="bds-03")
-        cls.p_3 = BDSProfile.objects.create(user=cls.u_3)
-
-        cls.u_4 = User.objects.create_user(username="bds-04")
-        cls.p_4 = BDSProfile.objects.create(user=cls.u_4)
-
-    @mock.patch("gestioncof.signals.messages")
-    def setUp(self, _):
-        give_bds_buro_permissions(self.admin)
-        # bds-01 est membre à l'année
-        self.p_1.is_member = True
-        self.p_1.mails_bds = True
-        self.p_1.cotisation_period = "ANN"
-        self.p_1.save()
-
-        # bds-02 est membre au S1
-        self.p_2.is_member = True
-        self.p_2.mails_bds = True
-        self.p_2.cotisation_period = "SE1"
-        self.p_2.save()
-
-        # bds-03 est membre au S2
-        self.p_3.is_member = True
-        self.p_3.mails_bds = True
-        self.p_3.cotisation_period = "SE2"
-        self.p_3.save()
-
-    @mock.patch("gestioncof.signals.messages")
-    def test_get_expired(self, _):
-        user = User.objects.create_user(username="toto")
-        url = reverse("bds:members.expired")
-        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.assertEquals(resp.status_code, 403)
-
-        # Burô user GET
-        give_bds_buro_permissions(user)
-        resp = client.get(url)
-        self.assertEquals(resp.status_code, 200)
-
-        self.assertQuerysetEqual(
-            resp.context_data["object_list"], BDSProfile.expired_members()
-        )
-
-    @mock.patch("gestioncof.signals.messages")
-    def test_get_reset(self, _):
-        user = User.objects.create_user(username="tata")
-        url = reverse("bds:members.reset")
-        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.assertEquals(resp.status_code, 403)
-
-        # Burô user GET
-        give_bds_buro_permissions(user)
-        resp = client.get(url)
-        self.assertRedirects(resp, reverse("bds:members.expired"))
-
-    def test_expired_memberships(self):
-        # In september, there is no expired members
-        with mock.patch("bds.models.timezone.now", return_value=date(2022, 9, 1)):
-            self.assertQuerysetEqual(BDSProfile.expired_members(), [])
-
-        # In march, only bds-02's membership is expired
-        with mock.patch("django.utils.timezone.now", return_value=date(2023, 3, 1)):
-            self.assertQuerysetEqual(BDSProfile.expired_members(), [self.p_2])
-
-        # During summer, all memberships are expired
-        with mock.patch("django.utils.timezone.now", return_value=date(2023, 7, 1)):
-            self.assertQuerysetEqual(
-                BDSProfile.expired_members(),
-                [self.p_1, self.p_2, self.p_3],
-                ordered=False,
-            )
-
-    @mock.patch("gestioncof.signals.messages")
-    def test_reset_memberships(self, _):
-        url = reverse("bds:members.reset")
-
-        # Reset during S1 does nothig
-        with mock.patch("bds.models.timezone.now", return_value=date(2022, 9, 1)):
-            self.client.force_login(
-                self.admin, backend="django.contrib.auth.backends.ModelBackend"
-            )
-            resp = self.client.get(url)
-
-            self.assertRedirects(resp, reverse("bds:members.expired"))
-
-            self.assertQuerysetEqual(BDSProfile.expired_members(), [])
-
-            self.assertQuerysetEqual(
-                BDSProfile.objects.filter(is_member=True),
-                [self.p_1, self.p_2, self.p_3],
-                ordered=False,
-            )
-
-        # Reset in march
-        with mock.patch("django.utils.timezone.now", return_value=date(2023, 3, 1)):
-            self.client.force_login(
-                self.admin, backend="django.contrib.auth.backends.ModelBackend"
-            )
-            resp = self.client.get(url)
-
-            self.assertRedirects(resp, reverse("bds:members.expired"))
-
-            # After a reset we have no expired memberships
-            self.assertQuerysetEqual(BDSProfile.expired_members(), [])
-
-            # Test reset attributes
-            self.p_2.refresh_from_db()
-            self.assertEqual(
-                [self.p_2.is_member, self.p_2.mails_bds, self.p_2.cotisation_period],
-                [False, False, "NO"],
-            )
-
-        # Reset during summer
-        with mock.patch("django.utils.timezone.now", return_value=date(2023, 7, 1)):
-            # bds-02's membership wa already reset
-            self.assertQuerysetEqual(
-                BDSProfile.expired_members(), [self.p_1, self.p_3], ordered=False
-            )
-
-            self.client.force_login(
-                self.admin, backend="django.contrib.auth.backends.ModelBackend"
-            )
-            resp = self.client.get(url)
-
-            self.assertRedirects(resp, reverse("bds:members.expired"))
-
-            # After a reset we have no expired memberships
-            self.assertQuerysetEqual(BDSProfile.expired_members(), [])
-
-            # Test reset attributes
-            self.p_1.refresh_from_db()
-            self.assertEqual(
-                [self.p_1.is_member, self.p_1.mails_bds, self.p_1.cotisation_period],
-                [False, False, "NO"],
-            )
-
-            self.p_3.refresh_from_db()
-            self.assertEqual(
-                [self.p_3.is_member, self.p_3.mails_bds, self.p_3.cotisation_period],
-                [False, False, "NO"],
-            )

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

events/migrations/0001_event.py

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

events/migrations/0002_event_subscribers.py

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

events/migrations/0003_options_and_extra_fields.py

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

events/migrations/0004_unique_constraints.py

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

gestioasso/settings/cof_prod.py

@@ -205,8 +205,9 @@ MAIL_DATA = {
         "REPLYTO": "cof@ens.fr",
     },
     "rappels": {"FROM": "Le BdA <bda@ens.fr>", "REPLYTO": "Le BdA <bda@ens.fr>"},
-    "rappel_negatif": {
+    "kfet": {
-        "FROM": "La K-Fêt <k-fet@ens.fr>",
+        "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>",

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,7 +13,6 @@ import gestioncof.cms.models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

gestioncof/cms/migrations/0002_auto_20190523_1521.py

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

gestioncof/cms/migrations/0003_directory_entry_optional_links.py

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

gestioncof/cms/migrations/0004_auto_20200829_2314.py

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

gestioncof/migrations/0001_initial.py

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

gestioncof/migrations/0002_enable_unprocessed_demandes.py

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

gestioncof/migrations/0003_event_image.py

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

gestioncof/migrations/0004_registration_mail.py

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

gestioncof/migrations/0005_encoding.py

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

gestioncof/migrations/0006_add_calendar.py

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

gestioncof/migrations/0007_alter_club.py

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

gestioncof/migrations/0008_py3.py

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

gestioncof/migrations/0009_delete_clipper.py

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

gestioncof/migrations/0010_delete_custommail.py

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

gestioncof/migrations/0011_longer_clippers.py

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

gestioncof/migrations/0011_remove_cofprofile_num.py

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

gestioncof/migrations/0012_merge.py

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

gestioncof/migrations/0013_pei.py

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

gestioncof/migrations/0014_cofprofile_mailing_unernestaparis.py

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

gestioncof/migrations/0015_psql_choices_niveaux.py

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

gestioncof/migrations/0016_unique_clippers.py

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

gestioncof/migrations/0017_petitscours_uniqueness.py

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

gestioncof/migrations/0018_petitscours_email.py

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

gestioncof/migrations/0019_cofprofile_date_adhesion.py

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

gestioncof/models.py

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

gestioncof/tests/test_views.py

@@ -1,5 +1,5 @@
 import uuid
-from datetime import timedelta
+from datetime import date, timedelta
 
 from django.contrib import messages
 from django.contrib.auth import get_user_model
@@ -486,6 +486,7 @@ 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()
@@ -507,8 +508,9 @@ class ExportMembersViewTests(CSVResponseMixin, ViewTestCaseMixin, TestCase):
                     "1A",
                     "Dept",
                     "normalien",
+                    "2023-05-22",
                 ],
-                [str(u2.pk), "staff", "", "", "", "", "1A", "", "normalien"],
+                [str(u2.pk), "staff", "", "", "", "", "1A", "", "normalien", "None"],
             ],
         )
 
@@ -550,7 +552,6 @@ 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 timedelta
+from datetime import date, timedelta
 from smtplib import SMTPRecipientsRefused
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
@@ -86,6 +86,7 @@ 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,
@@ -575,6 +576,9 @@ 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:
@@ -715,6 +719,7 @@ 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,7 +5,6 @@ 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,7 +7,6 @@ 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,7 +13,6 @@ def existing_groups(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("kfetauth", "0002_kfetgroup_kfetpermission"),
     ]

kfet/cms/management/commands/kfet_loadwagtail.py

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

kfet/cms/models.py

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

kfet/forms.py

@@ -45,6 +45,47 @@ 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
 # -----
@@ -461,7 +502,6 @@ 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,7 +41,6 @@ class Command(BaseCommand):
         )
 
     def handle(self, *args, **options):
-
         self.stdout.write("Génération d'opérations")
 
         # Output log vars
@@ -74,7 +73,6 @@ class Command(BaseCommand):
         opegroup_list = []
 
         for i in range(num_ops):
-
             # Randomly pick account
             if random.random() > 0.25:
                 account = random.choice(accounts)
@@ -174,7 +172,6 @@ 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

@@ -2,6 +2,7 @@
 Gestion en ligne de commande des mails de rappel K-Fet.
 """
 
+import smtplib
 from datetime import timedelta
 
 from django.core.management.base import BaseCommand
@@ -10,6 +11,14 @@ 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"
@@ -19,23 +28,30 @@ class Command(BaseCommand):
 
     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)
-        accounts_first_mail = (
+
-            AccountNegative.objects.filter(start__lt=now - first_delay)
+        # On n'envoie des mails qu'aux comptes qui ont un négatif vraiment actif
-            .filter(last_rappel__isnull=True)
+        # et dont la balance est négative
-            .all()
+        # 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 = (
+        accounts_periodic_mail = account_negatives.filter(
-            AccountNegative.objects.filter(last_rappel__isnull=False)
+            last_rappel__lt=now - periodic_delay
-            .filter(last_rappel__lt=now - periodic_delay)
-            .all()
         )
+
         for neg in accounts_first_mail:
-            neg.send_rappel()
+            send_mail(neg, self.stdout)
-            self.stdout.write(f"Mail de rappel pour {neg.account} envoyé avec succès.")
+
         for neg in accounts_periodic_mail:
-            neg.send_rappel()
+            send_mail(neg, self.stdout)
-            self.stdout.write("Mail de rappel pour {neg.account} envoyé avec succès.")
+
-        if (not accounts_first_mail) and (not accounts_periodic_mail):
+        if not (accounts_first_mail.exists() or accounts_periodic_mail.exists()):
             self.stdout.write("Aucun mail à envoyer.")

kfet/migrations/0001_initial.py

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

kfet/migrations/0002_auto_20160802_2139.py

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

kfet/migrations/0003_auto_20160802_2142.py

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

kfet/migrations/0010_auto_20160806_2343.py

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

kfet/migrations/0011_auto_20160807_1720.py

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

kfet/migrations/0012_settings.py

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

kfet/migrations/0013_auto_20160807_1840.py

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

kfet/migrations/0014_auto_20160807_2314.py

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

kfet/migrations/0015_auto_20160807_2324.py

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

kfet/migrations/0016_settings_value_account.py

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

kfet/migrations/0017_auto_20160808_0234.py

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

kfet/migrations/0018_auto_20160808_0341.py

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

kfet/migrations/0019_auto_20160808_0343.py

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

kfet/migrations/0020_auto_20160808_0450.py

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

kfet/migrations/0021_auto_20160808_0506.py

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

kfet/migrations/0022_auto_20160808_0512.py

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

kfet/migrations/0023_auto_20160808_0535.py

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