Merge branch 'non-BDE-members' into 'main'

Draft: Allow non-BDE members to use the note

See merge request bde/nk20!268

apps/activity/views.py

@@ -265,11 +265,12 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         # Keep only users that have a note
         note_qs = note_qs.filter(note__noteuser__isnull=False)
 
-        # Keep only valid members
+        # Keep only members
         note_qs = note_qs.filter(
             note__noteuser__user__memberships__club=activity.attendees_club,
             note__noteuser__user__memberships__date_start__lte=timezone.now(),
-            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')
+            note__noteuser__user__memberships__date_end__gte=timezone.now(),
+        )
 
         # Filter with permission backend
         note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))

apps/permission/admin.py

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

apps/permission/fixtures/initial.json

@@ -3800,38 +3800,6 @@
             "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,
@@ -3944,8 +3912,7 @@
                 12,
                 13,
                 14,
-                22,
-                48
+                22
             ]
         }
     },
@@ -3994,7 +3961,6 @@
             "for_club": null,
             "name": "Tr\u00e9sorièr\u22c5e de club",
             "permissions": [
-                6,
                 19,
                 20,
                 21,
@@ -4409,7 +4375,7 @@
                 238
             ]
         }
-    },  
+    },
     {
         "model": "wei.weirole",
         "pk": 12,

apps/wei/forms/surveys/wei2024.py

@@ -276,22 +276,11 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
         surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
         # Don't manage hardcoded people
-        # 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)
-        # hardcoded_first_year = hardcoded_first_year_mb.values_list('user__id', 'bus__id')
-
-        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}
+        surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
 
         # 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[survey.registration.user_id])
             survey.save()
 
         non_men = [s for s in surveys if s.registration.gender != 'male']
@@ -302,7 +291,9 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         non_men_total = registrations.filter(~Q(gender='male')).count()
         for bus in self.get_buses():
             free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
-            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
+            # Remove hardcoded people
+            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+                                                       registration__information_json__icontains="hardcoded").count()
             quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
 
         tqdm_obj = None
@@ -317,6 +308,9 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         for bus in self.get_buses():
             free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
             free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
+            # Remove hardcoded people
+            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+                                                       registration__information_json__icontains="hardcoded").count()
             quotas[bus] = free_seats
 
         if display_tqdm:

locale/fr/LC_MESSAGES/django.po

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

@@ -158,12 +158,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         </div>
     </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 %}
+        <div id="messages">
             {% if user.is_authenticated %}
                 {% if not user|is_member:"BDE" %}
                     <div class="alert alert-danger">