Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enlève jQuery de js/charts.js et met à jour Chart.js #6114

Merged
merged 4 commits into from
Sep 23, 2021
Merged

Enlève jQuery de js/charts.js et met à jour Chart.js #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d54cd2
Enlève jQuery de js/charts.js
philippemilink May 4, 2021
2b8b810
Met à jour Chart.js vers la version 3
philippemilink May 5, 2021
a65e238
Ajoute une légende à l'axe des abscisses pour les stats des contenus
philippemilink May 6, 2021
acde43a
Corrige la mauvaise légende des axes sur les graphes après un changem…
philippemilink Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ function jsPackages() {
require.resolve('jquery/dist/jquery.min.js'),
require.resolve('moment/min/moment.min.js'),
require.resolve('moment/locale/fr.js'),
require.resolve('chart.js/dist/Chart.min.js'),
require.resolve('chartjs-adapter-moment/dist/chartjs-adapter-moment.min.js'),
require.resolve('chart.js/dist/chart.min.js'),
require.resolve('easymde/dist/easymde.min.js')
])
.pipe(gulp.dest('dist/js/'))
Expand Down
122 changes: 66 additions & 56 deletions assets/js/charts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
(function($) {
'use strict'

(function() {
/**
* HSV to RGB color conversion
*
Expand Down Expand Up @@ -54,10 +52,11 @@

var basicOptions = {
scales: {
xAxes: [{
x: {
type: 'time',
time: {
parser: 'DD/MM/YYYY',
tooltipFormat: 'DD/MM/YYYY',
displayFormats: {
hour: 'DD MMM',
day: 'DD MMM',
Expand All @@ -67,25 +66,28 @@
year: 'YYYY'
}
}
}],
yAxes: [{
ticks: {
beginAtZero: true
}
}]
},
y: {
beginAtZero: true
}
},
responsive: true
}

var charts = []
function setupChart($object, formatter) {
var $dataX = $object.data('time')
var chartFormatters = {
'view-graph': null,
'visit-time-graph': Math.round,
'users-graph': null
}
function setupChart(chartEl, formatter) {
var dataX = JSON.parse(chartEl.getAttribute('data-time'))
var times = []
$dataX.forEach(function(element) {
dataX.forEach(function(element) {
times.push(window.moment(element).format('DD/MM/YYYY'))
})

var allObjectData = $object.data()
var allObjectData = chartEl.dataset
var data = []
// Count how many graphs are displayed
var nbColors = 0
Expand All @@ -97,11 +99,12 @@
var n = 0
for (var o in allObjectData) {
if (o.indexOf('views') > -1) {
var label = $object.data('label-' + o)
var label = chartEl.getAttribute('data-label-' + o)
var color = hsvToRgb(n, 100, 80)
var d = JSON.parse(allObjectData[o])
data.push({
label: label,
data: formatter ? allObjectData[o].map(formatter) : allObjectData[o],
data: formatter ? d.map(formatter) : d,
fill: false,
backgroundColor: 'rgba(' + color.join(',') + ', 1)',
borderColor: 'rgba(' + color.join(',') + ', 0.70)',
Expand All @@ -117,9 +120,19 @@
labels: times,
datasets: data
},
options: basicOptions
options: {
...basicOptions,
scales: {
y: {
title: {
display: true,
text: chartEl.getAttribute('data-y-label')
}
}
}
}
}
charts.push(new window.Chart($object, config))
charts.push(new window.Chart(chartEl, config))
}

// Switching between a graph with lines and a graph with bars
Expand All @@ -130,18 +143,21 @@
localStorage.setItem('graphType', 'line') // default value
}

$('#graph_type_toogle').click(function() {
if (localStorage.getItem('graphType') === 'line') {
localStorage.setItem('graphType', 'bar')
$(this).text(switchToLine)
} else {
localStorage.setItem('graphType', 'line')
$(this).text(switchToBar)
}
clearCharts()
drawCharts()
})
$('#graph_type_toogle').text(localStorage.getItem('graphType') === 'line' ? switchToBar : switchToLine)
var graphTypeToggleEl = document.getElementById('graph_type_toggle')
if (graphTypeToggleEl !== null) {
graphTypeToggleEl.addEventListener('click', function() {
if (localStorage.getItem('graphType') === 'line') {
localStorage.setItem('graphType', 'bar')
graphTypeToggleEl.textContent = switchToLine
} else {
localStorage.setItem('graphType', 'line')
graphTypeToggleEl.textContent = switchToBar
}
clearCharts()
drawCharts()
})
graphTypeToggleEl.textContent = localStorage.getItem('graphType') === 'line' ? switchToBar : switchToLine
}

// Clearing charts
function clearCharts() {
Expand All @@ -152,43 +168,37 @@

// Drawing charts
function drawCharts() {
if ($('#view-graph').length) {
setupChart($('#view-graph'))
}
if ($('#visit-time-graph').length) {
setupChart($('#visit-time-graph'), Math.round)
}
if ($('#users-graph').length) {
setupChart($('#users-graph'))
}
if ($('#new-users-graph').length) {
setupChart($('#new-users-graph'))
}
if ($('#sessions-graph').length) {
setupChart($('#sessions-graph'))
for (var g in chartFormatters) {
var el = document.getElementById(g)
if (el !== null) {
setupChart(el, chartFormatters[g])
}
}
}
drawCharts()

// Tab management
function displayTab(tab) {
function displayTab(tabEl) {
if (tabEl === null) {
return
}
// Hide all the tabs
$('.tabcontent').each(function() {
$(this).hide()
document.querySelectorAll('.tabcontent').forEach(function(el) {
el.style.display = 'none'
})
// Remove "active" info from links
$('.tablinks').each(function() {
$(this).removeClass('active')
document.querySelectorAll('.tablinks').forEach(function(el) {
el.classList.remove('active')
})
// Show current tab and add "active" class to the link
$('#' + $(tab).attr('id') + '-content').show()
$(tab).addClass('active')
document.getElementById(tabEl.getAttribute('id') + '-content').style.display = 'block'
tabEl.classList.add('active')
}

$('.tablinks').each(function() {
$(this).click(function() {
displayTab($(this))
document.querySelectorAll('.tablinks').forEach(function(el) {
el.addEventListener('click', function(e) {
displayTab(el)
})
})
displayTab($('.tablinks').first())
})(jQuery)
displayTab(document.querySelector('.tablinks'))
})()
2 changes: 1 addition & 1 deletion assets/scss/pages/_stats.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/* Style the tab content */
.tabcontent {
display: none;
/* Tab has to be displayed by default, otherwise Chart.js doesn't render the graph. */

padding: $length-6 $length-12;

Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"homepage": "https://github.com/zestedesavoir/zds-site",
"dependencies": {
"autoprefixer": "10.2.5",
"chart.js": "2.9.4",
"chart.js": "3.5.1",
"chartjs-adapter-moment": "1.0.0",
"cssnano": "5.0.4",
"del": "6.0.0",
"easymde": "2.10.2-360.0",
Expand Down
1 change: 1 addition & 0 deletions templates/misc/graph.part.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<h3>{% trans graph_title %}</h3>
<canvas
id="{{ canvas_id }}"
data-y-label="{{ y_label}}"
{% for url, report in reports.items %}
data-views-{{ forloop.counter0 }}="[{% for view in report|get_item:report_key|get_tuple_item:1 %}{{view}} {% if not forloop.last %},{% endif %}{% endfor %}]"
data-label-views-{{ forloop.counter0 }}="{{url.name}}"
Expand Down
11 changes: 6 additions & 5 deletions templates/tutorialv2/stats/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
{{ block.super }}
<script src="{% static 'js/moment.min.js' %}"></script>
<script src="{% static 'js/fr.js' %}"></script>
<script src="{% static 'js/Chart.min.js' %}"></script>
<script src="{% static 'js/chart.min.js' %}"></script>
<script src="{% static 'js/chartjs-adapter-moment.min.js' %}"></script>
{% endblock %}

{% block content_out %}
Expand All @@ -46,9 +47,9 @@ <h2 class="ico-after ico-tutorials">
<span class="tablinks" tabindex="0" id="tab-users-graph">{% trans "Nombre de visiteurs uniques" %}</span>
</div>
<!-- Tab content -->
{% 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-view-graph-content" graph_title="Évolution des pages vues sur le contenu" canvas_id="view-graph" report_key="nb_hits" y_label="Nombre de pages" %}
{% 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" y_label="Secondes" %}
{% 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" y_label="Nombre de visiteurs" %}


{% if cumulative_stats %}
Expand Down Expand Up @@ -237,7 +238,7 @@ <h3>{% trans "Échelle de temps" %}</h3>
<h3>Type de graphe</h3>
<ul>
<li>
<button id="graph_type_toogle">-</button>
<button id="graph_type_toggle">-</button>
</li>
</ul>
</div>
Expand Down
35 changes: 11 additions & 24 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,28 +773,15 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

chart.js@2.9.4:
version "2.9.4"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"

chartjs-color-string@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
dependencies:
color-name "^1.0.0"
chart.js@3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.1.tgz#73e24d23a4134a70ccdb5e79a917f156b6f3644a"
integrity sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ==

chartjs-color@^2.1.0:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^1.9.3"
chartjs-adapter-moment@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chartjs-adapter-moment/-/chartjs-adapter-moment-1.0.0.tgz#9174b1093c68bcfe285aff24f7388ad60d44e8f7"
integrity sha512-PqlerEvQcc5hZLQ/NQWgBxgVQ4TRdvkW3c/t+SUEQSj78ia3hgLkf2VZ2yGJtltNbEEFyYGm+cA6XXevodYvWA==

"chokidar@>=3.0.0 <4.0.0":
version "3.5.1"
Expand Down Expand Up @@ -950,7 +937,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"

color-convert@^1.9.0, color-convert@^1.9.3:
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
Expand All @@ -969,7 +956,7 @@ color-name@1.1.3:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

color-name@^1.0.0, color-name@~1.1.4:
color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
Expand Down Expand Up @@ -4026,7 +4013,7 @@ mkdirp@^0.5.1, mkdirp@~0.5.1:
dependencies:
minimist "^1.2.5"

moment@2.29.1, moment@^2.10.2:
moment@2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
Expand Down