Merge pull request #196 from Arquisoft/Leaderboard_Fix

Leaderboard and questions fix
Arquisoft · Apr 17, 2024 · 62ce7f8 · 62ce7f8
2 parents 191e138 + 838b10e
commit 62ce7f8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/webapp/src/components/leaderboard/RankingTable.tsx b/webapp/src/components/leaderboard/RankingTable.tsx
@@ -49,7 +49,7 @@ export default function RankingTable() {
                     <th className="avatar"></th>
                     <th className="ranking">RANKING</th>
                     <th className="correct-answers">CORRECT ANSWERS</th>
-                    <th className="progress"></th>
+                    <th className="progress">% CORRECT ANSWERS</th>
                 </tr>
             </thead>
             <tbody>
@@ -69,10 +69,10 @@ export default function RankingTable() {
                                 <td className="correct-answers">{user.correctAnswers}</td>
                                 <td className="progress">
                                     <CircularProgress 
-                                        value={user.totalAnswers - (user.totalAnswers - user.correctAnswers)} 
+                                        value={ user.totalAnswers > 0 ? (Math.round(((user.correctAnswers / user.totalAnswers) * 100) * 100) / 100) : 0} 
                                         color='#00A078' thickness='.4rem'
                                         size={"3.6rem"}>
-                                        <CircularProgressLabel>{user.totalAnswers - (user.totalAnswers - user.correctAnswers)}%</CircularProgressLabel>
+                                        <CircularProgressLabel>{user.totalAnswers > 0 ? (Math.round(((user.correctAnswers / user.totalAnswers) * 100) * 100) / 100).toFixed(0) : 0}%</CircularProgressLabel>
                                     </CircularProgress>
                                 </td>
                             </tr>

diff --git a/wikidataservice/src/Models/Question-Model.json b/wikidataservice/src/Models/Question-Model.json
@@ -26,13 +26,13 @@
     "topic":"Geography"
   },
   {
-    "question": "Which is the highest point of: ",
+    "question": "Which is the highest point in: ",
     "themeId": "Q6256",
     "attributeId": "P610",
     "topic":"Geography"
   },
   {
-    "question": "Who is the actual trainer of: ",
+    "question": "Who is the actual coach of: ",
     "themeId": "Q476028",
     "attributeId": "P286",
     "topic":"Sport"
@@ -50,7 +50,7 @@
     "topic":"Entertainment"
   },
   {
-    "question": "Who did the song: ",
+    "question": "Who wrote the song: ",
     "themeId": "Q7366",
     "attributeId": "P86",
     "topic":"Entertainment"
@@ -62,13 +62,13 @@
     "topic":"Entertainment"
   },
   {
-    "question": "What is the element of: ",
+    "question": "What is the chemical element for: ",
     "themeId": "Q11344",
     "attributeId": "P246",
     "topic":"Chemistry"
   },
   {
-    "question": "Who is the chemical formula of: ",
+    "question": "Who is the chemical formula for: ",
     "themeId": "Q11173",
     "attributeId": "P274",
     "topic":"Chemistry"

diff --git a/wikidataservice/src/Services/QueryGenerator.js b/wikidataservice/src/Services/QueryGenerator.js
@@ -10,9 +10,9 @@ class QueryGenerator {
         for (let item of items) {
             if (item.hasOwnProperty('year')) {
                 // If the item has a year property, generate a query with the date parsed
-                query = this.generateSparqlQueryYear(item.themeId, item.attributeId, 5);
+                query = this.generateSparqlQueryYear(item.themeId, item.attributeId, 200);
             } else {
-                query = this.generateSparqlQuery(item.themeId, item.attributeId, 5);
+                query = this.generateSparqlQuery(item.themeId, item.attributeId, 200);
             }
 
             let obj = {

diff --git a/wikidataservice/src/Services/QuestionGenerator.js b/wikidataservice/src/Services/QuestionGenerator.js
@@ -26,7 +26,7 @@ function generateQuestions(questionMessage, dataSet, numberQuestions = 10){
         const wrongIds = new Set();
         for (let w = 1; w < 4; w++) {
             let wrongId = Math.floor(Math.random()*dataSet.length);
-            while (idsList[j] === wrongId || wrongIds.has(wrongId)) {
+            while (idsList[j] === wrongId || wrongIds.has(wrongId) || answers.includes(dataSet[wrongId].attributeLabel.value)) {
                 wrongId = Math.floor(Math.random()*dataSet.length);
             }
             // Add the id of the incorrect answer to the set