Added some necessary rights

update hardcoded

See merge request bde/nk20!273

.gitlab-ci.yml

@@ -7,21 +7,6 @@ stages:
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-# Debian Bullseye
-py39-django42:
-  stage: test
-  image: debian:bullseye
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py39-django42
-
 # Ubuntu 22.04
 py310-django42:
   stage: test
@@ -54,8 +39,6 @@ py311-django42:
         python3-bs4 python3-setuptools tox texlive-xetex
   script: tox -e py311-django42
 
-
-
 linters:
   stage: quality-assurance
   image: debian:bookworm

apps/activity/views.py

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

apps/permission/fixtures/initial.json

@@ -3752,6 +3752,54 @@
             "description": "Modifier bouffe"
         }
     },
+    {
+        "model": "permission.permission",
+        "pk": 239,
+        "fields": {
+            "model": [
+                "note",
+                "alias"
+            ],
+            "query": "[\"AND\", {\"note__noteuser__user__memberships__club\": [\"club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les alias des notes des adhérent⋅es du club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 240,
+        "fields": {
+            "model": [
+                "note",
+                "alias"
+            ],
+            "query": "[\"AND\", {\"note__noteuser__user__memberships__club\": [\"club\", \"parent_club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les alias des notes des adhérent⋅es du club parent"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 241,
+        "fields": {
+            "model": [
+                "auth",
+                "user"
+            ],
+            "query": "[\"AND\", {\"memberships__club\": [\"club\", \"parent_club\"], \"memberships__date_start__lte\": [\"today\"], \"memberships__date_end__gte\": [\"today\"]}, {\"note__is_active\": true}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les utilisateurs adhérents au club parent"
+        }
+    },
     {
         "model": "permission.role",
         "pk": 1,
@@ -3851,7 +3899,21 @@
             "for_club": null,
             "name": "Membre de club",
             "permissions": [
-				22
+                1,
+                2,
+                3,
+                4,
+                5,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                22,
+                48
             ]
         }
     },
@@ -3900,6 +3962,7 @@
             "for_club": null,
             "name": "Tr\u00e9sorièr\u22c5e de club",
             "permissions": [
+                6,
                 19,
                 20,
                 21,
@@ -3913,7 +3976,10 @@
                 142,
                 182,
                 184,
-				185
+                185,
+                239,
+                240,
+                241
             ]
         }
     },

apps/registration/views.py

@@ -300,9 +300,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
 #            join_bde = True
 #            join_kfet = True
 
-        if not join_bde:
+        if not (join_bde or any(b for _, b in join_clubs)):
             # This software belongs to the BDE.
-            form.add_error('join_bde', _("You must join the BDE."))
+            form.add_error('join_bde', _("You must join a club."))
+            return super().form_invalid(form)
+
+        if join_kfet and not join_bde:
+            form.add_error('join_bde', _("You must also join the parent club BDE."))
             return super().form_invalid(form)
 
         # Calculate required registration fee

apps/wei/forms/surveys/wei2024.py

@@ -276,13 +276,27 @@ 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 not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
+        # 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}
+
 
         # 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.save()
 
+
         non_men = [s for s in surveys if s.registration.gender != 'male']
         men = [s for s in surveys if s.registration.gender == 'male']
 
@@ -291,9 +305,7 @@ 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()
-            # Remove hardcoded people
-            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
-                                                       registration__information_json__icontains="hardcoded").count()
+            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
             quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
 
         tqdm_obj = None
@@ -308,9 +320,6 @@ 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:

note.cron

@@ -9,6 +9,7 @@ MAILTO=notekfet2020@lists.crans.org
  *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1 -v 0
  *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1 -v 0
  00  0     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -v 0
+ 00  0     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log -r failure 30 -v 0
 # Faire une sauvegarde de la base de données
  00  2     *   *   *     root   cd /var/www/note_kfet && apps/scripts/shell/backup_db
 # Vérifier la cohérence de la base et mailer en cas de problème

note_kfet/settings/base.py

@@ -225,6 +225,7 @@ MEDIA_URL = '/media/'
 # Use mailer in production to place emails in a queue before sending them to avoid spam
 EMAIL_BACKEND = 'mailer.backend.DbBackend'
 MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+MAILER_EMAIL_MAX_BATCH = 10
 EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False)
 EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
 EMAIL_PORT = os.getenv('EMAIL_PORT', 25)

note_kfet/templates/base.html

@@ -72,7 +72,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                             <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a>
                         </li>
                     {% endif %}
-                    {% if user.is_authenticated and user|is_member:"Kfet" %}
+                    {% if user.is_authenticated %}
                         <li class="nav-item">
                             {% url 'note:transfer' as url %}
                             <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>

tox.ini

@@ -1,14 +1,14 @@
 [tox]
 envlist =
-    # Debian Bullseye Python
-    py39-django42
-
     # Ubuntu 22.04 Python
     py310-django42
 
     # Debian Bookworm Python
     py311-django42
 
+    # Ubuntu 24.04 Python
+    py312-django42
+
     linters
 skipsdist = True