Merge et fix quelques menus problèmes

zestedesavoir · Jun 5, 2021 · 3ae006b · 3ae006b
1 parent 11c9e65
commit 3ae006b
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 1,011 deletions.
diff --git a/assets/js/content-quizz.js b/assets/js/content-quizz.js
@@ -132,8 +132,6 @@ function injectForms(quizz, answers) {
  heading.setAttribute('id', `quizz-form-${idBias}`)
  idBias++
  }
- console.log(headings)
- console.log(heading.getAttribute('id'))
  if (heading && !headings[heading.getAttribute('id')]) {
  const wrapper = document.createElement('div')
 
@@ -172,7 +170,7 @@ function injectForms(quizz, answers) {
  wrapper.appendChild(form)
  if (heading.nextSibling) {
  wrapper.appendChild(heading.nextSibling.cloneNode(true))
- quizz.removeChild(heading.nextSibling)
+ heading.parentNode.removeChild(heading.nextSibling)
  }
  }
  }

diff --git a/assets/scss/base/_content.scss b/assets/scss/base/_content.scss
@@ -116,24 +116,6 @@ h6 {
 
 
 .quizz .custom-block {
- .custom-block {
- display: none;
- }
- &.quizz-bad {
- background-color: $color-danger !important;
- .custom-block {
- display: block;
- }
- }
- &.quizz-good {
- background:$color-success !important;
- .custom-block {
- display: block;
- }
- }
-
-}
-
  .custom-block {
  display: none;
  }
@@ -163,6 +145,7 @@ h6 {
 
 }
 
+
 .custom-block {
  margin: $length-24 0;
 }
@@ -286,6 +269,15 @@ h6 {
  &:after {
  display: none;
  }
+
+ .custom-block {
+ display: none;
+ /* hide the correction while not answered */
+ &.quizz-good, &.quizz-bad, &.quizz-missing {
+ display: block;
+ }
+ }
+
  }
 }
 

diff --git a/assets/scss/pages/_stats.scss b/assets/scss/pages/_stats.scss
@@ -55,12 +55,12 @@
  max-width: 50%;
  li.quizz-stats {
  display: grid;
- grid-template-columns: repeat(2, 1fr);
+ grid-template-columns:  3fr 3fr 1fr;
  grid-gap: 1px;
-/* .over-progress {
+ .over-progress {
  display: block;
  position: relative;
  left: -50%;
- }*/
+ }
  }
 }
diff --git a/templates/misc/quizz.graph.part.html b/templates/misc/quizz.graph.part.html
@@ -1,6 +1,4 @@
 {% load i18n %}
-{% load dict_get %}
-
 
 <div id="{{ tab_name }}" class="tabcontent">
  {% for url, questions in quizz.items %}
@@ -14,9 +12,11 @@ <h4>{% trans graph_title %} {{ question }}</h4>
  {% for answer_name, answer_stats in stats.responses.items %}
  <li class="{% if answer_stats.good %}quizz-forget{% endif %} quizz-stats">
  <span>{{ answer_name }}</span>
- <span><progress aria-label="{% trans 'Résultat pour' %} {{ answer_name }}" max="{{ stats.total }}" value="{{ answer_stats.nb }}"/>
+ <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}}</span>
+ <span class="over-progress">{{answer_stats.nb}} / {{ stats.total }}</span>
  </li>
  {% endfor %}
  </ul>

diff --git a/templates/tutorialv2/export/chapter.html b/templates/tutorialv2/export/chapter.html
@@ -1,4 +1,3 @@
-{% load emarkdown %}
 {% load i18n %}
 
 {# this template will be used to generate the HTML file for each container ! #}
@@ -28,7 +27,7 @@ <h2 id="{{ model_extract.position_in_parent }}-{{ model_extract.slug }}">
  {% if rendered_extract.text %}
  <div class="extract-wrapper quizz" data-quizz-validate="{% trans 'Valider le Quizz' %}"
  data-heading-level="h3" data-answer-url="{% url 'content:answer-quizz' content.pk content.slug %}">
- {{ rendered_extract.get_text|emarkdown:is_js }}
+ {{ rendered_extract.text|safe }}
  </div>
  {% endif %}
 {% endfor %}

diff --git a/templates/tutorialv2/stats/index.html b/templates/tutorialv2/stats/index.html
@@ -50,7 +50,7 @@ <h2 class="ico-after ico-tutorials">
  {% include "misc/graph.part.html" with tab_name="tab-view-graph-content" graph_title="Évolution des pages vues sur le contenu" canvas_id="view-graph" report_key="nb_hits" %}
  {% include "misc/graph.part.html" with tab_name="tab-visit-time-graph-content" graph_title="Évolution du temps moyen lecture (en secondes)" canvas_id="visit-time-graph" report_key="avg_time_on_page" %}
  {% include "misc/graph.part.html" with tab_name="tab-users-graph-content" graph_title="Évolution du nombre de visiteurs uniques" canvas_id="users-graph" report_key="nb_uniq_visitors" %}
- {% include "misc/graph.part.html" with tab_name="tab-quizz-content" graph_title="Réponses au quizz" canvas_id="quizz-graph" metric="quizz" %}
+ {% include "misc/quizz.graph.part.html" with tab_name="tab-quizz-content" graph_title="Réponses au quizz" canvas_id="quizz-graph" metric="quizz" %}
 
  {% if cumulative_stats %}
  {% if display == 'global' %}