diff --git a/client/src/mixins/me.ts b/client/src/mixins/me.ts index de2136ec..fda00d09 100644 --- a/client/src/mixins/me.ts +++ b/client/src/mixins/me.ts @@ -31,7 +31,6 @@ export interface Location { type RouteLocation = Location | string; - // TODO: ME_QUERY existiert an einem weiteren Ort. Dieser sollte entfernt werden. const defaultMe: MeQuery = { me: { @@ -80,10 +79,6 @@ const getCurrentClassName = (me: Me) => { return currentClass ? currentClass.name : me.schoolClasses.length ? me.schoolClasses[0].name : ''; }; -const getLastModuleLevel = (me: Me) => { - return me.lastModuleLevel; -} - const getMe = () => { const { result } = useQuery(ME_QUERY); @@ -134,10 +129,6 @@ const meMixin = { // @ts-ignore return getCurrentClassName(this.$data.me); }, - lastModuleLevel(): any { - // @ts-ignore - return getLastModuleLevel(this.$data.me); - } }, apollo: { diff --git a/server/books/models/module.py b/server/books/models/module.py index 236b49df..abb43d26 100644 --- a/server/books/models/module.py +++ b/server/books/models/module.py @@ -8,13 +8,15 @@ from core.constants import DEFAULT_RICH_TEXT_FEATURES from core.wagtail_utils import StrictHierarchyPage, get_default_settings from users.models import SchoolClass -FILTER_ATTRIBUTE_TYPE = (("all", "All"), ("exact", "Exact")) +EXACT = "exact" + +FILTER_ATTRIBUTE_TYPE = (("all", "All"), (EXACT, "Exact")) class ModuleLevel(models.Model): name = models.CharField(max_length=255, unique=True) filter_attribute_type = models.CharField( - max_length=16, choices=FILTER_ATTRIBUTE_TYPE, default="exact" + max_length=16, choices=FILTER_ATTRIBUTE_TYPE, default=EXACT ) def __str__(self): @@ -25,10 +27,6 @@ class ModuleLevel(models.Model): verbose_name = _("module level") -def default_category(): - return ModuleLevel.objects.first().pk - - class ModuleCategory(models.Model): class Meta: verbose_name = _("module type") @@ -37,7 +35,7 @@ class ModuleCategory(models.Model): name = models.CharField(max_length=255) filter_attribute_type = models.CharField( - max_length=16, choices=FILTER_ATTRIBUTE_TYPE, default="exact" + max_length=16, choices=FILTER_ATTRIBUTE_TYPE, default=EXACT ) def __str__(self):