Merge branch 'notes_report' into 'master'

send summary script

See merge request bde/nk20-scripts!5

management/commands/merge_club.py

@@ -3,7 +3,6 @@
 
 import getpass
 from time import sleep
-from copy import copy
 
 from django.conf import settings
 from django.core.mail import mail_admins
@@ -135,8 +134,7 @@ class Command(BaseCommand):
                 for tr in transactions:
                     if kwargs['verbosity'] >= 1:
                         self.stdout.write(f"Removing {tr}…")
-                    tr_merge = copy(tr)
-                    tr_merge.pk = None
+                    tr_merge = tr
                     tr_merge.source = true_club.note
                     local_created.append(tr_merge)
                     if kwargs['verbosity'] >= 1:
@@ -157,8 +155,7 @@ class Command(BaseCommand):
                 for tr in transactions:
                     if kwargs['verbosity'] >= 1:
                         self.stdout.write(f"Removing {tr}…")
-                    tr_merge = copy(tr)
-                    tr_merge.pk = None
+                    tr_merge = tr
                     tr_merge.destination = true_club.note
                     local_created.append(tr_merge)
                     if kwargs['verbosity'] >= 1:
@@ -282,7 +279,6 @@ class Command(BaseCommand):
                     for club in fake_clubs:
                         self.stdout.write(self.style.SUCCESS(f"Club {club} deleted and merge in {true_club}."))
                         deleted_clubs.append(clubs)
-                    self.stdout.write(self.style.WARNING("There are problems with balance of inactive note impact by the fusion, run './manage.py check_consistency -a -f' to fix"))
                     deleted += local_deleted
                     created += local_created
                     edited += local_edited

management/commands/send_mail_for_food.py

@@ -1,41 +0,0 @@
-# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date, timedelta
-
-from django.core.mail import send_mail
-from django.core.management import BaseCommand
-from django.template.loader import render_to_string
-from django.utils.translation import activate
-from food.models import Food
-from member.models import Club
-
-
-class Command(BaseCommand):
-    def add_arguments(self, parser):
-        parser.add_argument("--report", "-r", action='store_true', help="Report the list of food to GCKs")
-        parser.add_argument("--club", "-c", action='store_true', help="Report the list of food to club")
-
-    def handle(self, *args, **options):
-        activate('fr')
-        
-        foods = Food.objects.filter(end_of_life='').order_by('expiry_date').distinct().all()
-
-        if options["report"]:
-            plain_text = render_to_string("scripts/food_report.txt", context=dict(foods=foods))
-            html = render_to_string("scripts/food_report.html", context=dict(foods=foods))
-            send_mail("[Note Kfet] Liste de la nourriture à la Kfet", plain_text, "Note Kfet 2020 <notekfet2020@crans.org>",
-                      recipient_list=["respo-info.bde@lists.crans.org", "gck.bde@lists.crans.org"],
-                      html_message=html)
-
-        if options["club"]:
-            for club in Club.objects.all():
-                if Food.objects.filter(end_of_life='', owner=club).count() > 0:
-                    plain_text = render_to_string("scripts/food_report.txt",
-                                                  context=dict(foods=foods.filter(owner=club)))
-                    html = render_to_string("scripts/food_report.html",
-                                            context=dict(foods=foods.filter(owner=club)))
-                    send_mail("[Note Kfet] Liste de la nourriture de votre club", plain_text, "Note Kfet 2020 <notekfet2020@crans.org>",
-                              recipient_list=[club.email],
-                              html_message=html)
-

management/commands/send_summary_notes_report.py

