ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'hotfix/license-update-august-2023' into develop

This commit is contained in:
Ramon Wenger 2023-08-14 16:16:40 +02:00
parent ec7a4c9900 48181f5b67
commit e5f0b061c4
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/pages/license-activation.vue
View File

@ -11,7 +11,8 @@
novalidate novalidate
@submit="validateBeforeSubmit" @submit="validateBeforeSubmit"
> >
<h2>Geben Sie einen Coupon-Code ein</h2> <h2 class="license-activation__heading">Geben Sie einen Coupon-Code ein</h2>
<p class="license-activation__license-info info-header__text small-emph">Den Zugangscode zur Klasse erhalten Sie von Ihrer Lehrperson.</p>
<Field <Field
:rules="required" :rules="required"
name="coupon" name="coupon"
@ -170,6 +171,16 @@ export default defineComponent({
<style scoped lang="scss"> <style scoped lang="scss">
@import 'styles/helpers'; @import 'styles/helpers';
.license-activation {
&__heading {
margin-bottom: $small-spacing;
}
&__license-info {
margin-bottom: $medium-spacing;
}
}
.text-link { .text-link {
font-family: $sans-serif-font-family; font-family: $sans-serif-font-family;
color: $color-brand; color: $color-brand;

2
client/src/pages/survey.vue
View File

@ -118,7 +118,6 @@ export default {
mounted() { mounted() {
if (this.surveyData) { if (this.surveyData) {
this.loadSurveyFromServer(this.surveyData); this.loadSurveyFromServer(this.surveyData);
matomoTrackEvent('Übung', 'Übung angezeigt', this.title);
} }
}, },
@ -264,6 +263,7 @@ export default {
this.surveyData = data.survey; this.surveyData = data.survey;
this.loadSurveyFromServer(data.survey); this.loadSurveyFromServer(data.survey);
const module = data.survey.module; const module = data.survey.module;
matomoTrackEvent('Übung', 'Übung angezeigt', data.survey.title);
this.$apollo.addSmartQuery('module', { this.$apollo.addSmartQuery('module', {
query: MODULE_QUERY, query: MODULE_QUERY,

24
server/users/licenses.py
View File

@ -63,14 +63,14 @@ MYKV_LICENSES = {
}, },
"978-3-0355-2189-4": { "978-3-0355-2189-4": {
"edition": STUDENT_KEY, "edition": STUDENT_KEY,
"duration": 400, "duration": 30,
"name": "Student test 1 month", "name": "Student 1 Monat Testlizenz",
"platform": MYKV_PLATFORM, "platform": MYKV_PLATFORM,
}, },
"978-3-0355-2188-7": { "978-3-0355-2188-7": {
"edition": TEACHER_KEY, "edition": TEACHER_KEY,
"duration": 400, "duration": 30,
"name": "Student test 1 month", "name": "Lehrperson 1 Monat Testlizenz",
"platform": MYKV_PLATFORM, "platform": MYKV_PLATFORM,
}, },
} }
@ -91,14 +91,14 @@ MYDHA_LICENSES = {
}, },
"978-3-0355-2276-1": { "978-3-0355-2276-1": {
"edition": TEACHER_KEY, "edition": TEACHER_KEY,
"duration": 260, "duration": 30,
"name": "myDetailhandel DHA - Lehrpersonen (Lizenz)", "name": "myDetailhandel DHA - Lehrpersonen (Testlizenz)",
"platform": MYDHA_PLATFORM, "platform": MYDHA_PLATFORM,
}, },
"978-3-0355-2275-4": { "978-3-0355-2275-4": {
"edition": STUDENT_KEY, "edition": STUDENT_KEY,
"duration": 260, "duration": 30,
"name": "myDetailhandel DHA - Lernende (Lizenz)", "name": "myDetailhandel DHA - Lernende (Testlizenz)",
"platform": MYDHA_PLATFORM, "platform": MYDHA_PLATFORM,
}, },
} }
@ -119,14 +119,14 @@ MYDHF_LICENSES = {
}, },
"978-3-0355-2274-7": { "978-3-0355-2274-7": {
"edition": TEACHER_KEY, "edition": TEACHER_KEY,
"duration": 260, "duration": 30,
"name": "myDetailhandel DHF - Lehrpersonen (Lizenz)", "name": "myDetailhandel DHF - Lehrpersonen (Testlizenz)",
"platform": MYDHF_PLATFORM, "platform": MYDHF_PLATFORM,
}, },
"978-3-0355-2273-0": { "978-3-0355-2273-0": {
"edition": STUDENT_KEY, "edition": STUDENT_KEY,
"duration": 260, "duration": 30,
"name": "myDetailhandel DHF - Lernende (Lizenz)", "name": "myDetailhandel DHF - Lernende (Testlizenz)",
"platform": MYDHF_PLATFORM, "platform": MYDHF_PLATFORM,
}, },
} }