Update file initial.json

apps/activity/templates/activity/activity_entry.html

@@ -38,7 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </a>
 
 <input id="alias" type="text" class="form-control" placeholder="Nom/note ...">
-<button id="trigger" class="btn btn-secondary">Click me !</button>
 
 <hr>
 
@@ -64,46 +63,15 @@ SPDX-License-Identifier: GPL-3.0-or-later
         refreshBalance();
     }
 
-    function process_qrcode() {
-        let name = alias_obj.val();
-        $.get("/api/note/note?search=" + name + "&format=json").done(
-            function (res) {
-                let note = res.results[0];
-                $.post("/api/activity/entry/?format=json", {
-                    csrfmiddlewaretoken: CSRF_TOKEN,
-                    activity: {{ activity.id }},
-                    note: note.id,
-                    guest: null
-                }).done(function () {
-                    addMsg(interpolate(gettext(
-                        "Entry made for %s whose balance is %s €"),
-                        [note.name, note.balance / 100]), "success", 4000);
-                    reloadTable(true);
-                }).fail(function (xhr) {
-                    errMsg(xhr.responseJSON, 4000);
-                });
-            }).fail(function (xhr) {
-                errMsg(xhr.responseJSON, 4000);
-            });
-    }
-
     alias_obj.keyup(function(event) {
         let code = event.originalEvent.keyCode
         if (65 <= code <= 122 || code === 13) {
             debounce(reloadTable)()
         }
-        if (code === 0)
-            process_qrcode();
     });
 
     $(document).ready(init);
 
-    alias_obj2 = document.getElementById("alias");
-    $("#trigger").click(function (e) {
-        addMsg("Clicked", "success", 1000);
-        alias_obj.val(alias_obj.val() + "\0");
-        alias_obj2.dispatchEvent(new KeyboardEvent('keyup'));
-    })
     function init() {
         $(".table-row").click(function (e) {
             let target = e.target.parentElement;
@@ -200,4 +168,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         });
     }
 </script>
-{% endblock %}
+{% endblock %}

apps/member/templates/member/includes/profile_info.html

@@ -60,10 +60,7 @@
 {% if user_object.pk == user.pk %}
     <div class="text-center">
         <a class="small badge badge-secondary" href="{% url 'member:auth_token' %}">
-            <i class="fa fa-cogs"></i>&nbsp;{% trans 'API token' %}
+            <i class="fa fa-cogs"></i>{% trans 'API token' %}
-        </a>
-        <a class="small badge badge-secondary" href="{% url 'member:qr_code' user_object.pk %}">
-            <i class="fa fa-qrcode"></i>&nbsp;{% trans 'QR Code' %}
         </a>
     </div>
 {% endif %}

apps/member/templates/member/qr_code.html

