Merge branch 'summary_notes' into 'main'

treasury summary See merge request bde/nk20!223
Merge branch 'notekfet_wrapped' into 'main'
2025-04-25 16:12:37 +00:00 · 2025-03-19 12:37:57 +01:00 · 2025-03-18 16:11:33 +01:00 · 2025-03-18 15:53:02 +01:00 · 2024-08-07 20:01:22 +02:00 · 2024-08-07 19:24:23 +02:00
12 changed files with 558 additions and 79 deletions
--- a/apps/member/migrations/0013_auto_20240807_1409.py
+++ b/apps/member/migrations/0013_auto_20240807_1409.py
@ -0,0 +1,18 @@
 # Generated by Django 2.2.28 on 2024-08-07 12:09
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('member', '0012_club_add_registration_form'),
    ]
    operations = [
        migrations.AlterField(
            model_name='profile',
            name='promotion',
            field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
        ),
    ]
--- a/apps/note/templates/note/mails/summary_notes_report.html
+++ b/apps/note/templates/note/mails/summary_notes_report.html
@ -0,0 +1,65 @@
 {% load pretty_money %}
 {% load i18n %}
 <!DOCTYPE html>
 <html lang="fr">
 <head>
    <meta charset="UTF-8">
    <title>[Note Kfet] Récapitulatif de trésorerie</title>
 </head>
 <body>
 <h1>
  Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 </h1>
 <h2>
  Tous les utilisateur⋅rices :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_user }}</li>
  <li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €</li>
 </ul>
 <h2>
  Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_user_bde }}</li>
  <li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde / 100 }} €</li>
 </ul>
 <h2>
  Clubs :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_club }}</li>
  <li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €</li>
 </ul>
 <h2>
  Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_club_nbde }}</li>
  <li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €</li>
 </ul>
 <h2>
  Progression :
 </h2>
 <ul>
  <li>Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices</li>
  <li>Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs</li>
 </ul>
 --
 <p>
    Le BDE<br>
    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 </p>
 </body>
 </html>