@@ -0,0 +1,144 @@
+# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from datetime import date
+
+from django.core.mail import send_mail
+from django.core.management import BaseCommand
+from django.db.models import Q
+from django.template.loader import render_to_string
+from django.utils.translation import activate
+from note.models import NoteUser, NoteClub
+from treasury.models import NoteSummary
+
+
+class Command(BaseCommand):
+    def add_arguments(self, parser):
+        parser.add_argument("--negative-amount", "-n", action='store', type=int, default=1000,
+                            help="Maximum amount to be considered as very negative (inclusive)")
+
+    def handle(self, *args, **options):
+        activate('fr')
+
+        if options['negative_amount'] == 0:
+            # Don't log empty notes
+            options['negative_amount'] = 1
+    
+        
+        # User notes
+        positive_user_notes = NoteUser.objects.filter( Q(balance__gt=0) ).distinct()
+        positive_user_notes_bde = positive_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
+
+        zero_user_notes = NoteUser.objects.filter( Q(balance=0) ).distinct()
+        zero_user_notes_bde = zero_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
+
+        negative_user_notes = NoteUser.objects.filter( Q(balance__lt=0) ).distinct()
+        negative_user_notes_bde = negative_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
+
+        vnegative_user_notes = NoteUser.objects.filter( Q(balance__lte=-options["negative_amount"]) ).distinct()
+        vnegative_user_notes_bde = vnegative_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
+
+
+        total_positive_user = positive_user_notes.count()
+        balance_positive_user = sum(note.balance for note in positive_user_notes.all())
+
+        total_positive_user_bde = positive_user_notes_bde.count()
+        balance_positive_user_bde = sum(note.balance for note in positive_user_notes_bde.all())
+
+        total_zero_user = zero_user_notes.count()
+
+        total_zero_user_bde = zero_user_notes_bde.count()
+
+        total_negative_user = negative_user_notes.count()
+        balance_negative_user = sum(note.balance for note in negative_user_notes.all())
+
+        total_negative_user_bde = negative_user_notes_bde.count()
+        balance_negative_user_bde = sum(note.balance for note in negative_user_notes_bde.all())
+
+        total_vnegative_user = vnegative_user_notes.count()
+        balance_vnegative_user = sum(note.balance for note in vnegative_user_notes.all())
+
+        total_vnegative_user_bde = vnegative_user_notes_bde.count()
+        balance_vnegative_user_bde = sum(note.balance for note in vnegative_user_notes_bde.all())
+
+        
+
+        #Club notes
+        positive_club_notes = NoteClub.objects.filter( Q(balance__gt=0) ).distinct()
+        positive_club_notes_nbde = positive_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
+
+        zero_club_notes = NoteClub.objects.filter( Q(balance=0) ).distinct()
+        zero_club_notes_nbde = zero_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
+
+        negative_club_notes = NoteClub.objects.filter( Q(balance__lt=0) ).distinct()
+        negative_club_notes_nbde = negative_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
+
+
+        total_positive_club = positive_club_notes.count()
+        balance_positive_club = sum(note.balance for note in positive_club_notes.all())
+
+        total_positive_club_nbde = positive_club_notes_nbde.count()
+        balance_positive_club_nbde = sum(note.balance for note in positive_club_notes_nbde.all())
+
+        total_zero_club = zero_club_notes.count()
+
+        total_zero_club_nbde = zero_club_notes_nbde.count()
+
+        total_negative_club = negative_club_notes.count()
+        balance_negative_club = sum(note.balance for note in negative_club_notes.all())
+
+        total_negative_club_nbde = negative_club_notes_nbde.count()
+        balance_negative_club_nbde = sum(note.balance for note in negative_club_notes_nbde.all())
+        
+
+        last_summary = NoteSummary.objects.order_by('-date').first()
+
+        summary = NoteSummary.objects.create(
+            total_positive_user=total_positive_user,
+            balance_positive_user=balance_positive_user,
+
+            total_positive_user_bde=total_positive_user_bde,
+            balance_positive_user_bde=balance_positive_user_bde,
+
+            total_zero_user=total_zero_user,
+
+            total_zero_user_bde=total_zero_user_bde,
+
+            total_negative_user=total_negative_user,
+            balance_negative_user=balance_negative_user,
+
+            total_negative_user_bde=total_negative_user_bde,
+            balance_negative_user_bde=balance_negative_user_bde,
+
+            total_vnegative_user=total_vnegative_user,
+            balance_vnegative_user=balance_vnegative_user,
+
+            total_vnegative_user_bde=total_vnegative_user_bde,
+            balance_vnegative_user_bde=balance_vnegative_user_bde,
+
+
+            total_positive_club=total_positive_club,
+            balance_positive_club=balance_positive_club,
+
+            total_positive_club_nbde=total_positive_club_nbde,
+            balance_positive_club_nbde=balance_positive_club_nbde,
+
+            total_zero_club=total_zero_club,
+
+            total_zero_club_nbde=total_zero_club_nbde,
+
+            total_negative_club=total_negative_club,
+            balance_negative_club=balance_negative_club,
+
+            total_negative_club_nbde=total_negative_club_nbde,
+            balance_negative_club_nbde=balance_negative_club_nbde,
+        )
+
+        balance_difference_user = (balance_positive_user - balance_negative_user) - (last_summary.balance_positive_user - last_summary.balance_negative_user)
+        balance_difference_club = (balance_positive_club - balance_negative_club) - (last_summary.balance_positive_club - last_summary.balance_negative_club)
+
+        plain_text = render_to_string("note/mails/summary_notes_report.txt", context=dict(summary=summary, balance_difference_user=balance_difference_user, balance_difference_club=balance_difference_club))
+        html = render_to_string("note/mails/summary_notes_report.html", context=dict(summary=summary, balance_difference_user=balance_difference_user, balance_difference_club=balance_difference_club))
+        send_mail("[Note Kfet] Récapitulatif de trésorerie", plain_text, "Note Kfet 2020 <notekfet2020@crans.org>",
+                  recipient_list=["respo-info.bde@lists.crans.org", "tresorerie.bde@lists.crans.org"],
+                  html_message=html)

