From 96466dedf767ff4b19e9d5b9ea17f400f2a835ed Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 19 Dec 2022 15:35:43 +0100 Subject: [PATCH 1/2] Fix a recurrent survey reloading --- ui/src/routes/surveys/[sid]/+page.svelte | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ui/src/routes/surveys/[sid]/+page.svelte b/ui/src/routes/surveys/[sid]/+page.svelte index 9b259c6..5c44d08 100644 --- a/ui/src/routes/surveys/[sid]/+page.svelte +++ b/ui/src/routes/surveys/[sid]/+page.svelte @@ -10,12 +10,8 @@ export let data; let survey = null; - $: { - survey = data.survey; - if (survey.direct && !$user.is_admin) { - goto(`surveys/${survey.id}/live`); - } - } + $: survey = data.survey; + $: if (survey.direct && !$user.is_admin) goto(`surveys/${survey.id}/live`); let edit = false; From 8ed2526f97587b01716cb29202d0aa4adbaea857 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 19 Dec 2022 15:36:19 +0100 Subject: [PATCH 2/2] Add tooltips on survey badges --- ui/src/lib/components/SurveyBadge.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/lib/components/SurveyBadge.svelte b/ui/src/lib/components/SurveyBadge.svelte index 6779d98..1b7a241 100644 --- a/ui/src/lib/components/SurveyBadge.svelte +++ b/ui/src/lib/components/SurveyBadge.svelte @@ -5,9 +5,9 @@ {#if survey.direct != null}Direct -{:else if survey.startAvailability() > Date.now()}Prévu -{:else if survey.endAvailability() > Date.now()}En cours +{:else if survey.startAvailability() > Date.now()}Prévu +{:else if survey.endAvailability() > Date.now()}En cours {:else if !survey.__start_availability}Nouveau -{:else if !survey.corrected}Terminé -{:else}Corrigé +{:else if !survey.corrected}Terminé +{:else}Corrigé {/if}