From bd077f1ad79c24984816cfbfe681fef75a3eb3ba Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 10 Aug 2023 16:14:58 +0200 Subject: [PATCH 1/3] Add info text to license activation page --- client/src/pages/license-activation.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/src/pages/license-activation.vue b/client/src/pages/license-activation.vue index 721b87cd..4b968706 100644 --- a/client/src/pages/license-activation.vue +++ b/client/src/pages/license-activation.vue @@ -11,7 +11,8 @@ novalidate @submit="validateBeforeSubmit" > -

Geben Sie einen Coupon-Code ein

+

Geben Sie einen Coupon-Code ein

+

Den Zugangscode zur Klasse erhalten Sie von Ihrer Lehrperson.

@import 'styles/helpers'; +.license-activation { + &__heading { + margin-bottom: $small-spacing; + } + + &__license-info { + margin-bottom: $medium-spacing; + } +} + .text-link { font-family: $sans-serif-font-family; color: $color-brand; From c3db7dd25f826433258ad20c138ad109caef1066 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 14 Aug 2023 16:10:30 +0200 Subject: [PATCH 2/3] Change test license duration, add "test" to description --- server/users/licenses.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/server/users/licenses.py b/server/users/licenses.py index 79c15e10..f67af2d7 100644 --- a/server/users/licenses.py +++ b/server/users/licenses.py @@ -63,14 +63,14 @@ MYKV_LICENSES = { }, "978-3-0355-2189-4": { "edition": STUDENT_KEY, - "duration": 400, - "name": "Student test 1 month", + "duration": 30, + "name": "Student 1 Monat Testlizenz", "platform": MYKV_PLATFORM, }, "978-3-0355-2188-7": { "edition": TEACHER_KEY, - "duration": 400, - "name": "Student test 1 month", + "duration": 30, + "name": "Lehrperson 1 Monat Testlizenz", "platform": MYKV_PLATFORM, }, } @@ -91,14 +91,14 @@ MYDHA_LICENSES = { }, "978-3-0355-2276-1": { "edition": TEACHER_KEY, - "duration": 260, - "name": "myDetailhandel DHA - Lehrpersonen (Lizenz)", + "duration": 30, + "name": "myDetailhandel DHA - Lehrpersonen (Testlizenz)", "platform": MYDHA_PLATFORM, }, "978-3-0355-2275-4": { "edition": STUDENT_KEY, - "duration": 260, - "name": "myDetailhandel DHA - Lernende (Lizenz)", + "duration": 30, + "name": "myDetailhandel DHA - Lernende (Testlizenz)", "platform": MYDHA_PLATFORM, }, } @@ -119,14 +119,14 @@ MYDHF_LICENSES = { }, "978-3-0355-2274-7": { "edition": TEACHER_KEY, - "duration": 260, - "name": "myDetailhandel DHF - Lehrpersonen (Lizenz)", + "duration": 30, + "name": "myDetailhandel DHF - Lehrpersonen (Testlizenz)", "platform": MYDHF_PLATFORM, }, "978-3-0355-2273-0": { "edition": STUDENT_KEY, - "duration": 260, - "name": "myDetailhandel DHF - Lernende (Lizenz)", + "duration": 30, + "name": "myDetailhandel DHF - Lernende (Testlizenz)", "platform": MYDHF_PLATFORM, }, } From 48181f5b6703bf191d1401332f8aaf761d151f8e Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 14 Aug 2023 16:15:10 +0200 Subject: [PATCH 3/3] Send correct survey title to Matomo --- client/src/pages/survey.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/survey.vue b/client/src/pages/survey.vue index 7fb630fe..6134f22f 100644 --- a/client/src/pages/survey.vue +++ b/client/src/pages/survey.vue @@ -118,7 +118,6 @@ export default { mounted() { if (this.surveyData) { this.loadSurveyFromServer(this.surveyData); - matomoTrackEvent('Übung', 'Übung angezeigt', this.title); } }, @@ -264,6 +263,7 @@ export default { this.surveyData = data.survey; this.loadSurveyFromServer(data.survey); const module = data.survey.module; + matomoTrackEvent('Übung', 'Übung angezeigt', data.survey.title); this.$apollo.addSmartQuery('module', { query: MODULE_QUERY,