LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fixed #82

Browse Source
This commit is contained in:
Mawoka
2022-08-26 18:46:03 +02:00
parent 6d3a27f566
commit f1c463c2d7
6 changed files with 128 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/lib/admin.svelte
+13 -7
View File
@@ -6,7 +6,7 @@
<script lang="ts">
import type { QuizData } from '$lib/quiz_types';
import { getLocalization } from '$lib/i18n';
import { get_question_title, getWinnersSorted } from '$lib/admin.ts';
import { get_question_title } from '$lib/admin.ts';
import type { PlayerAnswer } from '$lib/admin.ts';
import { socket } from './socket';
@@ -48,12 +48,14 @@
socket.on('final_results', (data) => {
// data = JSON.parse(data);
final_results = data;
console.log(getWinnersSorted(quiz_data, final_results));
});
socket.on('question_results', (data) => {
question_results = JSON.parse(data);
try {
question_results = JSON.parse(data);
} catch {
question_results = undefined;
}
});
const timer = (time: string) => {
@@ -71,9 +73,7 @@
};
</script>
{#if timer_res === undefined}
<span>Select a question to start!</span>
{:else if !final_results_clicked}
{#if timer_res !== undefined && !final_results_clicked}
<div class="w-full flex justify-center">
<span>{$t('admin_page.time_left')}: {timer_res}</span>
</div>
@@ -89,6 +89,12 @@
>{$t('admin_page.get_results')}</button
>
</div>
{:else if question_results === undefined}
{#if !final_results_clicked}
<div class="w-full flex justify-center">
<h1 class="text-3xl">{$t('admin_page.no_answers')}</h1>
</div>
{/if}
{:else}
<div class="w-full flex justify-center">
<div class="relative overflow-x-auto shadow-md rounded-lg">
frontend/src/lib/admin.ts
+21 -16
View File
@@ -23,21 +23,6 @@ export const getWinnersSorted = (
) => {
const winners = {};
const q_count = quiz_data.questions.length;
for (let i = 0; i < q_count; i++) {
const q_res = final_results[i];
if (q_res === null) {
continue;
}
for (let j = 0; j < q_res.length; j++) {
const res = q_res[j];
if (res['right']) {
if (winners[res['username']] === undefined) {
winners[res['username']] = 0;
}
winners[res['username']] += 1;
}
}
}
function sortObjectbyValue(obj) {
const asc = false;
@@ -48,7 +33,27 @@ export const getWinnersSorted = (
return ret;
}
return sortObjectbyValue(winners);
try {
for (let i = 0; i < q_count; i++) {
const q_res = final_results[i];
if (q_res === null) {
continue;
}
for (let j = 0; j < q_res.length; j++) {
const res = q_res[j];
if (res['right']) {
if (winners[res['username']] === undefined) {
winners[res['username']] = 0;
}
winners[res['username']] += 1;
}
}
}
return sortObjectbyValue(winners);
} catch {
return undefined;
}
};
export interface Player {
frontend/src/lib/i18n/locales/en.json
+2 -1
View File
@@ -132,7 +132,8 @@
"get_final_results": "Get final results",
"export_results": "Export results",
"show_next_question": "Show next question",
"start_by_showing_first_question": "Start by showing the first question!"
"start_by_showing_first_question": "Start by showing the first question!",
"no_answers": "No answers!"
},
"password_reset_page": {
"reset_password": "Reset password"
frontend/src/lib/play/end.svelte
+68 -47
View File
@@ -18,24 +18,17 @@
right: string;
}
let data_available = false;
const getWinnersSorted = () => {
let winners = {};
let q_count = quiz_data.questions.length;
for (let i = 0; i < q_count; i++) {
let q_res = final_results[i];
if (q_res === null) {
continue;
}
for (let j = 0; j < q_res.length; j++) {
let res = q_res[j];
if (res['right']) {
if (winners[res['username']] === undefined) {
winners[res['username']] = 0;
}
winners[res['username']] += 1;
}
}
}
console.log(
JSON.stringify(final_results),
JSON.stringify(final_results) === '{}',
'HI!!!!!',
JSON.stringify(final_results) === JSON.stringify({})
);
function sortObjectbyValue(obj) {
const asc = false;
@@ -46,43 +39,71 @@
return ret;
}
return sortObjectbyValue(winners);
try {
for (let i = 0; i < q_count; i++) {
let q_res = final_results[i];
if (q_res === null) {
continue;
}
for (let j = 0; j < q_res.length; j++) {
let res = q_res[j];
if (res['right']) {
if (winners[res['username']] === undefined) {
winners[res['username']] = 0;
}
winners[res['username']] += 1;
}
}
}
winners_arr = Object.keys(winners);
data_available = true;
return sortObjectbyValue(winners);
} catch {
data_available = false;
}
};
let winners = getWinnersSorted();
let winners_arr = Object.keys(winners);
console.log(winners);
let winners_arr;
</script>
<div>
<h1 class="mx-auto text-center text-6xl mt-8">{$t('play_page.end_sentence')}</h1>
<div class="flex mx-auto w-fit flex-col pt-8 gap-2">
<div>
<p class="text-3xl text-center">
{$t('play_page.1st_place')}: <span class="underline">{winners_arr[0]}</span>
<span>with {winners[winners_arr[0]]} out of {quiz_data.questions.length}</span>
</p>
{#if data_available}
<div class="flex mx-auto w-fit flex-col pt-8 gap-2">
<div>
<p class="text-3xl text-center">
{$t('play_page.1st_place')}: <span class="underline">{winners_arr[0]}</span>
<span>with {winners[winners_arr[0]]} out of {quiz_data.questions.length}</span>
</p>
</div>
{#if winners_arr.length >= 2}
<div>
<p class="text-2xl text-center">
{$t('play_page.2nd_place')}: <span class="underline">{winners_arr[1]}</span>
<span
>with {winners[winners_arr[1]]} out of {quiz_data.questions
.length}</span
>
</p>
</div>
{/if}
{#if winners_arr.length >= 3}
<div>
<p class="text-xl text-center">
{$t('play_page.3rd place')}: <span class="underline">{winners_arr[2]}</span>
<span>
{$t('play_page.with_out_of', {
correct_questions: winners[winners_arr[2]],
total_question_count: quiz_data.questions.length
})}
</span>
</p>
</div>
{/if}
</div>
{#if winners_arr.length >= 2}
<div>
<p class="text-2xl text-center">
{$t('play_page.2nd_place')}: <span class="underline">{winners_arr[1]}</span>
<span>with {winners[winners_arr[1]]} out of {quiz_data.questions.length}</span>
</p>
</div>
{/if}
{#if winners_arr.length >= 3}
<div>
<p class="text-xl text-center">
{$t('play_page.3rd place')}: <span class="underline">{winners_arr[2]}</span>
<span>
{$t('play_page.with_out_of', {
correct_questions: winners[winners_arr[2]],
total_question_count: quiz_data.questions.length
})}
</span>
</p>
</div>
{/if}
</div>
{:else}
<div class="flex justify-center">
<h1 class="text-3xl">{$t('admin_page.no_answers')}</h1>
</div>
{/if}
</div>
frontend/src/routes/admin/+page.svelte
+3 -3
View File
@@ -29,7 +29,7 @@
let game_started = false;
let quiz_data: QuizData;
//let question_number = '0';
let question_results = null;
// let question_results = null;
let final_results: Array<null> | Array<Array<PlayerAnswer>> = [null];
let success = false;
let dataexport_download_a;
@@ -58,7 +58,7 @@
errorMessage = $t('admin_page.already_registered_as_admin');
});
socket.on('question_results', (int_data) => {
/* socket.on('question_results', (int_data) => {
try {
int_data = JSON.parse(int_data);
} catch (e) {
@@ -66,7 +66,7 @@
return;
}
question_results = int_data;
});
});*/
socket.on('export_token', (int_data) => {
warnToLeave = false;
dataexport_download_a.href = `/api/v1/quiz/export_data/${int_data}?ts=${new Date().getTime()}&game_pin=${game_pin}`;
frontend/src/routes/play/+page.svelte
+21 -8
View File
@@ -9,6 +9,9 @@
import { navbarVisible } from '$lib/stores';
import ShowEndScreen from '$lib/play/end.svelte';
import { QuizQuestionType } from '$lib/quiz_types';
import { getLocalization } from '$lib/i18n';
const { t } = getLocalization();
// Exports
export let data;
@@ -83,7 +86,11 @@
socket.on('question_results', (data) => {
restart();
answer_results = JSON.parse(data);
try {
answer_results = JSON.parse(data);
} catch {
answer_results = null;
}
});
socket.on('final_results', (data) => {
@@ -124,12 +131,18 @@
/>
{/key}
{:else if gameMeta.started && answer_results !== undefined}
{#key unique}
<ShowResults
bind:results={answer_results}
bind:game_data={gameData}
bind:question_index
/>
{/key}
{#if answer_results === null}
<div class="w-full flex justify-center">
<h1 class="text-3xl">{$t('admin_page.no_answers')}</h1>
</div>
{:else}
{#key unique}
<ShowResults
bind:results={answer_results}
bind:game_data={gameData}
bind:question_index
/>
{/key}
{/if}
{/if}
</div>