From 53748cd5346e88ede168c72c2b2d78a0541a77e9 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 18 Apr 2020 15:57:11 +0200 Subject: [PATCH 1/7] frenglish -> english --- apps/treasury/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/treasury/models.py b/apps/treasury/models.py index ca1da3a4..9d7ee848 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -189,7 +189,7 @@ class SpecialTransactionProxy(models.Model): """ In order to keep modularity, we don't that the Note app depends on the treasury app. That's why we create a proxy in this app, to link special transactions and remittances. - If it isn't very clean, that makes what we want. + If it isn't very clean, it does what we want. """ transaction = models.OneToOneField( From cc97948c244cb5513829259bdee3705573406ccb Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 18 Apr 2020 15:59:06 +0200 Subject: [PATCH 2/7] clean specialTransaction --- apps/note/models/transactions.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 83f8f914..80b22b59 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -252,6 +252,17 @@ class SpecialTransaction(Transaction): def type(self): return _('Credit') if isinstance(self.source, NoteSpecial) else _("Debit") + def is_credit(self): + return isinstance(self.source, NoteSpecial) + + def is_debit(self): + return isinstance(self.destination, NoteSpecial) + + def clean(self): + # SpecialTransaction are only possible with NoteSpecial object + if self.is_credit() == self.is_debit(): + raise(ValidationError(_("A special transaction is only possible between a Note associated to a payment method and a User or a Club"))) + class MembershipTransaction(Transaction): """ From 038ddc2ab87ab384d85948a7fafa1b403bafab47 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 18 Apr 2020 15:59:59 +0200 Subject: [PATCH 3/7] remittance need preciser check (bug during import) --- apps/treasury/signals.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/treasury/signals.py b/apps/treasury/signals.py index 54c19c09..b7038ab6 100644 --- a/apps/treasury/signals.py +++ b/apps/treasury/signals.py @@ -8,5 +8,10 @@ def save_special_transaction(instance, created, **kwargs): """ When a special transaction is created, we create its linked proxy """ - if created and RemittanceType.objects.filter(note=instance.source).exists(): - SpecialTransactionProxy.objects.create(transaction=instance, remittance=None).save() + + if instance.is_credit(): + if created and RemittanceType.objects.filter(note=instance.source).exists(): + SpecialTransactionProxy.objects.create(transaction=instance, remittance=None).save() + else: + if created and RemittanceType.objects.filter(note=instance.destination).exists(): + SpecialTransactionProxy.objects.create(transaction=instance, remittance=None).save() From 6d27193ac476a1d9bebaba4a06389f6456b023e3 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 18 Apr 2020 16:07:45 +0200 Subject: [PATCH 4/7] update import script --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index b9fdced3..b9db26fa 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit b9fdced3c2ce34168b8f0d6004a20a69ca16e0de +Subproject commit b9db26fa494870b02fc1b4b463a2322395a278a1 From 110ef79951e0937b496ba4ee6227953af281bd2d Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Thu, 14 May 2020 15:16:10 +0200 Subject: [PATCH 5/7] move wei script to wei app --- apps/scripts | 2 +- .../commands/export_wei_registrations.py | 89 +++++++++++++++++++ .../commands/extract_ml_registrations.py | 52 +++++++++++ apps/wei/management/commands/wei_algorithm.py | 15 ++++ 4 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 apps/wei/management/commands/export_wei_registrations.py create mode 100644 apps/wei/management/commands/extract_ml_registrations.py create mode 100644 apps/wei/management/commands/wei_algorithm.py diff --git a/apps/scripts b/apps/scripts index f0aa4269..64e8e88e 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit f0aa426950b9b867bf99233795e260871be2cb99 +Subproject commit 64e8e88ed3ab505b2cfb0529817812f3b7990767 diff --git a/apps/wei/management/commands/export_wei_registrations.py b/apps/wei/management/commands/export_wei_registrations.py new file mode 100644 index 00000000..f76852c8 --- /dev/null +++ b/apps/wei/management/commands/export_wei_registrations.py @@ -0,0 +1,89 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.core.management import BaseCommand, CommandError +from django.db.models import Q +from django.db.models.functions import Lower + +from wei.models import WEIClub, Bus, BusTeam, WEIMembership + + +class Command(BaseCommand): + help = "Export WEI registrations." + + def add_arguments(self, parser): + parser.add_argument('--bus', '-b', choices=[bus.name for bus in Bus.objects.all()], type=str, default=None, + help='Filter by bus') + parser.add_argument('--team', '-t', choices=[team.name for team in BusTeam.objects.all()], type=str, + default=None, help='Filter by team. Type "none" if you want to select the members ' + + 'that are not in a team.') + parser.add_argument('--year', '-y', type=int, default=None, + help='Select the year of the concerned WEI. Default: last year') + parser.add_argument('--sep', type=str, default='|', + help='Select the CSV separator.') + + def handle(self, *args, **options): + year = options["year"] + if year: + try: + wei = WEIClub.objects.get(year=year) + except WEIClub.DoesNotExist: + raise CommandError("The WEI of year {:d} does not exist.".format(year,)) + else: + wei = WEIClub.objects.order_by('-year').first() + + bus = options["bus"] + if bus: + try: + bus = Bus.objects.filter(wei=wei).get(name=bus) + except Bus.DoesNotExist: + raise CommandError("The bus {} does not exist or does not belong to the WEI {}.".format(bus, wei.name,)) + + team = options["team"] + if team: + if team.lower() == "none": + team = 0 + else: + try: + team = BusTeam.objects.filter(Q(bus=bus) | Q(wei=wei)).get(name=team) + bus = team.bus + except BusTeam.DoesNotExist: + raise CommandError("The bus {} does not exist or does not belong to the bus {} neither the wei {}." + .format(team, bus.name if bus else "", wei.name,)) + + qs = WEIMembership.objects + qs = qs.filter(club=wei).order_by( + Lower('bus__name'), + Lower('team__name'), + 'user__profile__promotion', + Lower('user__last_name'), + Lower('user__first_name'), + ).distinct() + + if bus: + qs = qs.filter(bus=bus) + + if team is not None: + qs = qs.filter(team=team if team else None) + + sep = options["sep"] + + self.stdout.write("Nom|Prénom|Date de naissance|Genre|Département|Année|Section|Bus|Équipe|Rôles" + .replace(sep, sep)) + + for membership in qs.all(): + user = membership.user + registration = membership.registration + bus = membership.bus + team = membership.team + s = user.last_name + s += sep + user.first_name + s += sep + str(registration.birth_date) + s += sep + registration.get_gender_display() + s += sep + user.profile.get_department_display() + s += sep + str(user.profile.ens_year) + "A" + s += sep + user.profile.section_generated + s += sep + bus.name + s += sep + (team.name if team else "--") + s += sep + ", ".join(role.name for role in membership.roles.filter(~Q(name="Adhérent WEI")).all()) + self.stdout.write(s) diff --git a/apps/wei/management/commands/extract_ml_registrations.py b/apps/wei/management/commands/extract_ml_registrations.py new file mode 100644 index 00000000..b67bf10b --- /dev/null +++ b/apps/wei/management/commands/extract_ml_registrations.py @@ -0,0 +1,52 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from datetime import date + +from django.core.management import BaseCommand +from django.db.models import Q +from member.models import Membership, Club +from wei.models import WEIClub + + +class Command(BaseCommand): + help = "Get mailing list registrations from the last wei. " \ + "Usage: manage.py extract_ml_registrations -t {events,art,sport}. " \ + "You can write this into a file with a pipe, then paste the document into your mail manager." + + def add_arguments(self, parser): + parser.add_argument('--type', '-t', choices=["members", "clubs", "events", "art", "sport"], default="members", + help='Select the type of the mailing list (default members)') + parser.add_argument('--year', '-y', type=int, default=None, + help='Select the year of the concerned WEI. Default: last year') + + def handle(self, *args, **options): + if options["type"] == "members": + for membership in Membership.objects.filter( + club__name="BDE", + date_start__lte=date.today(), + date_end__gte=date.today(), + ).all(): + self.stdout.write(membership.user.email) + return + + if options["type"] == "clubs": + for club in Club.objects.all(): + self.stdout.write(club.email) + return + + if options["year"] is None: + wei = WEIClub.objects.order_by('-year').first() + else: + wei = WEIClub.objects.filter(year=options["year"]) + if wei.exists(): + wei = wei.get() + else: + wei = WEIClub.objects.order_by('-year').first() + self.stderr.write(self.style.WARNING("Warning: there was no WEI in year " + str(options["year"]) + ". " + + "Assuming the last WEI (year " + str(wei.year) + ")")) + q = Q(ml_events_registration=True) if options["type"] == "events" else Q(ml_art_registration=True)\ + if options["type"] == "art" else Q(ml_sport_registration=True) + registrations = wei.users.filter(q) + for registration in registrations.all(): + self.stdout.write(registration.user.email) diff --git a/apps/wei/management/commands/wei_algorithm.py b/apps/wei/management/commands/wei_algorithm.py new file mode 100644 index 00000000..01640720 --- /dev/null +++ b/apps/wei/management/commands/wei_algorithm.py @@ -0,0 +1,15 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.core.management import BaseCommand +from wei.forms import CurrentSurvey + + +class Command(BaseCommand): + help = "Attribute to each first year member a bus for the WEI" + + def handle(self, *args, **options): + """ + Run the WEI algorithm to attribute a bus to each first year member. + """ + CurrentSurvey.get_algorithm_class()().run_algorithm() From 79fbe96fe142fba02f81e6331f693d83814c552b Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 25 May 2020 12:26:33 +0200 Subject: [PATCH 6/7] updates scripts --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 64e8e88e..985f7c7b 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 64e8e88ed3ab505b2cfb0529817812f3b7990767 +Subproject commit 985f7c7bcd652edfba321977252b36f3ac93a61b From 640d31d20007cdd642e2503c5baa88fbf3aa90c3 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Mon, 25 May 2020 12:27:05 +0200 Subject: [PATCH 7/7] fix install for python 3.8 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 9c978ed0..7da788e3 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,7 +11,7 @@ django-tables2==2.1.0 docutils==0.14 idna==2.8 oauthlib==3.1.0 -Pillow==6.1.0 +Pillow==7.1.2 python3-openid==3.1.0 pytz==2019.1 requests==2.22.0