Merge branch 'qrcode' into 'main'

Draft: Qrcode

See merge request bde/nk20!196

apps/activity/templates/activity/activity_entry.html

@@ -38,6 +38,7 @@ 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>
 
@@ -63,15 +64,46 @@ 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;
@@ -168,4 +200,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         });
     }
 </script>
-{% endblock %}
+{% endblock %}

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

@@ -73,7 +73,10 @@
 {% 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>{% trans 'API token' %}
+            <i class="fa fa-cogs"></i>&nbsp;{% 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

@@ -0,0 +1,36 @@
+{% 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,4 +25,5 @@ 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

@@ -407,6 +407,14 @@ 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/wei/forms/surveys/wei2025.py

@@ -17,7 +17,7 @@ from ...models import WEIMembership, Bus
 
 WORDS = {
     'list': [
-        'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nert et geek', 'Jeux de rôles et danse rock',
+        'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nerd et geek', 'Jeux de rôles et danse rock',
         'Strass et paillettes', 'Spectaculaire', 'Splendide', 'Flow inégalable', 'Rap', 'Battles légendaires',
         'Techno', 'Alcool', 'Kiffeur·euse', 'Rugby', 'Médiéval', 'Festif',
         'Stylé', 'Chipie', 'Rétro', 'Vache', 'Farfadet', 'Fanfare',
@@ -57,7 +57,7 @@ WORDS = {
                 42: "Un burgouzz de valouzz",
                 47: "Un ocarina (pour me téléporter hors de ce bourbier)",
                 48: "Des paillettes, un micro de karaoké et une enceinte bluetooth",
-                45: "",
+                45: "Un kebab",
                 44: "Une 86 et un caisson pour taper du pied",
                 46: "Une épée, un ballon et une tireuse",
                 43: "Des lunettes de soleil",
@@ -176,7 +176,33 @@ WORDS = {
                 49: "Soirée raclette !"
             }
         ]
-    }
+    },
+    'stats': [
+        {
+            "question": """Le WEI est structuré par bus, et au sein de chaque bus, par équipes.
+                         Pour toi, être dans une équipe où tout le monde reste sobre (primo-entrants comme encadrants) c'est :""",
+            "answers": [
+                (1, "Inenvisageable"),
+                (2, "À contre cœur"),
+                (3, "Pourquoi pas"),
+                (4, "Souhaitable"),
+                (5, "Nécessaire"),
+            ],
+            "help_text": "(De toute façon aucun alcool n'est consommé pendant les trajets du bus, ni aller, ni retour.)",
+        },
+        {
+            "question": "Faire partie d'un bus qui n'apporte pas de boisson alcoolisée pour ses membres, pour toi c'est :",
+            "answers": [
+                (1, "Inenvisageable"),
+                (2, "À contre cœur"),
+                (3, "Pourquoi pas"),
+                (4, "Souhaitable"),
+                (5, "Nécessaire"),
+            ],
+            "help_text": """(Tout les bus apportent de l'alcool cette année, cette question sert à l'organisation pour l'année prochaine.
+                         De plus il y aura de toute façon de l'alcool commun au WEI et aucun alcool n'est consommé pendant les trajets en bus.)""",
+        },
+    ]
 }
 
 IMAGES = {
@@ -235,7 +261,7 @@ class WEISurveyForm2025(forms.Form):
             all_preferred_words = WORDS['list']
             rng.shuffle(all_preferred_words)
             self.fields["words"].choices = [(w, w) for w in all_preferred_words]
-        else:
+        elif information.step <= len(WORDS['questions']):
             questions = list(WORDS['questions'].items())
             idx = information.step - 1
             if idx < len(questions):
@@ -251,6 +277,15 @@ class WEISurveyForm2025(forms.Form):
                     widget=OptionalImageRadioSelect(images=IMAGES.get(q, {})),
                     required=True,
                 )
+        elif information.step == len(WORDS['questions']) + 1:
+            for i, v in enumerate(WORDS['stats']):
+                self.fields[f'stat_{i}'] = forms.ChoiceField(
+                    label=v['question'],
+                    choices=v['answers'],
+                    widget=forms.RadioSelect(),
+                    required=False,
+                    help_text=_(v.get('help_text', ''))
+                )
 
     def clean_words(self):
         data = self.cleaned_data['words']
@@ -377,7 +412,7 @@ class WEISurvey2025(WEISurvey):
                 setattr(self.information, "word" + str(i), word)
             self.information.step += 1
             self.save()
-        else:
+        elif 1 <= self.information.step <= len(WORDS['questions']):
             questions = list(WORDS['questions'].keys())
             idx = self.information.step - 1
             if idx < len(questions):
@@ -385,6 +420,13 @@ class WEISurvey2025(WEISurvey):
                 setattr(self.information, q, form.cleaned_data[q])
                 self.information.step += 1
                 self.save()
+        else:
+            for i, __ in enumerate(WORDS['stats']):
+                ans = form.cleaned_data.get(f'stat_{i}')
+                if ans is not None:
+                    setattr(self.information, f'stat_{i}', ans)
+            self.information.step += 1
+            self.save()
 
     @classmethod
     def get_algorithm_class(cls):
@@ -394,7 +436,7 @@ class WEISurvey2025(WEISurvey):
         """
         The survey is complete once the bus is chosen.
         """
-        return self.information.step > len(WORDS['questions'])
+        return self.information.step > len(WORDS['questions']) + 1
 
     @classmethod
     @lru_cache()

apps/wei/tests/test_wei_algorithm_2025.py

@@ -53,9 +53,11 @@ class TestWEIAlgorithm(TestCase):
                 birth_date='2000-01-01',
             )
             information = WEISurveyInformation2025(registration)
-            for j in range(1, 21):
+            for j in range(1, 1 + NB_WORDS):
                 setattr(information, f'word{j}', random.choice(WORDS['list']))
-            information.step = 20
+            for q in WORDS['questions']:
+                setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
+            information.step = len(WORDS['questions']) + 2
             information.save(registration)
             registration.save()
 
@@ -87,7 +89,7 @@ class TestWEIAlgorithm(TestCase):
                 setattr(information, f'word{j}', random.choice(WORDS['list']))
             for q in WORDS['questions']:
                 setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
-            information.step = len(WORDS['questions']) + 1
+            information.step = len(WORDS['questions']) + 2
             information.save(registration)
             registration.save()
             survey = WEISurvey2025(registration)

locale/fr/LC_MESSAGES/django.po

@@ -770,7 +770,7 @@ msgstr "Créer une famille ou un défi"
 
 #: apps/family/templates/family/manage.html:96
 msgid "Add a family"
-msgstr "Ajouter une famille"
+msgstr "Fonder une famille"
 
 #: apps/family/templates/family/manage.html:101
 msgid "Add a challenge"