Merge branch 'sortable_tables' into 'beta'

Sortable tables

See merge request bde/nk20!257

apps/activity/templates/activity/activity_form.html

@@ -23,19 +23,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <script>
   var date_end = document.getElementById("id_date_end");
   var date_start = document.getElementById("id_date_start");
-  
+
   function update_date_end (){
     if(date_end.value=="" || date_end.value<date_start.value){
       date_end.value = date_start.value;
     };
   };
-  
+
   function update_date_start (){
     if(date_start.value=="" || date_end.value<date_start.value){
       date_start.value = date_end.value;
     };
   };
-  
+
   date_start.addEventListener('focusout', update_date_end);
   date_end.addEventListener('focusout', update_date_start);
   

apps/activity/views.py

@@ -18,7 +18,7 @@ from django.views import View
 from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView, TemplateView, UpdateView
 from django.views.generic.list import ListView
-from django_tables2.views import MultiTableMixin
+from django_tables2.views import MultiTableMixin, SingleTableMixin
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
@@ -63,19 +63,15 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
     Displays all Activities, and classify if they are on-going or upcoming ones.
     """
     model = Activity
-    tables = [ActivityTable, ActivityTable]
+    tables = [
+        lambda data: ActivityTable(data, prefix="all-"),
+        lambda data: ActivityTable(data, prefix="upcoming-"),
+    ]
     extra_context = {"title": _("Activities")}
 
     def get_queryset(self, **kwargs):
         return super().get_queryset(**kwargs).distinct()
 
-    def get_tables(self):
-        tables = super().get_tables()
-
-        tables[0].prefix = "all-"
-        tables[1].prefix = "upcoming-"
-        return tables
-
     def get_tables_data(self):
         # first table = all activities, second table = upcoming
         return [
@@ -99,7 +95,7 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
         return context
 
 
-class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
     """
     Shows details about one activity. Add guest to context
     """
@@ -107,13 +103,16 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     context_object_name = "activity"
     extra_context = {"title": _("Activity detail")}
 
+    table_class = GuestTable
+    context_table_name = "guests"
+
+    def get_table_data(self):
+        return Guest.objects.filter(activity=self.object) \
+            .filter(PermissionBackend.filter_queryset(self.request, Guest, "view"))
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
 
-        table = GuestTable(data=Guest.objects.filter(activity=self.object)
-                           .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")))
-        context["guests"] = table
-
         context["activity_started"] = timezone.now() > timezone.localtime(self.object.date_start)
 
         return context
@@ -172,12 +171,14 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
-class ActivityEntryView(LoginRequiredMixin, TemplateView):
+class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
     """
     Manages entry to an activity
     """
     template_name = "activity/activity_entry.html"
 
+    table_class = EntryTable
+
     def dispatch(self, request, *args, **kwargs):
         """
         Don't display the entry interface if the user has no right to see it (no right to add an entry for itself),
@@ -266,15 +267,9 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
             if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
         return note_qs
 
-    def get_context_data(self, **kwargs):
-        """
-        Query the list of Guest and Note to the activity and add information to makes entry with JS.
-        """
-        context = super().get_context_data(**kwargs)
-
+    def get_table_data(self):
         activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
             .distinct().get(pk=self.kwargs["pk"])
-        context["activity"] = activity
 
         matched = []
 
@@ -287,8 +282,17 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
             note.activity = activity
             matched.append(note)
 
-        table = EntryTable(data=matched)
-        context["table"] = table
+        return matched
+
+    def get_context_data(self, **kwargs):
+        """
+        Query the list of Guest and Note to the activity and add information to makes entry with JS.
+        """
+        context = super().get_context_data(**kwargs)
+
+        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
+            .distinct().get(pk=self.kwargs["pk"])
+        context["activity"] = activity
 
         context["entries"] = Entry.objects.filter(activity=activity)
 
@@ -330,8 +334,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
+TZID:Europe/Paris
+X-LIC-LOCATION:Europe/Paris
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@@ -353,10 +357,10 @@ END:VTIMEZONE
 DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
 UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
 SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
-DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
+DTSTART:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_start)}
+DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
 LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + f"""
  -- {activity.organizer.name}
 END:VEVENT
 """

apps/member/migrations/0013_auto_20240807_1409.py

@@ -1,18 +0,0 @@
-# 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'),
-        ),
-    ]

apps/member/views.py

@@ -16,7 +16,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
-from django_tables2.views import SingleTableView
+from django_tables2.views import MultiTableMixin, SingleTableMixin, SingleTableView
 from rest_framework.authtoken.models import Token
 from note.models import Alias, NoteClub, NoteUser, Trust
 from note.models.transactions import Transaction, SpecialTransaction
@@ -165,7 +165,8 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         # Display only the most recent membership
         club_list = club_list.distinct("club__name")\
             if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_list
-        membership_table = MembershipTable(data=club_list, prefix='membership-')
+        club_list_order_by = self.request.GET.getlist("membership-sort", ("club__name", "-date_start"))
+        membership_table = MembershipTable(data=club_list, prefix='membership-', order_by=club_list_order_by)
         membership_table.paginate(per_page=10, page=self.request.GET.get("membership-page", 1))
         context['club_list'] = membership_table
 
@@ -243,7 +244,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         return context
 
 
-class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
     """
     View and manage user trust relationships
     """
@@ -252,13 +253,25 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     context_object_name = 'user_object'
     extra_context = {"title": _("Note friendships")}
 
