From 5ebf37dddf5ee8bb8dbc9c167ebb30c7fc537e19 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 11 Feb 2017 11:44:29 +0100 Subject: Ajout d'une propriété dans les groupes pour récupérer le tuple des informations du groupe --- models.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'models.py') diff --git a/models.py b/models.py index 2100d35..0d3f2c0 100644 --- a/models.py +++ b/models.py @@ -75,6 +75,10 @@ class Group(models.Model): def corresponds_to(self, timetable_id, mention, subgroup, td, tp): return self.timetable.id == timetable_id and self.mention == mention and self.subgroup == subgroup and (self.td == td or self.td is None or td is None) and (self.tp == tp or self.tp is None or tp is None) + @property + def group_info(self): + return self.timetable.id, self.mention, self.subgroup, self.td, self.tp + def __str__(self): return self.name -- cgit v1.2.1 From 7dc44ec77c6adcf7515f382d439d9a1820085d73 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 11 Feb 2017 12:34:20 +0100 Subject: Déplacement de ExtractWeek dans db.py --- models.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'models.py') diff --git a/models.py b/models.py index 0d3f2c0..6d395e0 100644 --- a/models.py +++ b/models.py @@ -20,16 +20,12 @@ from django.db.models.expressions import RawSQL from django.db.models.functions import Extract, ExtractYear from django.utils.text import slugify -from .db import GroupedManager +from .db import ExtractWeek, GroupedManager import hashlib import os -class ExtractWeek(Extract): - lookup_name = "week" - - class Timetable(models.Model): name = models.CharField(max_length=64, unique=True, verbose_name="nom") url = models.URLField(max_length=255, unique=True, verbose_name="URL") -- cgit v1.2.1 From 64f7dedf227a88bac522cb34c6a99982b3d65321 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 11 Feb 2017 12:55:19 +0100 Subject: Imports des modules pour ExtractWeek --- models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models.py') diff --git a/models.py b/models.py index 6d395e0..1723536 100644 --- a/models.py +++ b/models.py @@ -17,7 +17,7 @@ from django.db import connection, 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 ExtractYear from django.utils.text import slugify from .db import ExtractWeek, GroupedManager -- cgit v1.2.1 From bb5c77bf35b13f5c11bc4cdbc0325983e349b984 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 11 Feb 2017 13:58:41 +0100 Subject: Squashed commit of the following: commit ff25e2dc285c423f4c40a83deb89a56ee62b15a9 Author: Alban Gruin Date: Sat Feb 11 13:47:38 2017 +0100 Nettoyage du code de CourseManager commit 26a132d5d1fdb7fc9da827bbc9d5e409834fb954 Author: Alban Gruin Date: Sat Feb 11 13:45:14 2017 +0100 Suppression du GroupedManager et de toutes ses sous-classes --- models.py | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'models.py') diff --git a/models.py b/models.py index 1723536..1e96a88 100644 --- a/models.py +++ b/models.py @@ -15,17 +15,19 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.db import connection, models -from django.db.models import Q +from django.db.models import Count, Manager, Q from django.db.models.expressions import RawSQL -from django.db.models.functions import ExtractYear +from django.db.models.functions import Extract, ExtractYear from django.utils.text import slugify -from .db import ExtractWeek, GroupedManager - import hashlib import os +class ExtractWeek(Extract): + lookup_name = "week" + + class Timetable(models.Model): name = models.CharField(max_length=64, unique=True, verbose_name="nom") url = models.URLField(max_length=255, unique=True, verbose_name="URL") @@ -141,22 +143,17 @@ class Room(models.Model): verbose_name_plural = "salles" -class CourseManager(GroupedManager): - def __get_weeks(self, qs): - extractYear = ExtractYear("begin") - qs = qs.group_by("groups", "year", "week", "groups__timetable", "groups__mention", "groups__subgroup", "groups__td", "groups__tp", "begin", "groups__name").order_by("groups__name", "year", "week") - - 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) - +class CourseManager(Manager): 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, timetable=group.timetable, **filters).order_by("begin") def get_weeks(self, **criteria): - qs = self.get_queryset().filter(**criteria) - return self.__get_weeks(qs) + qs = self.get_queryset().filter(**criteria).order_by("groups__name", "year", "week").annotate(_=Count(("groups", "year", "week", "begin")), year=ExtractYear("begin")) + + if connection.vendor == "postgresql": + return qs.annotate(week=ExtractWeek("begin")) + else: + return qs.annotate(week=RawSQL("""cast(strftime("%%W", "begin") as integer)""", [])) class Course(models.Model): -- cgit v1.2.1