fix issue with activity entry view

Automation mailing lists

See merge request bde/nk20!280

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/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"))
@@ -330,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
         context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
 
-        activities_open = Activity.objects.filter(open=True).filter(
+        activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
             PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
         context["activities_open"] = [a for a in activities_open
                                       if PermissionBackend.check_perm(self.request,

apps/member/forms.py

@@ -44,7 +44,8 @@ class ProfileForm(forms.ModelForm):
     """
     A form for the extras field provided by the :model:`member.Profile` model.
     """
-    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
+    # Remove widget=forms.HiddenInput() if you want to use report frequency.
+    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"), widget=forms.HiddenInput())
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 
@@ -76,7 +77,8 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = Profile
         fields = '__all__'
-        exclude = ('user', 'email_confirmed', 'registration_valid', )
+        # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list.
+        exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', )
 
 
 class ImageForm(forms.Form):

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

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

apps/wei/forms/surveys/wei2024.py

@@ -276,11 +276,22 @@ 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[survey.registration.user_id])
             survey.save()
 
         non_men = [s for s in surveys if s.registration.gender != 'male']
@@ -291,9 +302,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 -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
-            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
@@ -308,9 +317,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:

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.cron

@@ -26,3 +26,5 @@ MAILTO=notekfet2020@lists.crans.org
  00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons -v 0
 # Vider les tokens Oauth2
  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
+# Envoyer la liste des abonnés à la NL BDA
+ 00  8     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -v 0

note_kfet/templates/base.html

@@ -158,7 +158,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         </div>
     </nav>
     <div class="{% block containertype %}container{% endblock %} my-3">
-        <div id="messages">
+	<div id="messages">
             {% if user.is_authenticated %}
                 {% if not user|is_member:"BDE" %}
                     <div class="alert alert-danger">