From 1642e2d211c961787d852aaadeed7478b56e1054 Mon Sep 17 00:00:00 2001 From: Ota Prokopec Date: Thu, 3 Nov 2022 18:50:20 +0100 Subject: [PATCH 1/2] fix pr/forms bugs --- src/lib/Components/Forms/NumberForm.svelte | 4 ++-- src/lib/Components/Forms/Renderer.svelte | 5 ++--- src/lib/Components/Forms/SingleChoiceForm.svelte | 7 ++++--- src/lib/Components/Forms/TextForm.svelte | 4 ++-- src/lib/Components/game/Map/Circle.svelte | 9 +++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/lib/Components/Forms/NumberForm.svelte b/src/lib/Components/Forms/NumberForm.svelte index 5f59117..b2bc977 100644 --- a/src/lib/Components/Forms/NumberForm.svelte +++ b/src/lib/Components/Forms/NumberForm.svelte @@ -4,7 +4,7 @@ import parseQuestion from '$lib/utils/parseQuestion' export let gameData - let answers = parseQuestion(gameData.question.answer, gameData.question.type) + let answer = parseQuestion(gameData.question.answer, gameData.question.type) let myAnswer = '' export let nextQuestion @@ -18,7 +18,7 @@ myAnswer = '' }} {control} - on:submit={() => (control = myAnswer !== '' ? myAnswer === answers.answer : null)} + on:submit={() => (control = myAnswer !== '' ? myAnswer == answer : null)} > {gameData.name} {@html gameData.question.question} diff --git a/src/lib/Components/Forms/Renderer.svelte b/src/lib/Components/Forms/Renderer.svelte index b0d9e17..955f32e 100644 --- a/src/lib/Components/Forms/Renderer.svelte +++ b/src/lib/Components/Forms/Renderer.svelte @@ -38,14 +38,13 @@ export let gameData = {} //data $: answers = parseQuestion(gameData.questions[clientAnswers.pos].answer, gameData.questions[clientAnswers.pos].type) //delete - + let page + $: page = components[gameData.questions[clientAnswers.pos].type] let clientAnswers = { pos: 0, end: gameData.questions.length, //kolik otázek points: 0, //body } - let page - $: page = components[gameData.questions[clientAnswers.pos].type] /*jen pro tedkon, pozdeji vymazat az bude singlechoise a multichoise oddelene*/ $: page = gameData.questions[clientAnswers.pos].type === 'CHOICE' ? components[vals()] : page diff --git a/src/lib/Components/Forms/SingleChoiceForm.svelte b/src/lib/Components/Forms/SingleChoiceForm.svelte index 8159f33..c32c9f2 100644 --- a/src/lib/Components/Forms/SingleChoiceForm.svelte +++ b/src/lib/Components/Forms/SingleChoiceForm.svelte @@ -10,10 +10,11 @@ export let control = null export let nextQuestion - const rightAnswer = () => - answers.map((item) => { + const rightAnswer = () => { + return answers.filter((item) => { if (item.value) return item.label - }) + })[0].label + } (control = myAnswer !== '' ? compare(myAnswer, answers.answer) : null)} + on:submit={() => (control = myAnswer !== '' ? compare(myAnswer, answer) : null)} > {gameData.name} {@html gameData.question.question} diff --git a/src/lib/Components/game/Map/Circle.svelte b/src/lib/Components/game/Map/Circle.svelte index c4e83d8..acb51e4 100644 --- a/src/lib/Components/game/Map/Circle.svelte +++ b/src/lib/Components/game/Map/Circle.svelte @@ -2,14 +2,15 @@ import { Marker } from '@beyonk/svelte-mapbox' import { createEventDispatcher, getContext } from 'svelte' - export let lat, lng - export let width = 0.004 + export let lat = null + export let lng = null + export let round = (1 / 110.574 / 1000) * 12 * 5222525 //cca 12m nutno pozměnit!!!!!!!!!! tento komentář nemazat export let user = { lat: 0, lng: 0 } const dispatch = createEventDispatcher() - let Mlat = [lat - width, lat + width] - let Mlng = [lng - width, lng + width] + let Mlat = [lat - round, lat + round] + let Mlng = [lng - round, lng + round] $: isIn = user ? user.lat > Mlat[0] && user.lat < Mlat[1] && user.lng > Mlng[0] && user.lng < Mlng[1] : null From 6acaa7377767d7e6777e5e0de1348f72ce000fef Mon Sep 17 00:00:00 2001 From: Ota Prokopec Date: Thu, 3 Nov 2022 19:13:01 +0100 Subject: [PATCH 2/2] map fixed --- src/lib/Components/game/Map/Circle.svelte | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/Components/game/Map/Circle.svelte b/src/lib/Components/game/Map/Circle.svelte index acb51e4..6876053 100644 --- a/src/lib/Components/game/Map/Circle.svelte +++ b/src/lib/Components/game/Map/Circle.svelte @@ -4,13 +4,14 @@ export let lat = null export let lng = null - export let round = (1 / 110.574 / 1000) * 12 * 5222525 //cca 12m nutno pozměnit!!!!!!!!!! tento komentář nemazat + export let round = (1 / 110.574 / 1000) * 12 //cca 12m nutno pozměnit!!!!!!!!!! tento komentář nemazat + console.log({ round, lat, lng }) export let user = { lat: 0, lng: 0 } const dispatch = createEventDispatcher() - let Mlat = [lat - round, lat + round] - let Mlng = [lng - round, lng + round] + const Mlat = [lat - round, lat + round] + const Mlng = [lng - round, lng + round] $: isIn = user ? user.lat > Mlat[0] && user.lat < Mlat[1] && user.lng > Mlng[0] && user.lng < Mlng[1] : null