finished statistical UI

This commit is contained in:
Pei-Yun Sun 2020-10-20 15:11:44 +11:00
parent f4a97c8987
commit 8ff87b6a4f
3 changed files with 38 additions and 38 deletions

View File

@ -104,7 +104,7 @@ class StatisticalData(Resource):
'feedback_number', 0) + 1 'feedback_number', 0) + 1
# age # age
if not each_content['ageCorrectness']: if each_content['ageCorrectness'] == False:
statistical_data['feedback_data']['age']['wrong'][ statistical_data['feedback_data']['age']['wrong'][
each_content['ageFeedback']] = \ each_content['ageFeedback']] = \
statistical_data['feedback_data']['age'][ statistical_data['feedback_data']['age'][
@ -116,7 +116,7 @@ class StatisticalData(Resource):
each_content['ageFeedback'], 0) + 1 each_content['ageFeedback'], 0) + 1
# gender # gender
if not each_content['genderCorrectness']: if each_content['genderCorrectness'] == False:
statistical_data['feedback_data']['gender']['wrong'][ statistical_data['feedback_data']['gender']['wrong'][
each_content['genderFeedback']] = \ each_content['genderFeedback']] = \
statistical_data['feedback_data']['gender'][ statistical_data['feedback_data']['gender'][
@ -127,7 +127,7 @@ class StatisticalData(Resource):
statistical_data['feedback_data']['gender']['correct'].get( statistical_data['feedback_data']['gender']['correct'].get(
each_content['genderFeedback'], 0) + 1 each_content['genderFeedback'], 0) + 1
if not each_content['emotionCorrectness']: if each_content['emotionCorrectness'] == False:
statistical_data['feedback_data']['emotion']['wrong'][ statistical_data['feedback_data']['emotion']['wrong'][
each_content['emotionFeedback']] = \ each_content['emotionFeedback']] = \
statistical_data['feedback_data']['emotion']['wrong'].get( statistical_data['feedback_data']['emotion']['wrong'].get(
@ -150,7 +150,7 @@ class StatisticalData(Resource):
'totalNumberOfGenderPrediction': statistical_data['prediction_data']['gender'], 'totalNumberOfGenderPrediction': statistical_data['prediction_data']['gender'],
'totalNumberOfGenderCorrectFeedback': statistical_data['feedback_data']['gender']['correct'], 'totalNumberOfGenderCorrectFeedback': statistical_data['feedback_data']['gender']['correct'],
'totalNumberOfGenderdWrongFeedback': statistical_data['feedback_data']['gender']['wrong'], 'totalNumberOfGenderWrongFeedback': statistical_data['feedback_data']['gender']['wrong'],
'totalNumberOfEmotionPrediction': statistical_data['prediction_data']['emotion'], 'totalNumberOfEmotionPrediction': statistical_data['prediction_data']['emotion'],
'totalNumberOfEmotionCorrectFeedback': statistical_data['feedback_data']['emotion']['correct'], 'totalNumberOfEmotionCorrectFeedback': statistical_data['feedback_data']['emotion']['correct'],

View File

@ -163,40 +163,40 @@
}); });
} }
function drawComparisonBar(canvas, labels, dataA, dataB, title) { // function drawComparisonBar(canvas, labels, dataA, dataB, title) {
new Chart(canvas, { // new Chart(canvas, {
type: 'bar', // type: 'bar',
data: { // data: {
labels: labels, // labels: labels,
datasets: [{ // datasets: [{
label: 'Cat', // label: 'Cat',
data: Object.values(dataA), // data: Object.values(dataA),
backgroundColor: // backgroundColor:
'rgba(255, 99, 132, 0.2)', // 'rgba(255, 99, 132, 0.2)',
order: 1 // order: 1
}, // },
{ // {
label: 'Dog', // label: 'Dog',
data: Object.values(dataB), // data: Object.values(dataB),
type: 'bar', // type: 'bar',
backgroundColor: // backgroundColor:
'rgba(54, 162, 235, 0.2)', // 'rgba(54, 162, 235, 0.2)',
order: 2 // order: 2
}] // }]
}, // },
options: { // options: {
title: {display: true, text: title}, // title: {display: true, text: title},
legend: {display: true}, // legend: {display: true},
scales: { // scales: {
yAxes: [{ // yAxes: [{
ticks: { // ticks: {
beginAtZero: true, // beginAtZero: true,
} // }
}] // }]
}, // },
} // }
}); // });
} // }
function getTotalPrediction() { function getTotalPrediction() {
$.get("/api/get-statistical-results", function (response) { $.get("/api/get-statistical-results", function (response) {