Update 2 files

- /apps/permission/fixtures/initial.json
- /apps/permission/admin.py

apps/permission/admin.py

@@ -31,3 +31,4 @@ class RoleAdmin(admin.ModelAdmin):
     Admin customisation for Role
     """
     list_display = ('name', )
+    filter_horizontal = ('permissions',)

apps/permission/fixtures/initial.json

@@ -3800,6 +3800,38 @@
             "description": "Voir les utilisateurs adhérents au club parent"
         }
     },
+    {
+        "model": "permission.permission",
+        "pk": 242,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction vers la note d'un club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 243,
+        "fields": {
+            "model": [
+                "member",
+                "profile"
+            ],
+            "query": "{\"user__memberships__club\": [\"club\"], \"user__memberships__date_start__lte\": [\"today\"],\"user__memberships__date_end__gte\": [\"today\"]}",
+            "type": "view",
+            "mask": 3,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les profils des membres du club"
+        }
+    },
     {
         "model": "permission.role",
         "pk": 1,

apps/wei/forms/surveys/wei2024.py

@@ -279,7 +279,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         # surveys = [s for s in surveys if s.bus_id != None]
         # surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
 
-
         # surveys = [s for s in surveys if s.registration.user_id in free_users]
 
         # hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True)
@@ -288,15 +287,13 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True)
         hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb}
 
-
         # Reset previous algorithm run
         for survey in surveys:
             survey.free()
             if survey.registration.user_id in hardcoded_first_year.keys():
-                survey.select_bus(hardcoded_first_year[s.registration.user_id])
+                survey.select_bus(hardcoded_first_year[survey.registration.user_id])
             survey.save()
 
-
         non_men = [s for s in surveys if s.registration.gender != 'male']
         men = [s for s in surveys if s.registration.gender == 'male']
 

locale/fr/LC_MESSAGES/django.po

@@ -1032,6 +1032,7 @@ msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
 msgstr ""
+"S'inscrire sur la liste de diffusion pour rester informé·e des actualités "
 "sportives sur le campus (1 mail par semaine)"
 
 #: apps/member/models.py:113

note_kfet/templates/base.html

@@ -159,6 +159,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </nav>
     <div class="{% block containertype %}container{% endblock %} my-3">
 	<div id="messages">
+	    {% if user.is_authenticated %}
+		<div class="alert alert-info">
+		    Venez au festival des Sens de l'Art du 2 au 7 décembre 🐘 !
+		</div>
+	    {% endif %}
             {% if user.is_authenticated %}
                 {% if not user|is_member:"BDE" %}
                     <div class="alert alert-danger">