shell/oauth2_latency

@@ -1,15 +0,0 @@
-#!/usr/bin/sh
-# Copyright (C) 2018-2025 by BDE ENS-Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# use this script for reduce latency with oauth2_provider (cf. https://gitlab.crans.org/bde/nk20/issues/134)
-
-# Tested with django-oauth2-toolkit version 3.0.1
-
-sed -i -e "s/get_all_scopes()/get_all_scopes(scopes=scopes)/g" /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/views/base.py
-
-sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=token_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/models.py
-
-sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=read_write_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/views/mixins.py
-
-sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=read_write_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/decorators.py

templates/scripts/food_report.html

@@ -1,51 +0,0 @@
-{% load i18n %}
-{% now "Y-m-d" as today %}
-<!DOCTYPE html>
-<html lang="fr">
-<head>
-    <meta charset="UTF-8">
-    <title>[Note Kfet] Liste de la bouffe</title>
-</head>
-<body>
-<table>
-<thead>
-<tr>
-    <th>Club</th>
-    <th>Nom</th>
-    <th>Date de péremption</th>
-    <th>DLC/DDM</th>
-    <th>Consigne pour les GCKs</th>
-</tr>
-</thead>
-<tbody>
-    {% for food in foods %}
-    {% if today > food.expiry_date|date:"Y-m-d" %}
-	    {% if food.date_type and food.date_type == "DLC" %}
-		<tr bgcolor="red">
-	    {% else %}
-	        <tr bgcolor="yellow">
-	    {% endif %}
-	{% else %}
-	    <tr>
-	{% endif %}
-            <td>{{ food.owner.name }}</td>
-            <td>{{ food.name }}</td>
-            <td>{{ food.expiry_date }}</td>
-	    {% if food.date_type %}
-	        <td>{{ food.date_type }}</td>
-	    {% else %}
-            	<td>--</td>
-	    {% endif %}
-            <td>{{ food.order }}</td>
-        </tr>
-    {% endfor %}
-</tbody>
-</table>
-
---
-<p>
-    Les GCKs du BDE<br>
-    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
-</p>
-</body>
-</html>

templates/scripts/food_report.txt

@@ -1,14 +0,0 @@
-{% load i18n %}
-
-   Propriétaire   |         Nom         |  Date de péremption  | DLC/DDM |        Consigne pour les GCKs        |
-------------------+---------------------+----------------------+---------+---------------------------------------
-{% for food in foods %}
-
-{{ food.owner.name }} | {{ food.name }} | {{ food.expiry_date }} | {% if food.date_type %}{{ food.date_type }}{% else %} -- {% endif %} | {{ food.order }}
-
-{% endfor %}
-
---
-Les GCKs du BDE
-
-{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}