Quiz sondage

assets/js/content-quizz.js

@@ -412,7 +412,7 @@ function getQuestionText(question){
   let title
   if (question.querySelector('.math')) {
     const annotation = question.querySelector('.math annotation');
-    title = annotation.textContent.trim();
+    title = '$'+annotation.textContent.trim()+'$';
   }
   else {
     title = question.textContent;
@@ -427,7 +427,7 @@ function getAnswerText(liWrapper){
   let answer;
   if (mathElement) {
     const annotationElement = mathElement.querySelector('annotation');
-    answer = annotationElement.textContent.trim();
+    answer = '$'+annotationElement.textContent.trim()+'$';
   } else {
     answer = liWrapper.textContent;
   }
@@ -482,24 +482,24 @@ document.querySelectorAll('form.quizz').forEach(form => {
         result: {}
       }
 
+      const CurrentFormQuestions = [...form.querySelectorAll('.custom-block-heading')].map(question => getQuestionText(question));
+
       Object.keys(answers).forEach(name => {
 
         const element = document.querySelector(`.custom-block[data-name="${name}"]`)
 
         let title = getQuestionText(element.querySelector('.custom-block-heading'))
 
-        statistics.result[title] = {
-          evaluation: 'bad',
-          labels: []
-        }
-        statistics.expected[title] = {}
 
         //make statistics of concerned form only
-
-        const CurrentFormQuestions = [...form.querySelectorAll('.custom-block-heading')].map(question => getQuestionText(question));
-
         if (CurrentFormQuestions.includes(title)) {
 
+          statistics.result[title] = {
+            evaluation: 'bad',
+            labels: []
+          }
+          statistics.expected[title] = {}
+
           const availableResponses = element.querySelectorAll('input')
           for (let i = 0; i < availableResponses.length; i++) {
             // wee need to get the question label for statistics
@@ -512,7 +512,7 @@ document.querySelectorAll('form.quizz').forEach(form => {
           element.querySelectorAll('input:checked').forEach(node => {
 
             // remove eventual glued corretion
-            let label = node.parentElement.textContent
+            let label = getAnswerText(node.parentElement)
 
             statistics.result[title].labels.push(label.trim())
           })

templates/misc/quizz.graph.part.html

@@ -1,47 +1,151 @@
 {% load i18n %}
-<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/katex.min.css">
-<script src="https://unpkg.com/[email protected]/dist/katex.min.js"></script>
+{% load emarkdown%}
+
+
 <div id="{{ tab_name }}" class="tabcontent">
 
-
     {% for quizz_name, questions in quizz.items %}
-        <header>
-            <h3>{{ quizz_name }}</h3>
-            <button class="init-stats-button" data-quizz="{{ quizz_name }}">Initialize Stats</button>
-        </header>
-        {% for question, stats in questions.items %}
-            <article class="stat-graph">
-            <h4>{% trans graph_title %} <span id="formule">{{ question }}</span></h4>
-            <ul class="quizz-answers">
-                {% for answer_name, answer_stats in stats.responses.items %}
-                    <li class="{% if answer_stats.good %}quizz-forget{% endif %} quizz-stats">
-                        <span id="formule">{{ answer_name }}</span>
-                        <span>
-                            <progress aria-label="{% trans 'Résultat pour' %} {{ answer_name }}"
-                                      max="{{ stats.total }}" value="{{ answer_stats.nb }}"/>
-                        </span>
-                        <span class="over-progress">{{answer_stats.nb}} / {{ stats.total }}</span>
-                    </li>
-                {% endfor %}
-            </ul>
-        </article>
-        {% endfor %}
-{% endfor %}
+    <header>
+        <h3 class="quizz_name">{{ quizz_name }}</h3>
+        <button class="delete-quizz-button" data-quizz="{{ quizz_name }}"><i class="fas fa-trash-alt"></i></button>
+    </header>
+    {% for question, stats in questions.items %}
+    <article class="stat-graph">
+        <h4>{% trans graph_title %} <span>{{ question|emarkdown }}</span></h4>
+        <button class="delete-question-button" data-quizz="{{ quizz_name }}" data-question="{{question}}"><i
+                class="fas fa-trash-alt"></i></button>
+        <ul class="quizz-answers">
+            {% for answer_name, answer_stats in stats.responses.items %}
+            <li class="{% if answer_stats.good %} quizz-good{% endif %} quizz-stats">
+                <span>{{ answer_name|emarkdown }}</span>
+                <span>
+                    <progress aria-label="{% trans 'Résultat pour' %} {{ answer_name }}" max="{{ stats.total }}"
+                        value="{{ answer_stats.nb }}" />
+                </span>
+                <span class="over-progress">{{answer_stats.nb}} / {{ stats.total }}</span>
+            </li>
+            {% endfor %}
+        </ul>
+    </article>
+    {% endfor %}
+    {% endfor %}
 </div>
 <script>
 
-    var elements = document.querySelectorAll("#formule");
-    var regex = /[^\w\s]/g; // Expression régulière pour les caractères spéciaux
 
-    for (var i = 0; i < elements.length; i++) {
-        if (regex.test(elements[i].textContent)) { // Si l'élément contient des caractères spéciaux
-            katex.render(elements[i].textContent, elements[i]);
-        }
-        else {
-            elements[i].innerText = elements[i].textContent; // Remplacer la balise span par un texte simple
+    function deleteQuizz(quizzName, question) {
+        const csrfmiddlewaretoken = document.querySelector('input[name=\'csrfmiddlewaretoken\']').value
+        const xhttp = new XMLHttpRequest()
+        const url = 'http://0.0.0.0:8000/contenus/delete_quizz/'
+        const data = question ? JSON.stringify({ 'quizzName': quizzName, 'question': question }) : JSON.stringify({ 'quizzName': quizzName })
+        xhttp.open('POST', url)
+        xhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest')
+        xhttp.setRequestHeader('Content-Type', 'application/json')
+        xhttp.setRequestHeader('X-CSRFToken', csrfmiddlewaretoken)
+        xhttp.onload = function () {
+            location.reload()
         }
+        xhttp.send(data)
+    }
+
+    // Add an event listener to the quizz delete button
+    var deleteButtons = document.querySelectorAll(".delete-quizz-button");
+    for (var i = 0; i < deleteButtons.length; i++) {
+        deleteButtons[i].addEventListener('click', function () {
+            var quizzName = this.getAttribute('data-quizz');
+            deleteQuizz(quizzName, '');
+        });
     }
-
+
+    // Add an event listener to the question delete button
+    var deleteButtons = document.querySelectorAll(".delete-question-button");
+    for (var i = 0; i < deleteButtons.length; i++) {
+        deleteButtons[i].addEventListener('click', function () {
+            var quizzName = this.getAttribute('data-quizz');
+            var question = this.getAttribute('data-question');
+            deleteQuizz(quizzName, question);
+        });
+    }
+
+
+    // Replace the quizz name by the stats part of the quizz name
+    var quizzNames = document.querySelectorAll(".quizz_name");
+    for (var i = 0; i < quizzNames.length; i++) {
+        var quizzName = quizzNames[i].innerText;
+        quizzName = quizzName.replace("#", "");
+        var parts = quizzName.split("/");
+        var statsPart = parts[parts.length - 2] + "/" + parts[parts.length - 1];
+        quizzNames[i].innerText = statsPart;
+    }
+
+
+
 </script>
 
+<style>
+    .quizz-chart {
+        margin-top: 10px;
+    }
+
+
+    header {
+        border: 1px solid #ddd;
+    }
 
+
+    /* Style for the header of each quiz */
+    .tabcontent header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+    }
+
+    .tabcontent h3 {
+        font-size: 24px;
+        margin: 0;
+    }
+
+    /* Style for the initialize stats button */
+    .delete-quizz-button,
+    .delete-question-button {
+        background-color: #e44833;
+        border: none;
+        color: white;
+        padding: 10px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 16px;
+        margin-left: 10px;
+        cursor: pointer;
+    }
+
+    .delete-stats-button:hover {
+        background-color: #3e8e41;
+    }
+
+    /* Style for each question and its stats */
+    .stat-graph {
+        margin-bottom: 20px;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    h4 span {
+        display: inline-block;
+    }
+
+    li.quizz-stats {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+    }
+
+    li.quizz-good {
+        background-color: #a6f566;
+        border-color: #155724;
+        color: #155724;
+    }
+</style>

zds/tutorialv2/urls/urls_contents.py

@@ -37,7 +37,12 @@
 from zds.tutorialv2.views.lists import TagsListView, ContentOfAuthor, ListContentReactions
 from zds.tutorialv2.views.alerts import SendContentAlert, SolveContentAlert
 from zds.tutorialv2.views.misc import RequestFeaturedContent, FollowNewContent, WarnTypo
-from zds.tutorialv2.views.statistics import ContentStatisticsView, ContentQuizzStatistics, QuizzContentStatistics
+from zds.tutorialv2.views.statistics import (
+    ContentStatisticsView,
+    ContentQuizzStatistics,
+    DeleteQuizz,
+    QuizzContentStatistics,
+)
 from zds.tutorialv2.views.comments import (
     SendNoteFormView,
     UpdateNoteView,
@@ -209,4 +214,5 @@
     # quizz
     path("reponses/<int:pk>/<slug:slug>/", ContentQuizzStatistics.as_view(), name="answer-quizz"),
     path("stats_quizz/<int:pk>/<slug:slug>/", QuizzContentStatistics.as_view(), name="stats-quizz"),
+    path("delete_quizz/", DeleteQuizz.as_view(), name="delete_quizz"),
 ]

zds/tutorialv2/views/statistics.py

@@ -1,24 +1,29 @@
 import itertools
+import json
 import uuid
 from collections import OrderedDict, Counter
 import logging
 import urllib.parse
 from datetime import timedelta, datetime, date
 from json import loads, dumps
-
+from django.shortcuts import get_object_or_404, redirect
+from django.views import View
+from django.db.models import Subquery
 import requests
 from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
 from django.db.models import Count
 from django.forms.utils import ErrorDict
-from django.http import StreamingHttpResponse
+from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse, StreamingHttpResponse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import FormView
+from django.views.generic import FormView, DeleteView
+from zds.member.decorator import LoggedWithReadWriteHability
 
 from zds.tutorialv2.forms import ContentCompareStatsURLForm, QuizzStatsForm
 from zds.tutorialv2.mixins import (
     SingleContentDetailViewMixin,
+    SingleContentViewMixin,
     SingleOnlineContentDetailViewMixin,
     SingleOnlineContentFormViewMixin,
 )
@@ -356,11 +361,7 @@ def build_quizz_stats(self, end_date, start_date):
                 .all()
             ):
                 full_answers_total[available_answer.label] = {"good": available_answer.is_good, "nb": 0}
-                name = (
-                    available_answer.related_question.url.split("/")[-2]
-                    + "/"
-                    + available_answer.related_question.url.split("/")[-1].split("#")[-1]
-                )
+                name = available_answer.related_question.url
                 question = available_answer.related_question.question
                 for r in total_per_label:
                     if (
@@ -371,8 +372,72 @@ def build_quizz_stats(self, end_date, start_date):
             if name not in quizz_stats:
                 quizz_stats[name] = OrderedDict()
             quizz_stats[name][question] = {"total": total_per_question[base_question], "responses": full_answers_total}
-        return quizz_stats
+        sorted_quizz_stats = {}
+        for name in sorted(quizz_stats.keys()):
+            sorted_quizz_stats[name] = quizz_stats[name]
+        return sorted_quizz_stats
 
 
 class QuizzContentStatistics(ContentStatisticsView):
     template_name = "tutorialv2/stats/quizz_stats.html"
+
+
+class DeleteQuizz(View):
+    def get_start_and_end_dates(self):
+        end_date = self.request.GET.get("end_date", None)
+        try:
+            end_date = datetime.strptime(end_date, "%Y-%m-%d").date()
+        except TypeError:
+            end_date = date.today()
+        except ValueError:
+            end_date = date.today()
+            messages.error(self.request, _("La date de fin fournie est invalide."))
+
+        start_date = self.request.GET.get("start_date", None)
+        try:
+            start_date = datetime.strptime(start_date, "%Y-%m-%d").date()
+        except TypeError:
+            start_date = end_date - timedelta(days=7)
+        except ValueError:
+            start_date = end_date - timedelta(days=7)
+            messages.error(self.request, _("La date de début fournie est invalide."))
+
+        if start_date > end_date:
+            end_date, start_date = start_date, end_date
+
+        return start_date, end_date
+
+    def post(self, request):
+
+        start_date, end_date = self.get_start_and_end_dates()
+
+        data = json.loads(request.body)
+
+        # Extract the quizzName from the data
+        quizz_name = data.get("quizzName")
+        question = data.get("question")
+
+        if question:
+            related_question_ids = QuizzQuestion.objects.filter(url=quizz_name, question=question).values_list(
+                "id", flat=True
+            )
+        else:
+            related_question_ids = QuizzQuestion.objects.filter(url=quizz_name).values_list("id", flat=True)
+
+        try:
+            QuizzUserAnswer.objects.filter(
+                related_question_id__in=Subquery(related_question_ids), date_answer__range=(start_date, end_date)
+            ).delete()
+        except Exception as e:
+            return HttpResponseBadRequest(f"An error occurred while deleting the quiz: {str(e)}")
+
+        # Delete all QuizzUserAnswer objects
+        QuizzUserAnswer.objects.all().delete()
+
+        # Delete all QuizzAvailableAnswer objects
+        QuizzAvailableAnswer.objects.all().delete()
+
+        # Delete all QuizzQuestion objects
+        QuizzQuestion.objects.all().delete()
+
+        return StreamingHttpResponse(dumps({"status": "ok"}))