+    tables = [
+        lambda data: TrustTable(data, prefix="trust-"),
+        lambda data: TrustedTable(data, prefix="trusted-"),
+    ]
+
+    def get_tables_data(self):
+        note = self.object.note
+        return [
+            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
+            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
+        ]
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        note = context['object'].note
-        context["trusting"] = TrustTable(
-            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
-        context["trusted_by"] = TrustedTable(
-            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
+
+        tables = context["tables"]
+        for name, table in zip(["trusting", "trusted_by"], tables):
+            context[name] = table
+
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
             trusting=context["object"].note,
             trusted=context["object"].note
@@ -277,7 +290,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         return context
 
 
-class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
     """
     View and manage user aliases.
     """
@@ -286,12 +299,15 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     context_object_name = 'user_object'
     extra_context = {"title": _("Note aliases")}
 
+    table_class = AliasTable
+    context_table_name = "aliases"
+
+    def get_table_data(self):
+        return self.object.note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct() \
+                                     .order_by('normalized_name')
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        note = context['object'].note
-        context["aliases"] = AliasTable(
-            note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
-            .order_by('normalized_name').all())
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
             note=context["object"].note,
             name="",
@@ -451,7 +467,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club",
                                              date_start__lte=date.today(), date_end__gte=date.today())\
             .order_by('user__last_name').all()
-        context["managers"] = ClubManagerTable(data=managers, prefix="managers-")
+        managers_order_by = self.request.GET.getlist("managers-sort", ('user__last_name'))
+        context["managers"] = ClubManagerTable(data=managers, prefix="managers-", order_by=managers_order_by)
         # transaction history
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
             .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view"))\
@@ -469,7 +486,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         club_member = club_member.distinct("user__username")\
             if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_member
 
-        membership_table = MembershipTable(data=club_member, prefix="membership-")
+        membership_order_by = self.request.GET.getlist("membership-sort", ("user__username", "-date_start"))
+        membership_table = MembershipTable(data=club_member, prefix="membership-", order_by=membership_order_by)
         membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
         context['member_list'] = membership_table
 
@@ -510,7 +528,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         return context
 
 
-class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
     """
     Manage aliases of a club.
     """
@@ -519,11 +537,16 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     context_object_name = 'club'
     extra_context = {"title": _("Note aliases")}
 
+    table_class = AliasTable
+    context_table_name = "aliases"
+
+    def get_table_data(self):
+        return self.object.note.alias.filter(
+            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        note = context['object'].note
-        context["aliases"] = AliasTable(note.alias.filter(
-            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct().all())
+
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
             note=context["object"].note,
             name="",

apps/note/templates/note/mails/summary_notes_report.html

@@ -1,65 +0,0 @@
-{% 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>

apps/note/templates/note/mails/summary_notes_report.txt

@@ -1,33 +0,0 @@
-{% 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" %}

apps/permission/views.py

@@ -12,6 +12,7 @@ from django.forms import HiddenInput
 from django.http import Http404
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import UpdateView, TemplateView, CreateView
+from django_tables2 import MultiTableMixin
 from member.models import Membership
 
 from .backends import PermissionBackend
@@ -107,10 +108,31 @@ class ProtectedCreateView(LoginRequiredMixin, CreateView):
         return super().dispatch(request, *args, **kwargs)
 
 
-class RightsView(TemplateView):
+class RightsView(MultiTableMixin, TemplateView):
     template_name = "permission/all_rights.html"
     extra_context = {"title": _("Rights")}
 
+    tables = [
+        lambda data: RightsTable(data, prefix="clubs-"),
+        lambda data: SuperuserTable(data, prefix="superusers-"),
+    ]
+
+    def get_tables_data(self):
+        special_memberships = Membership.objects.filter(
+            date_start__lte=date.today(),
+            date_end__gte=date.today(),
+        ).filter(roles__in=Role.objects.filter((~(Q(name="Adhérent BDE")
+                                                  | Q(name="Adhérent Kfet")
+                                                  | Q(name="Membre de club")
+                                                  | Q(name="Bureau de club"))
+                                                & Q(weirole__isnull=True))))\
+            .order_by("club__name", "user__last_name")\
+            .distinct().all()
+        return [
+            special_memberships,
+            User.objects.filter(is_superuser=True).order_by("last_name"),
+        ]
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
@@ -128,19 +150,9 @@ class RightsView(TemplateView):
             role.clubs = [membership.club for membership in active_memberships if role in membership.roles.all()]
 
         if self.request.user.is_authenticated:
-            special_memberships = Membership.objects.filter(
-                date_start__lte=date.today(),
-                date_end__gte=date.today(),
-            ).filter(roles__in=Role.objects.filter((~(Q(name="Adhérent BDE")
-                                                      | Q(name="Adhérent Kfet")
-                                                      | Q(name="Membre de club")
-                                                      | Q(name="Bureau de club"))
-                                                    & Q(weirole__isnull=True))))\
-                .order_by("club__name", "user__last_name")\
-                .distinct().all()
-            context["special_memberships_table"] = RightsTable(special_memberships, prefix="clubs-")
-            context["superusers"] = SuperuserTable(User.objects.filter(is_superuser=True).order_by("last_name").all(),
-                                                   prefix="superusers-")
+            tables = context["tables"]
+            for name, table in zip(["special_memberships_table", "superusers"], tables):
+                context[name] = table
 
         return context
 

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 Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit
+from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
 
 
 @admin.register(RemittanceType, site=admin_site)
 class RemittanceTypeAdmin(admin.ModelAdmin):
     """
-    Admin customisation for RemittanceType
+    Admin customisation for RemiitanceType
     """
     list_display = ('note', )
 
@@ -55,19 +55,3 @@ 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',
-    )

apps/treasury/migrations/0009_notesummary.py

@@ -1,49 +0,0 @@
-# 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',
-            },
-        ),
-    ]

apps/treasury/models.py

@@ -460,117 +460,3 @@ 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)

apps/treasury/views.py

@@ -19,7 +19,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import UpdateView, DetailView
 from django.views.generic.base import View, TemplateView
 from django.views.generic.edit import BaseFormView, DeleteView
-from django_tables2 import SingleTableView
+from django_tables2 import MultiTableMixin, SingleTableMixin, SingleTableView
 from note.models import SpecialTransaction, NoteSpecial, Alias
 from note_kfet.settings.base import BASE_DIR
 from permission.backends import PermissionBackend
@@ -251,21 +251,26 @@ class RemittanceCreateView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context["table"] = RemittanceTable(
-            data=Remittance.objects.filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all())
         context["special_transactions"] = SpecialTransactionTable(data=SpecialTransaction.objects.none())
 
         return context
 
 
