First batch of data, and modification to take them into account
Also optimized fonts, after discovering (when having all photos in one page) they were too heavy.
This commit is contained in:
@ -7,7 +7,7 @@ jQuery(document).ready(function($)
|
||||
labels: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
|
||||
datasets: [{
|
||||
label: 'nombre de tableaux',
|
||||
data: [13, 30, 40, 34, 50, 33, 27, 23, 18, 24, 35, 19],
|
||||
data: [11, 30, 40, 34, 50, 33, 27, 24, 17, 26, 37, 19],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
@ -17,9 +17,9 @@ jQuery(document).ready(function($)
|
||||
scales: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero:true
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
},
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
@ -28,7 +28,7 @@ jQuery(document).ready(function($)
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
@ -38,14 +38,14 @@ jQuery(document).ready(function($)
|
||||
}
|
||||
});
|
||||
|
||||
var canvasMonth2 = document.getElementById("month2").getContext('2d');
|
||||
var chartMonth2 = new Chart(canvasMonth2, {
|
||||
var canvasYear = document.getElementById("year").getContext('2d');
|
||||
var chartYear = new Chart(canvasYear, {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
|
||||
labels: ["1956 - 1959", "1960 - 1969", "1970 - 1979", "1980 - 1989", "1990 - 1999", "2000 - 2009", "2010 - 2016"],
|
||||
datasets: [{
|
||||
label: 'nombre de tableaux',
|
||||
data: [13, 30, 40, 34, 50, 33, 27, 23, 18, 24, 35, 19],
|
||||
data: [24, 16, 7, 57, 117, 112, 52],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
@ -55,9 +55,9 @@ jQuery(document).ready(function($)
|
||||
scales: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero:true
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
},
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
@ -66,7 +66,7 @@ jQuery(document).ready(function($)
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
@ -76,14 +76,14 @@ jQuery(document).ready(function($)
|
||||
}
|
||||
});
|
||||
|
||||
var canvasMonth3 = document.getElementById("month3").getContext('2d');
|
||||
var chartMonth3 = new Chart(canvasMonth3, {
|
||||
var canvasDimension = document.getElementById("dimension").getContext('2d');
|
||||
var chartDimension = new Chart(canvasDimension, {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
|
||||
labels: ["< 20cm", "20cm - 29cm", "30cm - 39cm", "40cm - 49cm", "50cm - 59cm", "60cm - 69cm", "70cm - 79cm", "80cm - 89cm", "90cm - 99cm", ">= 100cm"],
|
||||
datasets: [{
|
||||
label: 'nombre de tableaux',
|
||||
data: [13, 30, 40, 34, 50, 33, 27, 23, 18, 24, 35, 19],
|
||||
data: [1, 60, 54, 97, 50, 54, 11, 2, 1, 2],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
@ -93,9 +93,9 @@ jQuery(document).ready(function($)
|
||||
scales: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero:true
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
},
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
@ -104,7 +104,7 @@ jQuery(document).ready(function($)
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display:false
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
|
Reference in New Issue
Block a user