diff --git a/src/controller/__pycache__/general_controller.cpython-38.pyc b/src/controller/__pycache__/general_controller.cpython-38.pyc index 6cd5e9b..9f0e51f 100644 Binary files a/src/controller/__pycache__/general_controller.cpython-38.pyc and b/src/controller/__pycache__/general_controller.cpython-38.pyc differ diff --git a/src/controller/general_controller.py b/src/controller/general_controller.py index eade06b..ea42645 100644 --- a/src/controller/general_controller.py +++ b/src/controller/general_controller.py @@ -104,7 +104,7 @@ class StatisticalData(Resource): 'feedback_number', 0) + 1 # age - if not each_content['ageCorrectness']: + if each_content['ageCorrectness'] == False: statistical_data['feedback_data']['age']['wrong'][ each_content['ageFeedback']] = \ statistical_data['feedback_data']['age'][ @@ -116,7 +116,7 @@ class StatisticalData(Resource): each_content['ageFeedback'], 0) + 1 # gender - if not each_content['genderCorrectness']: + if each_content['genderCorrectness'] == False: statistical_data['feedback_data']['gender']['wrong'][ each_content['genderFeedback']] = \ statistical_data['feedback_data']['gender'][ @@ -127,7 +127,7 @@ class StatisticalData(Resource): statistical_data['feedback_data']['gender']['correct'].get( each_content['genderFeedback'], 0) + 1 - if not each_content['emotionCorrectness']: + if each_content['emotionCorrectness'] == False: statistical_data['feedback_data']['emotion']['wrong'][ each_content['emotionFeedback']] = \ statistical_data['feedback_data']['emotion']['wrong'].get( @@ -150,7 +150,7 @@ class StatisticalData(Resource): 'totalNumberOfGenderPrediction': statistical_data['prediction_data']['gender'], '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'], 'totalNumberOfEmotionCorrectFeedback': statistical_data['feedback_data']['emotion']['correct'], diff --git a/src/templates/statisticalPage.html b/src/templates/statisticalPage.html index b3c9bec..f2a4829 100644 --- a/src/templates/statisticalPage.html +++ b/src/templates/statisticalPage.html @@ -163,40 +163,40 @@ }); } - function drawComparisonBar(canvas, labels, dataA, dataB, title) { - new Chart(canvas, { - type: 'bar', - data: { - labels: labels, - datasets: [{ - label: 'Cat', - data: Object.values(dataA), - backgroundColor: - 'rgba(255, 99, 132, 0.2)', - order: 1 - }, - { - label: 'Dog', - data: Object.values(dataB), - type: 'bar', - backgroundColor: - 'rgba(54, 162, 235, 0.2)', - order: 2 - }] - }, - options: { - title: {display: true, text: title}, - legend: {display: true}, - scales: { - yAxes: [{ - ticks: { - beginAtZero: true, - } - }] - }, - } - }); - } + // function drawComparisonBar(canvas, labels, dataA, dataB, title) { + // new Chart(canvas, { + // type: 'bar', + // data: { + // labels: labels, + // datasets: [{ + // label: 'Cat', + // data: Object.values(dataA), + // backgroundColor: + // 'rgba(255, 99, 132, 0.2)', + // order: 1 + // }, + // { + // label: 'Dog', + // data: Object.values(dataB), + // type: 'bar', + // backgroundColor: + // 'rgba(54, 162, 235, 0.2)', + // order: 2 + // }] + // }, + // options: { + // title: {display: true, text: title}, + // legend: {display: true}, + // scales: { + // yAxes: [{ + // ticks: { + // beginAtZero: true, + // } + // }] + // }, + // } + // }); + // } function getTotalPrediction() { $.get("/api/get-statistical-results", function (response) {