--- a/apps/note/templates/note/mails/summary_notes_report.txt
+++ b/apps/note/templates/note/mails/summary_notes_report.txt
@ -0,0 +1,33 @@
 {% load pretty_money %}
 {% load i18n %}
 Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 Tous les utilisateur⋅rices :
  - Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €
  - Neutres : {{ summary.total_zero_user }}
  - Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €
 Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
  - Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €
  - Neutres : {{ summary.total_zero_user_bde }}
  - Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde /100 }} €
 Clubs :
  - Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €
  - Neutres : {{ summary.total_zero_club }}
  - Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €
 Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
  - Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €
  - Neutres : {{ summary.total_zero_club_nbde }}
  - Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €
 Progression :
  - Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices
  - Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs
 --
 Le BDE
 {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
--- a/apps/scripts
+++ b/apps/scripts
@ -1 +1 @@
-Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61
+Subproject commit f76acb32487635fe28907b637955e110a37b06cc
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@ -5,13 +5,13 @@ from django.contrib import admin
 from note_kfet.admin import admin_site
 from .forms import ProductForm
-from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
+from .models import Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit
@admin.register(RemittanceType, site=admin_site)
 class RemittanceTypeAdmin(admin.ModelAdmin):
    """
-    Admin customisation for RemiitanceType
+    Admin customisation for RemittanceType
    """
    list_display = ('note', )
@ -55,3 +55,19 @@ class InvoiceAdmin(admin.ModelAdmin):
    """
    list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
    inlines = (ProductInline,)
@admin.register(NoteSummary, site=admin_site)
 class NoteSummaryAdmin(admin.ModelAdmin):
    """
    Admin customisation for NoteSummary
    """
    list_display = (
        'date', 'total_positive_user', 'balance_positive_user', 'total_positive_user_bde',
        'balance_positive_user_bde', 'total_zero_user', 'total_zero_user_bde', 'total_negative_user',
        'balance_negative_user', 'total_negative_user_bde', 'balance_negative_user_bde',
        'total_vnegative_user', 'balance_vnegative_user', 'total_vnegative_user_bde',
        'balance_vnegative_user_bde', 'total_positive_club', 'balance_positive_club',
        'total_positive_club_nbde', 'balance_positive_club_nbde', 'total_zero_club', 'total_zero_club_nbde',
        'total_negative_club', 'balance_negative_club', 'total_negative_club_nbde', 'balance_negative_club_nbde',
    )
--- a/apps/treasury/migrations/0009_notesummary.py
+++ b/apps/treasury/migrations/0009_notesummary.py
@ -0,0 +1,49 @@
 # Generated by Django 2.2.28 on 2024-08-07 12:09
 import datetime
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('treasury', '0008_auto_20240322_0045'),
    ]
    operations = [
        migrations.CreateModel(
            name='NoteSummary',
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
                ('total_positive_user', models.PositiveIntegerField(verbose_name='Total positive user')),
                ('balance_positive_user', models.PositiveIntegerField(verbose_name='Balance positive user')),
                ('total_positive_user_bde', models.PositiveIntegerField(verbose_name='Total positive user BDE')),
                ('balance_positive_user_bde', models.PositiveIntegerField(verbose_name='Balance positive user BDE')),
                ('total_zero_user', models.PositiveIntegerField(verbose_name='Total zero user')),
                ('total_zero_user_bde', models.PositiveIntegerField(verbose_name='Total zero user BDE')),
                ('total_negative_user', models.PositiveIntegerField(verbose_name='Total negative user')),
                ('balance_negative_user', models.PositiveIntegerField(verbose_name='Balance negative user')),
                ('total_negative_user_bde', models.PositiveIntegerField(verbose_name='Total negative user BDE')),
                ('balance_negative_user_bde', models.PositiveIntegerField(verbose_name='Balance negative user BDE')),
                ('total_vnegative_user', models.PositiveIntegerField(verbose_name='Total very negative user')),
                ('balance_vnegative_user', models.PositiveIntegerField(verbose_name='Balance very negative user')),
                ('total_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Total very negative user BDE')),
                ('balance_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Balance very negative user BDE')),
                ('total_positive_club', models.PositiveIntegerField(verbose_name='Total positive club')),
                ('balance_positive_club', models.PositiveIntegerField(verbose_name='Balance positive club')),
                ('total_positive_club_nbde', models.PositiveIntegerField(verbose_name='Total positive club nbde')),
                ('balance_positive_club_nbde', models.PositiveIntegerField(verbose_name='Balance positive club nbde')),
                ('total_zero_club', models.PositiveIntegerField(verbose_name='Total zero club')),
                ('total_zero_club_nbde', models.PositiveIntegerField(verbose_name='Total zero club nbde')),
                ('total_negative_club', models.PositiveIntegerField(verbose_name='Total negative club')),
                ('balance_negative_club', models.PositiveIntegerField(verbose_name='Balance negative club')),
                ('total_negative_club_nbde', models.PositiveIntegerField(verbose_name='Total negative club nbde')),
                ('balance_negative_club_nbde', models.PositiveIntegerField(verbose_name='Balance negative club nbde')),
            ],
            options={
                'verbose_name': 'Summary',
                'verbose_name_plural': 'Summaries',
            },
        ),
    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -460,3 +460,117 @@ class SogeCredit(models.Model):
            self.credit_transaction._force_save = True
            self.credit_transaction.save()
        super().delete(**kwargs)
 class NoteSummary(models.Model):
    """
    Summary of every notes
    """
    date = models.DateField(
        default=date.today,
        verbose_name=_("Date"),
    )
    total_positive_user = models.PositiveIntegerField(
        verbose_name=_("Total positive user"),
    )
    balance_positive_user = models.PositiveIntegerField(
        verbose_name=_("Balance positive user"),
    )
    total_positive_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total positive user BDE"),
    )
    balance_positive_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance positive user BDE"),
    )
    total_zero_user = models.PositiveIntegerField(
        verbose_name=_("Total zero user"),
    )
    total_zero_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total zero user BDE"),
    )
    total_negative_user = models.PositiveIntegerField(
        verbose_name=_("Total negative user"),
    )
    balance_negative_user = models.PositiveIntegerField(
        verbose_name=_("Balance negative user"),
    )
    total_negative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total negative user BDE"),
    )
    balance_negative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance negative user BDE"),
    )
    total_vnegative_user = models.PositiveIntegerField(
        verbose_name=_("Total very negative user"),
    )
    balance_vnegative_user = models.PositiveIntegerField(
        verbose_name=_("Balance very negative user"),
    )
    total_vnegative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total very negative user BDE"),
    )
    balance_vnegative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance very negative user BDE"),
    )
    total_positive_club = models.PositiveIntegerField(
        verbose_name=_("Total positive club"),
    )
    balance_positive_club = models.PositiveIntegerField(
        verbose_name=_("Balance positive club"),
    )
    total_positive_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total positive club nbde"),
    )
    balance_positive_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Balance positive club nbde"),
    )
    total_zero_club = models.PositiveIntegerField(
        verbose_name=_("Total zero club"),
    )
    total_zero_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total zero club nbde"),
    )
    total_negative_club = models.PositiveIntegerField(
        verbose_name=_("Total negative club"),
    )
    balance_negative_club = models.PositiveIntegerField(
        verbose_name=_("Balance negative club"),
    )
    total_negative_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total negative club nbde"),
    )
    balance_negative_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Balance negative club nbde"),
    )
    class Meta:
        verbose_name = _("Summary")
        verbose_name_plural = _("Summaries")
    def __str__(self):
        return "Note summary of {date}".format(date=self.date)
--- a/apps/wrapped/management/commands/generate_wrapped.py
+++ b/apps/wrapped/management/commands/generate_wrapped.py
@ -38,7 +38,7 @@ class Command(BaseCommand):
            required=False,
            help="""User will have their(s) wrapped generated,
            all = all users
-            adh = all users who have a valid memberships to BDE during the BDE considered
+            adh = all users who have a valid cd memberships to BDE during the BDE considered
            supersuser = all superusers
            custom user1,user2,... = a list of username,
            custom_id id1,id2,... = a list of user id""",
@ -70,15 +70,7 @@ class Command(BaseCommand):
            dest='create',
        )
-    def handle(self, *args, **options):
+    def handle(self, *args, **options): # NOQA
        # useful string for output
        red = '\033[31;1m'
        yellow = '\033[33;1m'
        green = '\033[32;1m'
        abort = red + 'ABORT'
        warning = yellow + 'WARNING'
        success = green + 'SUCCESS'
        # Traitement des paramètres
        verb = options['verbosity']
        bde = []
@ -89,11 +81,11 @@ class Command(BaseCommand):
        if options['bde_id']:
            if bde:
                if verb >= 1:
-                    print(warning)
+                    self.stdout.write(self.style.WARNING(
-                    print(yellow + 'You already defined bde with their name !')
+                        "WARNING\nYou already defined bde with their name !"))
                if verb >= 0:
-                    print(abort)
+                    self.stdout.write(self.style.ERROR("ABORT"))
-                return
+                exit(1)
            bde_id = options['bde_id'].split(',')
            bde = [Bde.objects.get(pk=i) for i in bde_id]
@ -113,11 +105,11 @@ class Command(BaseCommand):
                user = ['custom_id', [User.objects.get(pk=u) for u in user_id]]
            else:
                if verb >= 1:
-                    print(warning)
+                    self.sdtout.write(self.style.WARNING(
-                    print(yellow + 'You user option is not recognized')
+                        "WARNING\nYou user option is not recognized"))
                if verb >= 0:
-                    print(abort)
+                    self.stdout.write(self.style.ERROR("ABORT"))
-                return
+                exit(1)
        club = []
        if options['club']:
@ -133,11 +125,11 @@ class Command(BaseCommand):
                club = ['custom_id', [Club.objects.get(pk=c) for c in club_id]]
            else:
                if verb >= 1:
-                    print(warning)
+                    self.stdout.write(self.style.WARNING(
-                    print(yellow + 'You club option is not recognized')
+                        "WARNING\nYou club option is not recognized"))
                if verb >= 0:
-                    print(abort)
+                    self.stdout.write(self.style.ERROR("ABORT"))
-                return
+                exit(1)
        change = options['change']
        create = options['create']
@ -145,72 +137,75 @@ class Command(BaseCommand):
        # check if parameters are sufficient for generate wrapped with the desired option
        if not bde:
            if verb >= 1:
-                print(warning)
+                self.stdout.write(self.style.WARNING(
-                print(yellow + 'You have not selectionned a BDE !')
+                    "WARNING\nYou have not selectionned a BDE !"))
            if verb >= 0:
-                print(abort)
+                self.stdout.write(self.style.ERROR("ABORT"))
-            return
+            exit(1)
        if not (user or club):
            if verb >= 1:
-                print(warning)
+                self.stdout.write(self.style.WARNING(
-                print(yellow + 'No club or user selected !')
+                    "WARNING\nNo club or user selected !"))
            if verb >= 0:
-                print(abort)
+                self.stdout.write(self.style.ERROR("ABORT"))
-            return
+            exit(1)
        if verb >= 3:
-            print('\033[1mOptions:\033[m')
+            self.stdout.write("Options:")
            bde_str = ''
            for b in bde:
-                bde_str += str(b)
+                bde_str += str(b) + '\n'
-            print('BDE: ' + bde_str)
+            self.stdout.write("BDE: " + bde_str)
            if user:
-                print('User: ' + user[0])
+                self.stdout.write('User: ' + user[0])
            if club:
-                print('Club: ' + club[0])
+                self.stdout.write('Club: ' + club[0])
-            print('change: ' + str(change))
+            self.stdout.write('change: ' + str(change))
-            print('create: ' + str(create))
+            self.stdout.write('create: ' + str(create) + '\n')
            print('')
        if not (change or create):
            if verb >= 1:
-                print(warning)
+                self.stdout.write(self.style.WARNING(
-                print(yellow + 'change and create is set to false, none wrapped will be created')
+                    "WARNING\nchange and create is set to false, none wrapped will be created"))
            if verb >= 0:
-                print(abort)
+                self.stdout.write(self.style.ERROR("ABORT"))
-            return
+            exit(1)
        if verb >= 1 and change:
-            print(warning)
+            self.stdout.write(self.style.WARNING(
-            print(yellow + 'change is set to true, some wrapped may be replaced !')
+                "WARNING\nchange is set to true, some wrapped may be replaced !"))
        if verb >= 1 and not create:
-            print(warning)
+            self.stdout.write(self.style.WARNING(
-            print(yellow + 'create is set to false, wrapped will not be created !')
+                "WARNING\ncreate is set to false, wrapped will not be created !"))
        if verb >= 3 or change or not create:
            a = str(input('\033[mContinue ? (y/n) ')).lower()
            if a in ['n', 'no', 'non', '0']:
                if verb >= 0:
-                    print(abort)
+                    self.stdout.write(self.style.ERROR("ABORT"))
-                return
+                exit(1)
        note = self.convert_to_note(change, create, bde=bde, user=user, club=club, verb=verb)
        if verb >= 1:
-            print("\033[32mUser and/or Club given has successfully convert in their note\033[m")
+            self.stdout.write(self.style.SUCCESS(
                "User and/or Club given has successfully convert in their note"))
        global_data = self.global_data(bde, verb=verb)
        if verb >= 1:
-            print("\033[32mGlobal data has been successfully generated\033[m")
+            self.stdout.write(self.style.SUCCESS(
                "Global data has been successfully generated"))
        unique_data = self.unique_data(bde, note, global_data=global_data, verb=verb)
        if verb >= 1:
-            print("\033[32mUnique data has been successfully generated\033[m")
+            self.stdout.write(self.style.SUCCESS(
                "Unique data has been successfully generated"))
        self.make_wrapped(unique_data, note, bde, change, create, verb=verb)
        if verb >= 1:
-            print(green + "The wrapped has been generated !")
+            self.stdout.write(self.style.SUCCESS(
                "The wrapped has been generated !"))
        if verb >= 0:
-            print(success)
+            self.stdout.write(self.style.SUCCESS("SUCCESS"))
        exit(0)
-        return
+    def convert_to_note(self, change, create, bde=None, user=None, club=None, verb=1): # NOQA
    def convert_to_note(self, change, create, bde=None, user=None, club=None, verb=1):
        notes = []
        for b in bde:
            note_for_bde = Note.objects.filter(pk__lte=-1)
@ -253,17 +248,17 @@ class Command(BaseCommand):
            note_for_bde = self.filter_note(b, note_for_bde, change, create, verb=verb)
            notes.append(note_for_bde)
            if verb >= 2:
-                print("\033[m{nb} note selectionned for bde {bde}".format(nb=len(note_for_bde), bde=b.name))
+                self.stdout.write(f"{len(note_for_bde)} note selectionned for bde {b.name}")
        return notes
-    def global_data(self, bde, verb=1):
+    def global_data(self, bde, verb=1): # NOQA
        data = {}
        for b in bde:
            if b.name == 'Rave Part[list]':
                if verb >= 2:
-                    print("Begin to make global data")
+                    self.stdout.write("Begin to make global data")
                if verb >= 3:
-                    print('nb_transaction')
+                    self.stdout.write("nb_transaction")
                # nb total de transactions
                data['nb_transaction'] = Transaction.objects.filter(
                    created_at__gte=b.date_start,
@ -271,7 +266,7 @@ class Command(BaseCommand):
                    valid=True).count()
                if verb >= 3:
-                    print('nb_vieux_con')
+                    self.stdout.write("nb_vieux_con")
                # nb total de vielleux con·ne·s derrière le bar
                button_id = [2884, 2585]
                transactions = Transaction.objects.filter(
@ -286,7 +281,7 @@ class Command(BaseCommand):
                data['nb_vieux_con'] = q
                if verb >= 3:
-                    print('nb_soiree')
+                    self.stdout.write("nb_soiree")
                # nb total de soirée
                a_type_id = [1, 2, 4, 5, 7, 10]
                data['nb_soiree'] = Activity.objects.filter(
@ -296,7 +291,7 @@ class Command(BaseCommand):
                    activity_type__pk__in=a_type_id).count()
                if verb >= 3:
-                    print('pots, nb_entree_pot')
+                    self.stdout.write('pots, nb_entree_pot')
                # nb d'entrée totale aux pots
                pot_id = [1, 4, 10]
                pots = Activity.objects.filter(
@ -310,7 +305,7 @@ class Command(BaseCommand):
                    data['nb_entree_pot'] += Entry.objects.filter(activity=pot).count()
                if verb >= 3:
-                    print('top3_buttons')
+                    self.stdout.write('top3_buttons')
                # top 3 des boutons les plus cliqués
                transactions = Transaction.objects.filter(
                    created_at__gte=b.date_start,
@ -329,7 +324,7 @@ class Command(BaseCommand):
                data['top3_buttons'] = list(sorted(d.items(), key=lambda item: item[1], reverse=True))[:3]
                if verb >= 3:
-                    print('class_conso_all')
+                    self.stdout.write('class_conso_all')
                # le classement des plus gros consommateurs (BDE + club)
                transactions = Transaction.objects.filter(
                    created_at__gte=b.date_start,
@ -348,7 +343,7 @@ class Command(BaseCommand):
                data['class_conso_all'] = dict(sorted(d.items(), key=lambda item: item[1], reverse=True))
                if verb >= 3:
-                    print('class_conso_bde')
+                    self.stdout.write('class_conso_bde')
                # le classement des plus gros consommateurs BDE
                transactions = Transaction.objects.filter(
                    created_at__gte=b.date_start,
@ -368,11 +363,10 @@ class Command(BaseCommand):
            else:
                # make your wrapped or reuse previous wrapped
-                raise NotImplementedError("The BDE: {bde_name} has not personalized wrapped, make it !"
+                raise NotImplementedError(f"The BDE: {b.name} has not personalized wrapped, make it !")
                                          .format(bde_name=b.name))
        return data
-    def unique_data(self, bde, note, global_data=None, verb=1):
+    def unique_data(self, bde, note, global_data=None, verb=1): # NOQA
        data = []
        for i in range(len(bde)):
            data_bde = []
@ -380,8 +374,7 @@ class Command(BaseCommand):
                if verb >= 3:
                    total = len(note[i])
                    current = 0
-                    print('Make {nb} data for wrapped sponsored by {bde}'
+                    self.stdout.write(f"Make {total} data for wrapped sponsored by {bde[i].name}")
                          .format(nb=total, bde=bde[i].name))
                for n in note[i]:
                    d = {}
                    if 'user' in n.__dir__():
@ -542,12 +535,11 @@ class Command(BaseCommand):
                    data_bde.append(json.dumps(d))
                    if verb >= 3:
                        current += 1
-                        print('\033[2K' + '({c}/{t})'.format(c=current, t=total) + '\033[1A')
+                        self.stdout.write("\033[2K" + f"({current}/{total})" + "\033[1A")
            else:
                # make your wrapped or reuse previous wrapped
-                raise NotImplementedError("The BDE: {bde_name} has not personalized wrapped, make it !"
+                raise NotImplementedError(f"The BDE: {bde[i].name} has not personalized wrapped, make it !")
                                          .format(bde_name=bde[i].name))
            data.append(data_bde)
        return data
@ -557,7 +549,7 @@ class Command(BaseCommand):
            total = 0
            for n in note:
                total += len(n)
-            print('\033[mMake {nb} wrapped'.format(nb=total))
+            self.stdout.write(f"Make {total} wrapped")
        for i in range(len(bde)):
            for j in range(len(note[i])):
                if create and not Wrapped.objects.filter(bde=bde[i], note=note[i][j]):
@ -572,7 +564,7 @@ class Command(BaseCommand):
                    w.save()
                if verb >= 3:
                    current += 1
-                    print('\033[2K' + '({c}/{t})'.format(c=current, t=total) + '\033[1A')
+                    self.stdout.write("\033[2K" + f"({current}/{total})" + "\033[1A")
        return
    def filter_note(self, bde, note, change, create, verb=1):
--- a/apps/wrapped/tests/init.py
+++ b/apps/wrapped/tests/init.py
--- a/apps/wrapped/tests/test_wrapped.py
+++ b/apps/wrapped/tests/test_wrapped.py
@ -0,0 +1,91 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from datetime import timedelta
 from api.tests import TestAPI
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
 from ..api.views import WrappedViewSet, BdeViewSet
 from ..models import Bde, Wrapped
 class TestWrapped(TestCase):
    """
    Test activities
    """
    fixtures = ('initial',)
    def setUp(self):
        self.user = User.objects.create_superuser(
            username="admintoto",
            password="tototototo",
            email="toto@example.com"
        )
        self.client.force_login(self.user)
        sess = self.client.session
        sess["permission_mask"] = 42
        sess.save()
        self.bde = Bde.objects.create(
            name="The best BDE",
            date_start=timezone.now() - timedelta(days=365),
            date_end=timezone.now(),
        )
        self.wrapped = Wrapped.objects.create(
            generated=True,
            public=False,
            bde=self.bde,
            note=self.user.note,
            data_json="{}",
        )
    def test_wrapped_list(self):
        """
        Display the list of all wrapped
        """
        response = self.client.get(reverse("wrapped:wrapped_list"))
        self.assertEqual(response.status_code, 200)
    def test_wrapped_detail(self):
        """
        Display the detail of an wrapped
        """
        response = self.client.get(reverse("wrapped:wrapped_detail", args=(self.wrapped.pk,)))
        self.assertEqual(response.status_code, 200)
 class TestWrappedAPI(TestAPI):
    def setUp(self) -> None:
        super().setUp()
        self.bde = Bde.objects.create(
            name="The best BDE",
            date_start=timezone.now() - timedelta(days=365),
            date_end=timezone.now(),
        )
        self.wrapped = Wrapped.objects.create(
            generated=True,
            public=False,
            bde=self.bde,
            note=self.user.note,
            data_json="{}",
        )
    def test_bde_api(self):
        """
        Load Bde API page and test all filters and permissions
        """
        self.check_viewset(BdeViewSet, "/api/wrapped/bde/")
    def test_wrapped_api(self):
        """
        Load Wrapped API page and test all filters and permissions
        """
        self.check_viewset(WrappedViewSet, "/api/wrapped/wrapped/")
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -1985,6 +1985,8 @@ msgstr "Historique des transactions récentes"
 #: apps/note/templates/note/mails/negative_balance.txt:25
 #: apps/note/templates/note/mails/negative_notes_report.html:46
 #: apps/note/templates/note/mails/negative_notes_report.txt:13
 #: apps/note/templates/note/mails/summary_notes_report.html:62
 #: apps/note/templates/note/mails/summary_ntoes_report.txt:33
 #: apps/note/templates/note/mails/weekly_report.html:51
 #: apps/note/templates/note/mails/weekly_report.txt:32
 #: apps/registration/templates/registration/mails/email_validation_email.html:40
@ -2563,6 +2565,7 @@ msgid "Address"
 msgstr "Adresse"
 #: apps/treasury/models.py:69 apps/treasury/models.py:202
 #: apps/treasury/models.py:472
 msgid "Date"
 msgstr "Date"
@ -2682,6 +2685,102 @@ msgstr ""
 "sa note. Merci de lui demander de recharger sa note avant d'invalider ce "
 "crédit."
 #: apps/treasury/models.py:476
 msgid "Total positive user"
 msgstr "Nombre d'utilisateur⋅rices en positif"
 #: apps/treasury/models.py:480
 msgid "Balance positive user"
 msgstr "Solde des utilisateur⋅rices en positif"
 #: apps/treasury/models.py:484
 msgid "Total positive user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en positif"
 #: apps/treasury/models.py:488
 msgid "Balance positive user BDE"
 msgstr "Solde des adhérent⋅es au BDE en positif"
 #: apps/treasury/models.py:492
 msgid "Total zero user"
 msgstr "Nombre d'utilisateur⋅rices à zéro"
 #: apps/treasury/models.py:496
 msgid "Total zero user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE à zéro"
 #: apps/treasury/models.py:500
 msgid "Total negative user"
 msgstr "Nombre d'utilisateur⋅rices en négatif"
 #: apps/treasury/models.py:504
 msgid "Balance negative user"
 msgstr "Solde des utilisateur⋅rices en négatif"
 #: apps/treasury/models.py:508
 msgid "Total negative user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en négatif"
 #: apps/treasury/models.py:512
 msgid "Balance negative user BDE"
 msgstr "Solde des adhérent⋅es au BDE en négatif"
 #: apps/treasury/models.py:516
 msgid "Total very negative user"
 msgstr "Nombre d'utilisateur⋅rices en négatif sévère"
 #: apps/treasury/models.py:520
 msgid "Balance very negative user"
 msgstr "Solde des utilisateur⋅rices en négatif sévère"
 #: apps/treasury/models.py:524
 msgid "Total very negative user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en négatif sévère"
 #: apps/treasury/models.py:528
 msgid "Balance very negative user BDE"
 msgstr "Solde des adhérent⋅es au BDE en négatif sévère"
 #: apps/treasury/models.py:532
 msgid "Total positive club"
 msgstr "Nombre de clubs en positif"
 #: apps/treasury/models.py:536
 msgid "Balance positive club"
 msgstr "Solde des clubs en positif"
 #: apps/treasury/models.py:540
 msgid "Total positive club nbde"
 msgstr "Nombre de clubs non-BDE en positif"
 #: apps/treasury/models.py:544
 msgid "Balance positive club nbde"
 msgstr "Solde des clubs non-BDE en positif"
 #: apps/treasury/models.py:548
 msgid "Total zero club"
 msgstr "Nombre de clubs à zéro"
 #: apps/treasury/models.py:552
 msgid "Total zero club nbde"
 msgstr "Nombre de clubs non-BDE à zéro"
 #: apps/treasury/models.py:556
 msgid "Total negative club"
 msgstr "Nombre de clubs en négatif"
 #: apps/treasury/models.py:560
 msgid "Balance negative club"
 msgstr "Solde des clubs en négatif"
 #: apps/treasury/models.py:564
 msgid "Total negative club nbde"
 msgstr "Nombre de clubs non-BDE en négatif"
 #: apps/treasury/models.py:568
 msgid "Balance negative club nbde"
 msgstr "Solde des clubs non-BDE en négatif"
 #: apps/treasury/tables.py:20
 msgid "Invoice #{:d}"
 msgstr "Facture n°{:d}"
--- a/note.cron
+++ b/note.cron
@ -20,6 +20,8 @@ MAILTO=notekfet2020@lists.crans.org
 00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 # Envoyer le rapport mensuel aux trésoriers et respos info
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
 # Envoyer le recap de tresorerie
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
 # Envoyer les rapports aux gens
 55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 # Mettre à jour les boutons mis en avant
Author	SHA1	Message	Date
hugoooo	a11e2fee21	Merge branch 'summary_notes' into 'main' treasury summary See merge request bde/nk20!223	2025-03-19 12:37:57 +01:00
quark	5ef019c5c2	Merge branch 'notekfet_wrapped' into 'main' Rewrite script and add test See merge request bde/nk20!300	2025-03-18 16:11:33 +01:00
quark	8da62e62fb	Rewrite script and add test	2025-03-18 15:53:02 +01:00
korenstin	5a0fe7a6f0	Fr translation (treasury summary)	2024-08-07 20:01:22 +02:00
korenstin	eda8460014	Inclusif, admin and migrations (treasury summary)	2024-08-07 19:24:23 +02:00
Hugo	15c71ad31a	treasury summary	2024-08-02 01:35:13 +02:00
		`@ -1 +1 @@`
			`Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61`				`Subproject commit f76acb32487635fe28907b637955e110a37b06cc`