Merge pull request #242 from SchoodEIP/chart-fix

Chart fix
SchoodEIP · May 30, 2024 · 06bf24a · 06bf24a
2 parents c12a8a6 + f594f06
commit 06bf24a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Components/Questionnaire/teacherFormContent.jsx b/src/Components/Questionnaire/teacherFormContent.jsx
@@ -70,7 +70,7 @@ const TeacherFormContent = (props) => {
                       <li className='answer' style={question.active ? { display: 'flex', gap: '25px' } : { display: 'none' }} key={i}>
                         <span style={{ listStyle: 'none' }}>{answer.title}</span>
                         <div className='percentage-container'>
-                          <span data-testid={`multiple-answer-${i}`}>{answer.count}</span>
+                          <span data-testid={`multiple-answer-${i}`}>{answer?.count ? answer?.count : 0}</span>
                         </div>
                       </li>
                     ))}

diff --git a/src/Users/Student/statisticsStudent.jsx b/src/Users/Student/statisticsStudent.jsx
@@ -160,7 +160,7 @@ const StudentStatPage = () => {
     } else {
       createChart()
     }
-  }, [moodData])
+  }, [moodData, chart])
 
   const calculateStartDate = (date, filter) => {
     const selectedDate = new Date(date)

diff --git a/src/Users/Teacher/statisticsTeacher.jsx b/src/Users/Teacher/statisticsTeacher.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import HeaderComp from '../../Components/Header/headerComp'
-import { Chart } from 'chart.js/auto'
+import  Chart  from 'chart.js/auto'
 import '../../css/pages/homePage.scss'
 import '../../css/pages/statistiques.scss'
 import { library } from '@fortawesome/fontawesome-svg-core'