From ab78e6adf3d7e8c4c625461d8201c20b900145c8 Mon Sep 17 00:00:00 2001
From: thilo
Date: Sun, 22 Mar 2020 13:28:10 +0100
Subject: [PATCH 1/4] fixed result measure
---
src/views/Results.vue | 31 +++++++++++++++++++++++++++----
1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 19f3636..e00a2ad 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -1,6 +1,9 @@
Ihre Wahrscheinlichkeit sich zu infizieren ist
+
hoch
+
durchschnittlich
+
niedrig
Auf Folgendes sollten Sie achten:
{{ card.title }}
@@ -23,12 +26,17 @@
export default {
name: "Results",
mounted() {
- /*const biased = this.$store.state.answers.map((x, i) => {
+ const summed = this.$store.state.answers.map((x, i) => {
return x * this.$store.state.questions[i].multiplicator
- })
- const summed = biased.reduce(function(acc, current) {
+ }).reduce(function(acc, current) {
return acc + current
- }) */
+ })
+
+ const sumMult = this.$store.state.questions.reduce(function(acc, current) {
+ return acc + current.multiplicator
+ }, 0)
+
+ this.risk = Math.round(summed / sumMult)
for(let i = 0; i < this.$store.state.answers.length; i ++) {
if (this.$store.state.answers[i] < 33) {
@@ -51,6 +59,7 @@
},
data() {
return {
+ risk: -1,
bad: [],
warning: [],
good: []
@@ -81,4 +90,18 @@
.card-advice.alert {
background: rgba(233, 74, 71, 0.25);
}
+ .risk-chance {
+ text-align: center;
+ font-size: 1.5em;
+ font-weight: bold;
+ }
+ .risk-chance.success {
+ color: green;
+ }
+ .risk-chance.warning {
+ color: orange;
+ }
+ .risk-chance.alert {
+ color: red;
+ }
From ece528b441e85d1bc41801e16487cf4adc07bc2e Mon Sep 17 00:00:00 2001
From: thilo
Date: Sun, 22 Mar 2020 13:30:19 +0100
Subject: [PATCH 2/4] colors now comply with mockup
---
src/views/Results.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/Results.vue b/src/views/Results.vue
index e00a2ad..be1169b 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -96,12 +96,12 @@
font-weight: bold;
}
.risk-chance.success {
- color: green;
+ color: #62E160;
}
.risk-chance.warning {
color: orange;
}
.risk-chance.alert {
- color: red;
+ color: #E94A47;
}
From f065fa585229d95f44be5adcb2775a1e87f5255f Mon Sep 17 00:00:00 2001
From: thilo
Date: Sun, 22 Mar 2020 13:43:57 +0100
Subject: [PATCH 3/4] added conditional rendering of text blocks in Results
fixed button alignment in questions
---
src/components/Question.vue | 35 +++++++++++++++++++++--------------
src/views/Results.vue | 6 +++---
2 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/components/Question.vue b/src/components/Question.vue
index ed5d988..5cbe5d0 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -15,21 +15,23 @@
{{ question }}
-
-
-
+
-
-
-
-
-
-
@@ -97,4 +99,9 @@
cursor: pointer;
}
+ .buttons {
+ position: absolute;
+ bottom: 0;
+ padding: 1em;
+ }
diff --git a/src/views/Results.vue b/src/views/Results.vue
index be1169b..a5347aa 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -4,17 +4,17 @@
hoch
durchschnittlich
niedrig
-
Auf Folgendes sollten Sie achten:
+
Auf Folgendes sollten Sie achten:
{{ card.title }}
{{ card.description }}
-
Hier können Sie sich noch verbessern:
+
Hier können Sie sich noch verbessern:
{{ card.title }}
{{ card.description }}
-
Das machen Sie schon gut:
+
Das machen Sie schon gut:
{{ card.title }}
{{ card.description }}
From 3948f6dce47e26817266038e68875902c710d79b Mon Sep 17 00:00:00 2001
From: thilo
Date: Sun, 22 Mar 2020 14:21:58 +0100
Subject: [PATCH 4/4] based navigation on router
---
src/App.vue | 11 ++++++++++-
src/components/Question.vue | 23 +++++++++++++++++++----
src/router/index.js | 4 ++--
src/store/index.js | 20 ++------------------
src/views/HelpPage.vue | 21 +++++++++++++++++----
src/views/Questionnaire.vue | 8 ++++----
src/views/Warning.vue | 2 +-
7 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4576eeb..ee35e22 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
-
+
+
+
@@ -86,4 +88,11 @@
line-height: 1.35em;
font-size: 24px;
}
+
+ .fade-enter-active, .fade-leave-active {
+ transition: opacity .5s;
+ }
+ .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+ opacity: 0;
+ }
diff --git a/src/components/Question.vue b/src/components/Question.vue
index 5cbe5d0..c8dc353 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -29,13 +29,15 @@
v-for="answer in answers"
v-on:click="answerQuestion(answer.value)">{{ answer.text }}
-
+
diff --git a/src/views/Questionnaire.vue b/src/views/Questionnaire.vue
index 03e4628..2cf8099 100644
--- a/src/views/Questionnaire.vue
+++ b/src/views/Questionnaire.vue
@@ -4,9 +4,9 @@
+ v-bind:type="$store.state.questions[$route.params.id].type"
+ v-bind:question="$store.state.questions[$route.params.id].question"
+ v-bind:answers="$store.state.questions[$route.params.id].answers">
@@ -17,7 +17,7 @@
components: {Question},
methods: {
getDotClass(n) {
- if (n <= this.$store.state.currentQuestion) {
+ if (n <= this.$route.params.id) {
return "point answered"
} else {
return "point"
diff --git a/src/views/Warning.vue b/src/views/Warning.vue
index bdc9c4a..f35c4cc 100644
--- a/src/views/Warning.vue
+++ b/src/views/Warning.vue
@@ -24,6 +24,6 @@
Bereitschaftsdienst unter 116117 an.
-
+