@@ -1,36 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-  	<h3 class="card-header text-center">
-		{% trans "QR Code for" %} {{ user_object.username }} ({{ user_object.first_name }} {{user_object.last_name }})
-  	</h3>
-  	<div class="text-center" id="qrcode">
-  	</div>
-</div>
-
-
-{% endblock %}
-
-{% block extrajavascript %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js" integrity="sha512-CNgIRecGo7nphbeZ04Sc13ka07paqdeTu0WR1IM4kNcpmBAUSHSQX0FslNhTDadL4O5SAGapGt4FodqL8My0mA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-	var qrc = new QRCode(document.getElementById("qrcode"), {
-		text: "{{ user_object.pk }}\0",
-		width: 1024,
-		height: 1024
-	});
-</script>
-{% endblock %}
-
-{% block extracss %}
-<style>
-img {
-    width: 100%
-}
-</style>
-{% endblock %}

apps/member/urls.py

@@ -25,5 +25,4 @@ urlpatterns = [
     path('user/<int:pk>/aliases/', views.ProfileAliasView.as_view(), name="user_alias"),
     path('user/<int:pk>/trust', views.ProfileTrustView.as_view(), name="user_trust"),
     path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
-    path('user/<int:pk>/qr_code/', views.QRCodeView.as_view(), name='qr_code'),
 ]

apps/member/views.py

@@ -402,14 +402,6 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
         context['token'] = Token.objects.get_or_create(user=self.request.user)[0]
         return context
 
-class QRCodeView(LoginRequiredMixin, DetailView):
-    """
-    Affiche le QR Code
-    """
-    model = User
-    context_object_name = "user_object"
-    template_name = "member/qr_code.html"
-    extra_context = {"title": _("QR Code")}
 
 # ******************************* #
 #              CLUB               #

apps/note/static/note/js/consos.js

@@ -294,10 +294,3 @@ searchbar.addEventListener("keyup", function (e) {
   if (firstMatch && e.key === "Enter")
     firstMatch.click()
 });
-
-function createshiny() {
-  const list_btn = document.querySelectorAll('.btn-outline-dark')
-  const shiny_class = list_btn[Math.floor(Math.random() * list_btn.length)].classList
-  shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny')
-}
-createshiny()

apps/permission/fixtures/initial.json

@@ -324,7 +324,7 @@
             "mask": 2,
             "field": "",
             "permanent": false,
-            "description": "Créer une transaction de ou vers la note d'un club"
+            "description": "Créer une transaction de ou vers la note d'un club tant que la source reste au dessus de -20 €"
         }
     },
     {
@@ -3815,7 +3815,7 @@
             "mask": 2,
             "field": "",
             "permanent": false,
-            "description": "Créer une transaction vers la note d'un club"
+            "description": "Créer une transaction vers la note d'un club tant que la source reste au dessus de -20 €"
         }
     },
     {
@@ -4186,6 +4186,86 @@
             "description": "Voir la note d'un club enfant"
         }
     },