-class RemittanceListView(LoginRequiredMixin, TemplateView):
+class RemittanceListView(LoginRequiredMixin, MultiTableMixin, TemplateView):
     """
     List existing Remittances
     """
     template_name = "treasury/remittance_list.html"
     extra_context = {"title": _("Remittances list")}
 
+    tables = [
+        lambda data: RemittanceTable(data, prefix="opened-remittances-"),
+        lambda data: RemittanceTable(data, prefix="closed-remittances-"),
+        lambda data: SpecialTransactionTable(data, prefix="no-remittance-", exclude=('remittance_remove', )),
+        lambda data: SpecialTransactionTable(data, prefix="with-remittance-", exclude=('remittance_add', )),
+    ]
+    paginate_by = 10     # number of rows in tables
+
     def dispatch(self, request, *args, **kwargs):
         # Check that the user is authenticated
         if not request.user.is_authenticated:
@@ -275,49 +280,37 @@ class RemittanceListView(LoginRequiredMixin, TemplateView):
             raise PermissionDenied(_("You are not able to see the treasury interface."))
         return super().dispatch(request, *args, **kwargs)
 
+    def get_tables_data(self):
+        return [
+            Remittance.objects.filter(closed=False).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
+            Remittance.objects.filter(closed=True).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
+            SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
+                                              specialtransactionproxy__remittance=None).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
+            SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
+                                              specialtransactionproxy__remittance__closed=False).filter(
+                PermissionBackend.filter_queryset(self.request, Remittance, "view")),
+        ]
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        opened_remittances = RemittanceTable(
-            data=Remittance.objects.filter(closed=False).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
-            prefix="opened-remittances-",
-        )
-        opened_remittances.paginate(page=self.request.GET.get("opened-remittances-page", 1), per_page=10)
-        context["opened_remittances"] = opened_remittances
-
-        closed_remittances = RemittanceTable(
-            data=Remittance.objects.filter(closed=True).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
-            prefix="closed-remittances-",
-        )
-        closed_remittances.paginate(page=self.request.GET.get("closed-remittances-page", 1), per_page=10)
-        context["closed_remittances"] = closed_remittances
-
-        no_remittance_tr = SpecialTransactionTable(
-            data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
-                                                   specialtransactionproxy__remittance=None).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
-            exclude=('remittance_remove', ),
-            prefix="no-remittance-",
-        )
-        no_remittance_tr.paginate(page=self.request.GET.get("no-remittance-page", 1), per_page=10)
-        context["special_transactions_no_remittance"] = no_remittance_tr
-
-        with_remittance_tr = SpecialTransactionTable(
-            data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
-                                                   specialtransactionproxy__remittance__closed=False).filter(
-                PermissionBackend.filter_queryset(self.request, Remittance, "view")).all(),
-            exclude=('remittance_add', ),
-            prefix="with-remittance-",
-        )
-        with_remittance_tr.paginate(page=self.request.GET.get("with-remittance-page", 1), per_page=10)
-        context["special_transactions_with_remittance"] = with_remittance_tr
+        tables = context["tables"]
+        names = [
+            "opened_remittances",
+            "closed_remittances",
+            "special_transactions_no_remittance",
+            "special_transactions_with_remittance",
+        ]
+        for name, table in zip(names, tables):
+            context[name] = table
 
         return context
 
 
-class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, UpdateView):
     """
     Update Remittance
     """
@@ -325,19 +318,18 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView)
     form_class = RemittanceForm
     extra_context = {"title": _("Update a remittance")}
 
+    table_class = SpecialTransactionTable
+    context_table_name = "special_transactions"
+
     def get_success_url(self):
         return reverse_lazy('treasury:remittance_list')
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
+    def get_table_data(self):
+        return SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter(
+            PermissionBackend.filter_queryset(self.request, Remittance, "view"))
 
-        data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter(
-            PermissionBackend.filter_queryset(self.request, Remittance, "view")).all()
-        context["special_transactions"] = SpecialTransactionTable(
-            data=data,
-            exclude=('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', ))
-
-        return context
+    def get_table_kwargs(self):
+        return {"exclude": ('remittance_add', 'remittance_remove', ) if self.object.closed else ('remittance_add', )}
 
 
 class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):

