diff --git a/src/UI/Popup/TagRendering/Questionbox.svelte b/src/UI/Popup/TagRendering/Questionbox.svelte index 71478b75d..ff789eb76 100644 --- a/src/UI/Popup/TagRendering/Questionbox.svelte +++ b/src/UI/Popup/TagRendering/Questionbox.svelte @@ -29,6 +29,7 @@ */ export let notForLabels: string[] | undefined = undefined const _notForLabels = new Set(notForLabels) + let showAllQuestionsAtOnce = state.userRelatedState.showAllQuestionsAtOnce function allowed(labels: string[]) { if (onlyForLabels?.length > 0 && !labels.some((l) => _onlyForLabels.has(l))) { @@ -67,11 +68,12 @@ }, [skippedQuestions] ) + let firstQuestion = questionsToAsk.map(qta => qta[0]) let answered: number = 0 let skipped: number = 0 - function skip(question: TagRenderingConfig, didAnswer: boolean = false) { + function skip(question: {id: string}, didAnswer: boolean = false) { skippedQuestions.data.add(question.id) skippedQuestions.ping() if (didAnswer) { @@ -136,36 +138,34 @@ {/if} {:else}
- + {#if $showAllQuestionsAtOnce}
{#each $questionsToAsk as question (question.id)} {/each}
- -
- { - skip($questionsToAsk[0], true) + skip($firstQuestion, true) }} > -
-
+ {/if}
{/if} diff --git a/src/UI/Popup/TagRendering/SpecialTranslation.svelte b/src/UI/Popup/TagRendering/SpecialTranslation.svelte index 84a37969c..52b414af4 100644 --- a/src/UI/Popup/TagRendering/SpecialTranslation.svelte +++ b/src/UI/Popup/TagRendering/SpecialTranslation.svelte @@ -29,8 +29,9 @@ let specs: RenderingSpecification[] = [] $: { try { + txt = t.textFor($language) if (txt !== undefined) { - const key = "cached_special_spec_" + $language + let key = "cached_special_spec_" + $language specs = t[key] if (specs === undefined) { specs = SpecialVisualizations.constructSpecification(txt) @@ -67,6 +68,6 @@ {:else if $tags !== undefined} - + createVisualisation(specpart)} /> {/if} {/each} diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte index 67ce1cc0c..9db0c8ccd 100644 --- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte +++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte @@ -172,6 +172,8 @@ state?.featureSwitches?.featureSwitchIsDebugging ?? new ImmutableStore(false) let showTags = state?.userRelatedState?.showTags ?? new ImmutableStore(undefined) let numberOfCs = state?.osmConnection?.userDetails?.data?.csCount ?? 0 + let question = config.question + $: question = config.question if (state?.osmConnection) { onDestroy( state.osmConnection?.userDetails?.addCallbackAndRun((ud) => { @@ -181,7 +183,7 @@ } -{#if config.question !== undefined} +{#if question !== undefined}