diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 9a55eee4..6bab72e8 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -30,6 +30,8 @@
+
+
group.title === 'SOCIETY')
.sort(withoutOwnerFirst) : [];
},
+ interdisciplinaryObjectiveGroups() {
+ return this.module.objectiveGroups ? this.module.objectiveGroups
+ .filter(group => group.title === 'INTERDISCIPLINARY')
+ .sort(withoutOwnerFirst) : [];
+ },
isStudent() {
return !this.me.permissions.includes('users.can_manage_school_class_content');
},
diff --git a/server/objectives/migrations/0009_auto_20200928_1547.py b/server/objectives/migrations/0009_auto_20200928_1547.py
new file mode 100644
index 00000000..841d0f5c
--- /dev/null
+++ b/server/objectives/migrations/0009_auto_20200928_1547.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.14 on 2020-09-28 15:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('objectives', '0008_auto_20190821_1252'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='objectivegroup',
+ name='title',
+ field=models.CharField(blank=True, choices=[('language_communication', 'Sprache & Kommunikation'), ('society', 'Gesellschaft'), ('interdisciplinary', 'Überfachliche Lernziele')], default='language_communication', max_length=255, verbose_name='title'),
+ ),
+ ]
diff --git a/server/objectives/models.py b/server/objectives/models.py
index 422aabdd..c955566c 100644
--- a/server/objectives/models.py
+++ b/server/objectives/models.py
@@ -12,10 +12,12 @@ class ObjectiveGroup(models.Model):
LANGUAGE_COMMUNICATION = 'language_communication'
SOCIETY = 'society'
+ INTERDISCIPLINARY = 'interdisciplinary'
TITLE_CHOICES = (
(LANGUAGE_COMMUNICATION, 'Sprache & Kommunikation'),
(SOCIETY, 'Gesellschaft'),
+ (INTERDISCIPLINARY, 'Überfachliche Lernziele'),
)
title = models.CharField('title', blank=True, null=False, max_length=255, choices=TITLE_CHOICES, default=LANGUAGE_COMMUNICATION)
diff --git a/server/users/migrations/0024_auto_20200928_1547.py b/server/users/migrations/0024_auto_20200928_1547.py
new file mode 100644
index 00000000..fdebac5b
--- /dev/null
+++ b/server/users/migrations/0024_auto_20200928_1547.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.14 on 2020-09-28 15:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0023_user_onboarding_visited'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='license',
+ name='isbn',
+ field=models.CharField(default='978-3-0355-1397-4', max_length=50),
+ ),
+ ]