Merge branch 'remove_picture' into 'main'

Allow you to delete the profile picture See merge request bde/nk20!250
2025-06-21 18:08:21 +02:00 · 2024-07-18 17:52:26 +02:00
11 changed files with 22 additions and 432 deletions
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -17,8 +17,7 @@ from django.utils.translation import gettext_lazy as _
 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 SingleTableView
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
@ -58,40 +57,27 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
        return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk})


-class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
    """
    Displays all Activities, and classify if they are on-going or upcoming ones.
    """
    model = Activity
-    tables = [ActivityTable, ActivityTable]
+    table_class = ActivityTable
+    ordering = ('-date_start',)
    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 [
-            self.get_queryset().order_by("-date_start"),
-            Activity.objects.filter(date_end__gt=timezone.now())
-                            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
-                            .distinct()
-                            .order_by("date_start")
-        ]
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)

-        tables = context["tables"]
-        for name, table in zip(["table", "upcoming"], tables):
-            context[name] = table
+        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
+        context['upcoming'] = ActivityTable(
+            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")),
+            prefix='upcoming-',
+            order_by='date_start',
+        )

        started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
        context["started_activities"] = started_activities
--- a/apps/member/migrations/0013_auto_20240807_1409.py
+++ b/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'),
-        ),
-    ]
--- a/apps/note/templates/note/mails/summary_notes_report.html
+++ b/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>
--- a/apps/note/templates/note/mails/summary_notes_report.txt
+++ b/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" %}
--- a/apps/scripts
+++ b/apps/scripts
--- 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 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',
-    )
--- a/apps/treasury/migrations/0009_notesummary.py
+++ b/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',
-            },
-        ),
-    ]
--- a/apps/treasury/models.py
+++ b/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)
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -401,37 +401,37 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

-#: apps/activity/views.py:68 note_kfet/templates/base.html:90
+#: apps/activity/views.py:67 note_kfet/templates/base.html:90
 msgid "Activities"
 msgstr "Activités"

-#: apps/activity/views.py:108
+#: apps/activity/views.py:93
 msgid "Activity detail"
 msgstr "Détails de l'activité"

-#: apps/activity/views.py:128
+#: apps/activity/views.py:113
 msgid "Update activity"
 msgstr "Modifier l'activité"

-#: apps/activity/views.py:155
+#: apps/activity/views.py:140
 msgid "Invite guest to the activity \"{}\""
 msgstr "Invitation pour l'activité « {} »"

-#: apps/activity/views.py:193
+#: apps/activity/views.py:178
 msgid "You are not allowed to display the entry interface for this activity."
 msgstr ""
 "Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
 "activité."

-#: apps/activity/views.py:196
+#: apps/activity/views.py:181
 msgid "This activity does not support activity entries."
 msgstr "Cette activité ne requiert pas d'entrées."

-#: apps/activity/views.py:199
+#: apps/activity/views.py:184
 msgid "This activity is closed."
 msgstr "Cette activité est fermée."

-#: apps/activity/views.py:295
+#: apps/activity/views.py:280
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"

@ -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}"
--- a/note.cron
+++ b/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