+    {
+        "model": "permission.permission",
+        "pk": 266,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les transactions de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 267,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "change",
+            "mask": 2,
+            "field": "valid",
+            "permanent": false,
+            "description": "Mettre à jour le statut de validation d'une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 268,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "change",
+            "mask": 2,
+            "field": "invalidity_reason",
+            "permanent": false,
+            "description": "Modifier la raison d'invalidité d'une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 269,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 270,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction de ou vers la note d'un club tant que la source reste au dessus de -50 €"
+        }
+    },
     {
         "model": "permission.role",
         "pk": 1,

apps/wrapped/templates/wrapped/1/wrapped_view_club.html

@@ -23,9 +23,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 		let d1 = document.getElementById("consumer");
 		let d2 = document.getElementById("creditor");
 		if (con) { d1.textContent = {{ big_consumer | safe }}[0] + " " + gettext("with") + " " + {{ big_consumer | safe}}[1] + "€";}
-		else { d1.textContent = gettext("{% trans "Infortunately, you doesn't have consumer this year" %}");};
+		else { d1.textContent = gettext("Infortunately, you doesn't have consumer this year");};
 		if (cre) { d2.textContent = {{ big_creancier | safe}}[0] + " " + gettext("with") + " " + {{ big_creancier | safe}}[1] + "€";}
-		else { d2.textContent = gettext("{% trans "Congratulations you are a real rat !" %}"); };
+		else { d2.textContent = gettext("Congratulations you are a real rat !"); };
 
 	</script>
 {% endblock %}

apps/wrapped/templates/wrapped/wrapped_list.html

@@ -6,24 +6,17 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n %}
 
 {% block content %}
-<div id="wrapped_tables">
+<div class="row justify-content-center">   
-{% if tables|length > 0 %}
+    <div class="col-md-10">
-<div class="card bg-light mb-3">
+        <div class="card card-border shadow">
-    <h3 class="card-header text-center">
+            <div class="card-header text-center">
-        {% trans "My wrapped" %}
+		    <h5> {{ title }}</h5>
-    </h3>
+            </div>
-    {% render_table tables.1 %}
+            <div class="card-body px-0 py-0" id="wrapped_table">
-</div>
+                {% render_table table %}
-{% endif %}
+            </div>
-
+        </div>
-{% if tables|length > 0 %}
+    </div>
-<div class="card bg-light mb-3">
-    <h3 class="card-header text-center">
-        {% trans "Public wrapped" %}
-    </h3>
-    {% render_table tables.0 %}
-</div>
-{% endif %}
 </div>
 {% endblock %}
 
@@ -32,7 +25,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 	let club_not_public = {{ club_not_public }};
 	if (club_not_public) { (addMsg("{% trans "Do not forget to ask permission to people who are in your wrapped before to make them public" %}", 'warning'));}
    function refreshTable() {
-	$("#wrapped_tables").load(location.pathname + " #wrapped_tables");
+	$("#wrapped_table").load(location.pathname + " #wrapped_table");
    }
 
    function copylink(id) {

apps/wrapped/views.py

@@ -6,8 +6,7 @@ import json
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView
-from django.views.generic.list import ListView
+from django_tables2.views import SingleTableView
-from django_tables2.views import MultiTableMixin
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin
 
@@ -15,29 +14,21 @@ from .models import Wrapped
 from .tables import WrappedTable
 
 
-class WrappedListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class WrappedListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     """
     Display all Wrapped, and classify by year
     """
     model = Wrapped
-    tables = [
+    table_class = WrappedTable
-        lambda data: WrappedTable(data, prefix="public-"),
-        lambda data: WrappedTable(data, prefix="personnal-"),
-    ]
     template_name = 'wrapped/wrapped_list.html'
     extra_context = {'title': _("List of wrapped")}
 
     def get_queryset(self, **kwargs):
         return super().get_queryset(**kwargs).distinct()
 
-    def get_tables_data(self):
+    def get_table_data(self):
-        return [
+        return Wrapped.objects.filter(PermissionBackend.filter_queryset(
-            Wrapped.objects.filter(public=True),
+            self.request, Wrapped, "change", field='public')).distinct().order_by("-bde__date_start")
-            Wrapped.objects
-            .filter(PermissionBackend.filter_queryset(self.request, Wrapped, "change", field='public'))
-            .distinct()
-            .order_by("-bde__date_start")
-        ]
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

docs/_static/img/graphs/wrapped.svg

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: model_graph Pages: 1 -->
-<svg width="319pt" height="245pt"
- viewBox="0.00 0.00 319.00 245.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 241)">
-<title>model_graph</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-241 315,-241 315,4 -4,4"/>
-<!-- wrapped_models_Bde -->
-<g id="node1" class="node">
-<title>wrapped_models_Bde</title>
-<polygon fill="white" stroke="transparent" points="8,-4 8,-79 158,-79 158,-4 8,-4"/>
-<polygon fill="#1b563f" stroke="transparent" points="9,-56.5 9,-77.5 157,-77.5 157,-56.5 9,-56.5"/>
-<text text-anchor="start" x="52" y="-65.5" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="62" y="-65.5" font-family="Roboto" font-weight="bold" font-size="10.00" fill="white"> &#160;&#160;&#160;Bde &#160;&#160;&#160;</text>
-<text text-anchor="start" x="11" y="-49.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="21" y="-49.1" font-family="Roboto" font-weight="bold" font-size="8.00">id</text>
-<text text-anchor="start" x="31" y="-49.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="77" y="-49.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="87" y="-49.1" font-family="Roboto" font-weight="bold" font-size="8.00">AutoField</text>
-<text text-anchor="start" x="131" y="-49.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="11" y="-36.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="21" y="-36.1" font-family="Roboto" font-size="8.00">date_end</text>
-<text text-anchor="start" x="60" y="-36.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="77" y="-36.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="87" y="-36.1" font-family="Roboto" font-size="8.00">DateTimeField</text>
-<text text-anchor="start" x="145" y="-36.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="11" y="-23.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="21" y="-23.1" font-family="Roboto" font-size="8.00">date_start</text>
-<text text-anchor="start" x="63" y="-23.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="77" y="-23.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="87" y="-23.1" font-family="Roboto" font-size="8.00">DateTimeField</text>
-<text text-anchor="start" x="145" y="-23.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="11" y="-10.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="21" y="-10.1" font-family="Roboto" font-size="8.00">name</text>
-<text text-anchor="start" x="45" y="-10.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="77" y="-10.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="87" y="-10.1" font-family="Roboto" font-size="8.00">CharField</text>
-<text text-anchor="start" x="125" y="-10.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<polygon fill="none" stroke="black" points="8,-4 8,-79 158,-79 158,-4 8,-4"/>
-</g>
-<!-- wrapped_models_Wrapped -->
-<g id="node2" class="node">
-<title>wrapped_models_Wrapped</title>
-<polygon fill="white" stroke="transparent" points="67,-132 67,-233 231,-233 231,-132 67,-132"/>
-<polygon fill="#1b563f" stroke="transparent" points="68,-210.5 68,-231.5 230,-231.5 230,-210.5 68,-210.5"/>
-<text text-anchor="start" x="103" y="-219.5" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="113" y="-219.5" font-family="Roboto" font-weight="bold" font-size="10.00" fill="white"> &#160;&#160;&#160;Wrapped &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-203.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-203.1" font-family="Roboto" font-weight="bold" font-size="8.00">id</text>
-<text text-anchor="start" x="90" y="-203.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-203.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-203.1" font-family="Roboto" font-weight="bold" font-size="8.00">AutoField</text>
-<text text-anchor="start" x="191" y="-203.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-190.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-190.1" font-family="Roboto" font-weight="bold" font-size="8.00">bde</text>
-<text text-anchor="start" x="98" y="-190.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-190.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-190.1" font-family="Roboto" font-weight="bold" font-size="8.00">ForeignKey (id)</text>
-<text text-anchor="start" x="218" y="-190.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-177.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-177.1" font-family="Roboto" font-weight="bold" font-size="8.00">note</text>
-<text text-anchor="start" x="101" y="-177.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-177.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-177.1" font-family="Roboto" font-weight="bold" font-size="8.00">ForeignKey (id)</text>
-<text text-anchor="start" x="218" y="-177.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-164.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-164.1" font-family="Roboto" font-size="8.00">data_json</text>
-<text text-anchor="start" x="120" y="-164.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-164.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-164.1" font-family="Roboto" font-size="8.00">TextField</text>
-<text text-anchor="start" x="182" y="-164.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-151.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-151.1" font-family="Roboto" font-size="8.00">generated</text>
-<text text-anchor="start" x="123" y="-151.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-151.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-151.1" font-family="Roboto" font-size="8.00">BooleanField</text>
-<text text-anchor="start" x="200" y="-151.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="70" y="-138.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="80" y="-138.1" font-family="Roboto" font-size="8.00">public</text>
-<text text-anchor="start" x="105" y="-138.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="137" y="-138.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<text text-anchor="start" x="147" y="-138.1" font-family="Roboto" font-size="8.00">BooleanField</text>
-<text text-anchor="start" x="200" y="-138.1" font-family="Roboto" font-size="8.00"> &#160;&#160;&#160;</text>
-<polygon fill="none" stroke="black" points="67,-132 67,-233 231,-233 231,-132 67,-132"/>
-</g>
-<!-- wrapped_models_Wrapped&#45;&gt;wrapped_models_Bde -->
-<g id="edge1" class="edge">
-<title>wrapped_models_Wrapped&#45;&gt;wrapped_models_Bde</title>
-<path fill="none" stroke="black" d="M119.99,-120.4C114,-107.79 107.84,-94.82 102.31,-83.16"/>
-<ellipse fill="black" stroke="black" cx="121.77" cy="-124.15" rx="4" ry="4"/>
-<text text-anchor="middle" x="132" y="-103.6" font-family="Roboto" font-size="8.00"> bde (+)</text>
-</g>
-<!-- note_models_notes_Note -->
-<g id="node3" class="node">
-<title>note_models_notes_Note</title>
-<polygon fill="white" stroke="transparent" points="192,-31 192,-52 240,-52 240,-31 192,-31"/>
-<polygon fill="#1b563f" stroke="transparent" points="192,-30.5 192,-51.5 240,-51.5 240,-30.5 192,-30.5"/>
-<text text-anchor="start" x="196.5" y="-38.9" font-family="Roboto" font-size="8.00"> &#160;</text>
-<text text-anchor="start" x="201.5" y="-38.9" font-family="Roboto" font-size="12.00" fill="white">Note</text>
-<text text-anchor="start" x="230.5" y="-38.9" font-family="Roboto" font-size="8.00"> &#160;</text>
-</g>
-<!-- wrapped_models_Wrapped&#45;&gt;note_models_notes_Note -->
-<g id="edge2" class="edge">
-<title>wrapped_models_Wrapped&#45;&gt;note_models_notes_Note</title>
-<path fill="none" stroke="black" d="M178.48,-120.33C189.12,-98.27 200.3,-75.07 207.66,-59.8"/>
-<ellipse fill="black" stroke="black" cx="176.64" cy="-124.16" rx="4" ry="4"/>
-<text text-anchor="middle" x="204.5" y="-103.6" font-family="Roboto" font-size="8.00"> note (+)</text>
-</g>
-<!-- \n\n\n -->
-<g id="node4" class="node">
-<title>\n\n\n</title>
-</g>
-</g>
-</svg>

docs/apps/index.rst

@@ -14,7 +14,6 @@ Applications de la Note Kfet 2020
    logs
    treasury
    wei
-   wrapped
 
 La Note Kfet 2020 est un projet Django, décomposé en applications.
 Certaines applications sont développées uniquement pour ce projet, et sont indispensables,
@@ -70,6 +69,4 @@ Applications facultatives
     Interface de gestion pour les trésorièr⋅es, émission de factures, remises de chèque, statistiques...
 * `WEI <wei>`_ :
     Interface de gestion du WEI.
-* `Wrapped <wrapped>`_ :
-    Récapitulatif personnalisé annuel de statitiques globales et personnelles.
 

docs/apps/wrapped.rst

@@ -1,108 +0,0 @@
-Wrapped
-=======
-
-Cette application montre les statistiques annuelles des utilisateur·ice·s et/ou des clubs.
-
-Modèles
--------
-
-Bde
-~~~
-
-Le modèle ``Bde`` contient des informations relatifs à un BDE :
-
-* ``name`` : ``CharField``, nom du BDE.
-* ``date_start`` : ``DateField``, date de prise de fonction du bureau BDE considéré.
-* ``date_end`` : ``DateField``, date de démission du bureau BDE considéré.
-
-Wrapped
-~~~~~~~
-
-Contient les informations sur un wrapped :
-
-* ``generated`` : ``BooleanField``, indique si le wrapped a été généré ou non.
-* ``public`` : ``BooleanField``, indique si le wrapped est visible de tous les utilisateur·ice·s ou non.
-* ``bde`` : ``ForeignKey(Bde)``, BDE auquel le wrapped correspond.
-* ``note`` : ``ForeignKey(Note)``, note à laquelle le wrapped correspond.
-* ``data_json`` : ``TextField``, diverses statistique concernant les notes durant le mandat BDE
-  considéré ou sur la NoteKfet dans sa globalité.
-
-Graphe des modèles
-~~~~~~~~~~~~~~~~~~
-
-.. image:: ../_static/img/graphs/wrapped.svg
-   :width: 960
-   :alt: Graphe des modèles de l'application Wrapped
-
-Fonctionnement
---------------
-
-Création d'un BDE
-~~~~~~~~~~~~~~~~~
-
-Seul un⋅e respo info peut créer un BDE. Pour cela, se rendre dans l'onglet « Admin »., puis « BDE » et
-enfin « + Ajouter BDE ». Iel doit renseigner, les dates de début et de fin du bureau BDE ainsi que le
-nom de la liste.
-
-Génération des wrappeds
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Seul un·e respo info peut générer des wrappeds. Pour une utilisation annuelle classique, iel exécute la
-commande :
-
-``./manage.py generate_wrapped -b "bde_name" -u adh -c active``
-
-Pour une utilisation plus technique de cette commande se référer à sa documentation
-
-``./manage.py help generate_wrapped``
-
-Le script prend une dizaine de minutes pour générer tous les wrappeds.
-
-Créer ses propres wrappeds
---------------------------
-
-Cette section est plus technique et s'addresse plutôt à des respos infos en cours de mandat qui voudrai
-faire les wrappeds de leur propre BDE.
-
-Contenu
-~~~~~~~
-
-Il est fortement conseillé de bien réfléchir à ce que l'on souhaite mettre sur un wrapped, plusieurs
-critères sont à prendre compte :
-
-* compréhension, est-ce que la donnée fait sens auprès des utilisateur·ice·s.
-* pertinence, est-ce que la donnée fonctionne pour un grand nombre d'utilisateur.
-* faisabilité, est-ce que le temps de calcul est suffisament rapide.
-* complexité, est-ce que c'est trop compliqué à coder.
-
-Script
-~~~~~~
-
-Le script *generate_wrapped* fonctionne de la manière suivante :
-
-* ``convert_to_note`` : en fonction des arguments d'entrée, il récupére toutes les notes dont le·s
-  wrapped·s va/vont être généré·s
-  ou regénéré·s.
-* ``global_data`` : le script génére ensuite des statistiques globales qui concernent pas qu'une seule
- note (nombre de soirée, classement, etc). 
-* ``unique_data`` : le script génére les statitiques uniques à chaque note, et rajoute des données
-  globales si nécessaire, pour chaque note on souhaite avoir un json avec toutes les données qui
-  seront dans le wrapped.
-* ``make_wrapped`` : enfin, le cas échéant, pour chaque bde, et pour chaque note, le wrapped est crée
-  ou modifié, et enregistré, s'il est crée il est par défault non public.
-
-Seules les fonctions ``global_data`` et ``unique_data`` sont à modifier, pour implementer un nouveau
-BDE.
-
-Template
-~~~~~~~~
-
-Il y a au moins deux templates a écrire pour chaque bde :
-
-* ``templates/wrapped/{bde_id}/wrapped_view_club.html``: le template pour les wrappeds des clubs
-* ``templates/wrapped/{bde_id}/wrapped_view_user.html``: le template pour les wrappeds des
-  utilisateur·ice·s
-
-Il est conseillé de suivre la même arborescence pour les fichiers statics (fonts personnalisées,
-images, css, etc). De même, il est conseillé de créé un fichier
-``templates/wrapped/{bde_id}/wrapped_base.html`` et d'étendre cette template.

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-13 21:08+0100\n"
+"POT-Creation-Date: 2025-02-25 13:47+0100\n"
 "PO-Revision-Date: 2022-04-11 22:05+0200\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
@@ -865,7 +865,7 @@ msgstr "Taille maximale : 2 Mo"
 msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."
 
-#: apps/member/forms.py:154 apps/member/views.py:117
+#: apps/member/forms.py:154 apps/member/views.py:103
 #: apps/registration/forms.py:33 apps/registration/views.py:282
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
@@ -1194,11 +1194,11 @@ msgstr "Adhésion de {user} pour le club {club}"
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:388 apps/member/views.py:759
+#: apps/member/models.py:388 apps/member/views.py:745
 msgid "User is already a member of the club"
 msgstr "L'utilisateur·rice est déjà membre du club"
 
-#: apps/member/models.py:400 apps/member/views.py:768
+#: apps/member/models.py:400 apps/member/views.py:754
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur·rice n'est pas membre du club parent"
 
@@ -1251,7 +1251,7 @@ msgid "Account #"
 msgstr "Compte n°"
 
 #: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:61
+#: apps/member/templates/member/base.html:62 apps/member/views.py:60
 #: apps/registration/templates/registration/future_profile_detail.html:48
 #: apps/wei/templates/wei/weimembership_form.html:117
 msgid "Update Profile"
@@ -1312,8 +1312,8 @@ msgstr ""
 "seront à nouveau possible."
 
 #: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:318
+#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:304
-#: apps/member/views.py:559
+#: apps/member/views.py:545
 msgid "Note aliases"
 msgstr "Alias de la note"
 
@@ -1505,51 +1505,51 @@ msgstr "Sauvegarder les changements"
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: apps/member/views.py:74 apps/registration/forms.py:23
+#: apps/member/views.py:73 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:154
+#: apps/member/views.py:140
 msgid "Profile detail"
 msgstr "Détails de l'utilisateur⋅rice"
 
-#: apps/member/views.py:220
+#: apps/member/views.py:206
 msgid "Search user"
 msgstr "Chercher un·e utilisateur·rice"
 
-#: apps/member/views.py:272
+#: apps/member/views.py:258
 msgid "Note friendships"
 msgstr "Amitiés note"
 
-#: apps/member/views.py:342
+#: apps/member/views.py:328
 msgid "Update note picture"
 msgstr "Modifier la photo de la note"
 
-#: apps/member/views.py:391
+#: apps/member/views.py:377
 msgid "Manage auth token"
 msgstr "Gérer les jetons d'authentification"
 
-#: apps/member/views.py:418
+#: apps/member/views.py:404
 msgid "Create new club"
 msgstr "Créer un nouveau club"
 
-#: apps/member/views.py:437
+#: apps/member/views.py:423
 msgid "Search club"
 msgstr "Chercher un club"
 
-#: apps/member/views.py:475
+#: apps/member/views.py:461
 msgid "Club detail"
 msgstr "Détails du club"
 
-#: apps/member/views.py:587
+#: apps/member/views.py:573
 msgid "Update club"
 msgstr "Modifier le club"
 
-#: apps/member/views.py:621
+#: apps/member/views.py:607
 msgid "Add new member to the club"
 msgstr "Ajouter un·e nouvelleau membre au club"
 
-#: apps/member/views.py:750 apps/wei/views.py:991
+#: apps/member/views.py:736 apps/wei/views.py:991
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -1557,19 +1557,19 @@ msgstr ""
 "Cet⋅te utilisateur⋅rice n'a pas assez d'argent pour rejoindre ce club et ne "
 "peut pas avoir un solde négatif."
 
-#: apps/member/views.py:772
+#: apps/member/views.py:758
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:777
+#: apps/member/views.py:763
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:927
+#: apps/member/views.py:913
 msgid "Manage roles of an user in the club"
 msgstr "Gérer les rôles d'un⋅e utilisateur⋅rice dans le club"
 
-#: apps/member/views.py:952
+#: apps/member/views.py:938
 msgid "Members of the club"
 msgstr "Membres du club"
 
@@ -2084,7 +2084,7 @@ msgid "Button displayed"
 msgstr "Bouton affiché"
 
 #: apps/note/templates/note/transactiontemplate_list.html:100
-#: apps/wrapped/templates/wrapped/wrapped_list.html:70
+#: apps/wrapped/templates/wrapped/wrapped_list.html:63
 msgid "An error occured"
 msgstr "Une erreur s'est produite"
 
@@ -3662,14 +3662,6 @@ msgstr "soirée·s organisée·s"
 msgid "distinct members"
 msgstr "Membres distinct·e·s"
 
-#: apps/wrapped/templates/wrapped/1/wrapped_view_club.html:26
-msgid "Infortunately, you doesn't have consumer this year"
-msgstr "Malheureusement, tu n'as pas de consommateur cette année"
-
-#: apps/wrapped/templates/wrapped/1/wrapped_view_club.html:28
-msgid "Congratulations you are a real rat !"
-msgstr "Félicitations, tu es un vrai rat !"
-
 #: apps/wrapped/templates/wrapped/1/wrapped_view_user.html:13
 msgid "You participate to the wei: "
 msgstr "Tu as participé au wei : "
@@ -3707,15 +3699,7 @@ msgstr "avec"
 msgid "Your expenses to BDE: "
 msgstr "Tes dépenses au BDE : "
 
-#: apps/wrapped/templates/wrapped/wrapped_list.html:13
+#: apps/wrapped/templates/wrapped/wrapped_list.html:26
-msgid "My wrapped"
-msgstr "Mes wrapped"
-
-#: apps/wrapped/templates/wrapped/wrapped_list.html:22
-msgid "Public wrapped"
-msgstr "Wrapped public"
-
-#: apps/wrapped/templates/wrapped/wrapped_list.html:33
 msgid ""
 "Do not forget to ask permission to people who are in your wrapped before to "
 "make them public"
@@ -3723,19 +3707,19 @@ msgstr ""
 "N'oublies pas de demander la permission des personnes apparaissant dans un "
 "wrapped avant de le rendre public"
 
-#: apps/wrapped/templates/wrapped/wrapped_list.html:40
+#: apps/wrapped/templates/wrapped/wrapped_list.html:33
 msgid "Link copied"
 msgstr "Lien copié"
 
-#: apps/wrapped/templates/wrapped/wrapped_list.html:65
+#: apps/wrapped/templates/wrapped/wrapped_list.html:58
 msgid "Wrapped is private"
 msgstr "Le wrapped est privé"
 
-#: apps/wrapped/templates/wrapped/wrapped_list.html:66
+#: apps/wrapped/templates/wrapped/wrapped_list.html:59
 msgid "Wrapped is public"
 msgstr "Le wrapped est public"
 
-#: apps/wrapped/views.py:28
+#: apps/wrapped/views.py:24
 msgid "List of wrapped"
 msgstr "Liste des wrapped"
 

note_kfet/static/css/custom.css

@@ -74,7 +74,7 @@ mark {
 /* MODE VIEUXCON=ON */
 /*    background-color: rgb(166, 0, 2) !important; */
     background-color: rgb(0, 0, 0);
-    background-image: url('/static/img/rp_bg.png');
+    background-image: url('/static/wrapped/img/1/bg.png');
 }
 
 html {
@@ -136,32 +136,33 @@ body {
     border-color: rgb(255, 0, 101);
 }
 
-.btn-outline-dark-shiny {
+.btn-outline-dark:nth-child(even) {
-    background-color: #222;
+    color: rgba(255, 203, 32, 75%);
-    border-color: #61605b;
-    color: rgba(255, 0, 101, 75%);
 }
 
-.btn-outline-dark-shiny:hover,
+.btn-outline-dark:nth-child(odd) {
-.btn-outline-dark-shiny:not(:disabled):not(.disabled).active,
+    color: rgba(255, 0, 101, 75%);
-.btn-outline-dark-shiny:not(:disabled):not(.disabled):active {
-    color:  rgb(0, 0, 0);
-    background-color: rgb(255, 203, 32);
-    border-color: rgb(255, 0, 101);
 }
 
 .btn-outline-dark {
     background-color: #222;
     border-color: #61605b;
-    color: rgba(255, 203, 32, 75%);
 }
 
-.btn-outline-dark:hover,
+.btn-outline-dark:hover:nth-child(even),
 .btn-outline-dark:not(:disabled):not(.disabled).active,
 .btn-outline-dark:not(:disabled):not(.disabled):active {
     color:  rgb(0, 0, 0);
-    background-color: rgb(255, 0, 101);
+    background-color: rgb(255, 203, 32);
-    border-color: rgb(255, 203, 32);
+    border-color: rgb(255, 0, 101);
+}
+
+.btn-outline-dark:hover:nth-child(odd),
+.btn-outline-dark:not(:disabled):not(.disabled).active,
+.btn-outline-dark:not(:disabled):not(.disabled):active {
+    color: rgb(0, 0, 0);
+    background-color: rgb(255, 203, 32);
+    border-color: rgb(255, 0, 101);
 }
 
 a {

note_kfet/static/js/konami.js

@@ -26,7 +26,7 @@ function afterKonami () {
     })
     rythm.addRythm('d-flex', 'color', 50, 50, {
       from: [64, 64, 64],
-      to: [255, 0, 101]
+      to: [128, 64, 128]
     })
     rythm.addRythm('nav-link', 'jump', 150, 50, {
       min: 0,