apps/wei/views.py

@@ -22,7 +22,7 @@ from django.views import View
 from django.views.generic import DetailView, UpdateView, RedirectView, TemplateView
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.edit import BaseFormView, DeleteView
-from django_tables2 import SingleTableView
+from django_tables2 import SingleTableView, MultiTableMixin
 from member.models import Membership, Club
 from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
 from note.tables import HistoryTable
@@ -100,7 +100,7 @@ class WEICreateView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.pk})
 
 
-class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
     """
     View WEI information
     """
@@ -108,34 +108,40 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     context_object_name = "club"
     extra_context = {"title": _("WEI Detail")}
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        club = context["club"]
+    tables = [
+        lambda data: HistoryTable(data, prefix="history-"),
+        lambda data: WEIMembershipTable(data, prefix="membership-"),
+        lambda data: WEIRegistrationTable(data, prefix="pre-registration-"),
+        lambda data: BusTable(data, prefix="bus-"),
+    ]
+    paginate_by = 20   # number of rows in tables
 
+    def get_tables_data(self):
+        club = self.object
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note)) \
             .filter(PermissionBackend.filter_queryset(self.request, Transaction, "view")) \
             .order_by('-created_at', '-id')
-        history_table = HistoryTable(club_transactions, prefix="history-")
-        history_table.paginate(per_page=20, page=self.request.GET.get('history-page', 1))
-        context['history_list'] = history_table
-
         club_member = WEIMembership.objects.filter(
             club=club,
             date_end__gte=date.today(),
         ).filter(PermissionBackend.filter_queryset(self.request, WEIMembership, "view"))
-        membership_table = WEIMembershipTable(data=club_member, prefix="membership-")
-        membership_table.paginate(per_page=20, page=self.request.GET.get('membership-page', 1))
-        context['member_list'] = membership_table
-
         pre_registrations = WEIRegistration.objects.filter(
             PermissionBackend.filter_queryset(self.request, WEIRegistration, "view")).filter(
             membership=None,
             wei=club
         )
-        pre_registrations_table = WEIRegistrationTable(data=pre_registrations, prefix="pre-registration-")
-        pre_registrations_table.paginate(per_page=20, page=self.request.GET.get('pre-registration-page', 1))
-        context['pre_registrations'] = pre_registrations_table
+        buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
+            .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
+        return [club_transactions, club_member, pre_registrations, buses, ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        club = context["club"]
+
+        tables = context["tables"]
+        for name, table in zip(["history_list", "member_list", "pre_registrations", "buses"], tables):
+            context[name] = table
 
         my_registration = WEIRegistration.objects.filter(wei=club, user=self.request.user)
         if my_registration.exists():
@@ -144,11 +150,6 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
             my_registration = None
         context["my_registration"] = my_registration
 
-        buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
-            .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
-        bus_table = BusTable(data=buses, prefix="bus-")
-        context['buses'] = bus_table
-
         random_user = User.objects.filter(~Q(wei__wei__in=[club])).first()
 
         if random_user is None:

locale/fr/LC_MESSAGES/django.po

@@ -1701,8 +1701,6 @@ 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
@@ -2264,7 +2262,6 @@ msgid "Address"
 msgstr "Adresse"
 
 #: apps/treasury/models.py:69 apps/treasury/models.py:202
-#: apps/treasury/models.py:472
 msgid "Date"
 msgstr "Date"
 
@@ -2383,102 +2380,6 @@ msgstr ""
 "Cet·te utilisateur·ice n'a pas assez d'argent pour payer les adhésions avec 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}"

note.cron

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

tox.ini

@@ -51,4 +51,4 @@ max-complexity = 15
 max-line-length = 160
 import-order-style = google
 application-import-names = flake8
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
+format = %(cyan)s%(path)s%(reset)s:%(yellow)s%(bold)s%(row)d%(reset)s:%(green)s%(bold)s%(col)d%(reset)s: %(red)s%(bold)s%(code)s%(reset)s %(text)s