From 276cd20e99147915ee33e37c54a572c1272a0427 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 11 Jan 2023 13:43:11 +0100 Subject: [PATCH] Use dynamic medialibrary link --- client/src/components/MainNavigationBar.vue | 5 +- client/src/components/MobileMenu.vue | 10 ++- client/src/locales/de.json | 3 +- .../migrations/0002_auto_20230111_1044.py | 83 +++++++++++++++---- 4 files changed, 81 insertions(+), 20 deletions(-) diff --git a/client/src/components/MainNavigationBar.vue b/client/src/components/MainNavigationBar.vue index 819ab453..6e2b1197 100644 --- a/client/src/components/MainNavigationBar.vue +++ b/client/src/components/MainNavigationBar.vue @@ -206,10 +206,11 @@ const profileDropdownData: DropdownListItem[] = [ target="_blank" href="https://bildung.vbv.ch/ilp/pages/catalogsearch.jsf" > - Shop + {{ $t("general.shop") }} {
  • -
  • diff --git a/client/src/locales/de.json b/client/src/locales/de.json index 4012ff92..d712b37b 100644 --- a/client/src/locales/de.json +++ b/client/src/locales/de.json @@ -19,7 +19,8 @@ "examResult": "Prüfungsresultat | Prüfungsresultate", "certificate": "Zertifikat | Zertifikate", "notification": "Benachrichtigung | Benachrichtigungen", - "profileLink": "Profil anzeigen" + "profileLink": "Profil anzeigen", + "shop": "Shop" }, "mainNavigation": { "logout": "Abmelden", diff --git a/server/vbv_lernwelt/feedback/migrations/0002_auto_20230111_1044.py b/server/vbv_lernwelt/feedback/migrations/0002_auto_20230111_1044.py index 5817c63b..4300469b 100644 --- a/server/vbv_lernwelt/feedback/migrations/0002_auto_20230111_1044.py +++ b/server/vbv_lernwelt/feedback/migrations/0002_auto_20230111_1044.py @@ -2,39 +2,90 @@ import django.core.validators from django.db import migrations + import vbv_lernwelt.feedback.models class Migration(migrations.Migration): dependencies = [ - ('feedback', '0001_initial'), + ("feedback", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='feedbackresponse', - name='goal_attainment', - field=vbv_lernwelt.feedback.models.FeedbackIntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + model_name="feedbackresponse", + name="goal_attainment", + field=vbv_lernwelt.feedback.models.FeedbackIntegerField( + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + ], + ), ), migrations.AlterField( - model_name='feedbackresponse', - name='instructor_competence', - field=vbv_lernwelt.feedback.models.FeedbackIntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + model_name="feedbackresponse", + name="instructor_competence", + field=vbv_lernwelt.feedback.models.FeedbackIntegerField( + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + ], + ), ), migrations.AlterField( - model_name='feedbackresponse', - name='instructor_respect', - field=vbv_lernwelt.feedback.models.FeedbackIntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + model_name="feedbackresponse", + name="instructor_respect", + field=vbv_lernwelt.feedback.models.FeedbackIntegerField( + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + ], + ), ), migrations.AlterField( - model_name='feedbackresponse', - name='materials_rating', - field=vbv_lernwelt.feedback.models.FeedbackIntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + model_name="feedbackresponse", + name="materials_rating", + field=vbv_lernwelt.feedback.models.FeedbackIntegerField( + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + ], + ), ), migrations.AlterField( - model_name='feedbackresponse', - name='satisfaction', - field=vbv_lernwelt.feedback.models.FeedbackIntegerField(null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4), django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4)]), + model_name="feedbackresponse", + name="satisfaction", + field=vbv_lernwelt.feedback.models.FeedbackIntegerField( + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4), + ], + ), ), ]