diff options
| -rw-r--r-- | models.py | 19 |
1 files changed, 2 insertions, 17 deletions
@@ -1,7 +1,6 @@ -from django.db import connection, models +from django.db import models from django.db.models import Q -from django.db.models.expressions import RawSQL -from django.db.models.functions import Extract, ExtractYear +from django.db.models.functions import Extract from django.utils.text import slugify import hashlib @@ -112,23 +111,9 @@ class Room(models.Model): class CourseManager(models.Manager): - def __get_weeks(self, qs): - extractYear = ExtractYear("begin") - - if connection.vendor == "postgresql": - return qs.annotate(week=ExtractWeek("begin"), year=extractYear) - else: - return qs.annotate(week=RawSQL("""cast(strftime("%%W", "begin") as integer)""", []), year=extractYear) - def get_courses_for_group(self, group, **filters): return self.get_queryset().filter(Q(groups__td__isnull=True) | Q(groups__td=group.td), Q(groups__tp__isnull=True) | Q(groups__tp=group.tp), groups__mention=group.mention, groups__subgroup=group.subgroup, **filters).order_by("begin") - def get_weeks(self): - return self.__get_weeks(self.get_queryset()) - - def get_courses_for_group_and_weeks(self, group, **filters): - qs = self.get_courses_for_group(group, **filters) - return self.__get_weeks(qs) class Course(models.Model): objects = CourseManager() |