diff --git a/frontend/src/assets/base.css b/frontend/src/assets/base.css index 6bd57dc..4ed1773 100644 --- a/frontend/src/assets/base.css +++ b/frontend/src/assets/base.css @@ -15,3 +15,10 @@ color: var(--rvo-color-hemelblauw); font-weight: bold; } + +#progress-question-mobile { + @media only screen and (width <= 800px) { + display: flex; + align-items: center; + } +} diff --git a/frontend/src/components/BeslisboomForm.vue b/frontend/src/components/BeslisboomForm.vue index cbeef29..fb17a88 100644 --- a/frontend/src/components/BeslisboomForm.vue +++ b/frontend/src/components/BeslisboomForm.vue @@ -87,20 +87,20 @@ onMounted(async () => { } }) -function handleVersions(question_or_conclusion_id: string){ +function handleVersions(question_or_conclusion_id: string) { let category: Category | undefined - let versions = question_or_conclusion_id.split(".") + let versions = question_or_conclusion_id.split('.') category = data_categories.value.find((q) => q.questionId === versions[0]) if (versions.length >= 2) { // Only overwrite if we find something here let category_overwrite = data_categories.value.find((q) => q.questionId === versions[0] + '.' + versions[1]) - if(category_overwrite != undefined){ + if (category_overwrite != undefined) { category = category_overwrite } } - if (versions.length >= 3 ){ - let category_overwrite = data_categories.value.find((q) => q.questionId === versions[0] + '.' + versions[1] + "." + versions[2]) - if(category_overwrite != undefined){ + if (versions.length >= 3) { + let category_overwrite = data_categories.value.find((q) => q.questionId === versions[0] + '.' + versions[1] + '.' + versions[2]) + if (category_overwrite != undefined) { category = category_overwrite } } @@ -108,7 +108,7 @@ function handleVersions(question_or_conclusion_id: string){ } const currentCategory = computed(() => { - if (questionId.value){ + if (questionId.value) { return handleVersions(questionId.value) } else { questionStore.updateLabelsAtConclusion() @@ -162,6 +162,7 @@ function reset() { function back() { questionStore.revertAnswer(previousCategory.value) + conclusionId.value = '' categoryStore.revertCurrentCategory() } @@ -175,11 +176,13 @@ function acceptDisclaimer() {
-
+
-
+
-
+
+ -
- -
diff --git a/frontend/src/components/Conclusion.vue b/frontend/src/components/Conclusion.vue index 079e325..cc53f42 100644 --- a/frontend/src/components/Conclusion.vue +++ b/frontend/src/components/Conclusion.vue @@ -11,6 +11,7 @@ interface Props { } defineProps() +defineEmits(['back']) diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue index ac7246f..e8956a3 100644 --- a/frontend/src/components/Header.vue +++ b/frontend/src/components/Header.vue @@ -13,7 +13,7 @@ const emit = defineEmits(['reset-event'])
-
+