From 8ff87b6a4f8c1fffe0c60be663f0e74392cb651b Mon Sep 17 00:00:00 2001
From: Pei-Yun Sun <pssun@unimelb.edu.au>
Date: Tue, 20 Oct 2020 15:11:44 +1100
Subject: [PATCH] finished statistical UI

---
 .../general_controller.cpython-38.pyc         | Bin 5503 -> 5515 bytes
 src/controller/general_controller.py          |   8 +--
 src/templates/statisticalPage.html            |  68 +++++++++---------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/controller/__pycache__/general_controller.cpython-38.pyc b/src/controller/__pycache__/general_controller.cpython-38.pyc
index 6cd5e9b931cfcaf93d231b9f0a08006a85bfa2c8..9f0e51f29da519e2caa8e9bcb958250bf56203ad 100644
GIT binary patch
delta 387
zcmeyb)ve7N%FD~e00idAeetU|^4f4PhHduZ&|vnSQ7cd*kRl_=P%Bs?=)y38F}A5z
zsD^ccP>O5{<3gqsF>!_())ZMAh8m$1IZ1{T`D~^M%te!cVq8ETClGT>GAs}R$|_8L
z&n-In95<V^f+T|tL!Jqe8XhDy(&}J&pbkZ-c`QX-P_<G><|$3q<&ln6LNN;@4>JoW
zgXBVxYoM|~lfk-xv@%c><YJbhCa4Y4KoOXWRVFXwk!Dnxyq8B3NG{|NWe1uK)TJ`{
zGtX2()j7Pi!X=_L!YOLaOu-DA>YHcsUS(u-+nmSm%qXHzl3$XT<5!xSlv?DU=AN3D
el3KL+n1C!ZBj02`5e+6b5T(h;x7k9(oe=<AVp?zj

delta 400
zcmeCy{;$Ow%FD~e00f`y`r_wq<h9{o^xEvjp~39lQ!7v-kRl_=P%Bs?=)y38F}AE$
zsD^ccP>O5{<3gqsF>!_())ZMAh8m$1IZ1{I%*A~`K9?jz3MUYAOEN4F0?Now-peiR
zDlf@k!;oi!B+mnr2dYJw2Gb3c1?dIp0@4aV(^-m{CM)s?%PL~1mx9;^RHryOkVleH
zadI|~v@%c~Sg#UTZyD5PX(X2^PhQI-ZLW;sGLSsXWk4A;mqBHLHYrd3&ofm}We#tx
zaEWM*aEfX(Q!s<3+UBLaR~a`~^E)$&DwgDzB<A>)<|d^U`KP(3=B1<-rEI<=Aj{0i
aHTi?ECYaP<VdY{Ln5-b8xH(-!g%JRbrdzrI

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) {