From ad5bbfe24c8d00d3bc4b2ae96cb583c141ae27dd Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 27 Jan 2017 22:48:47 +0100
Subject: Création de différentes classes permettant d'effectuer un group by
 simple  * GroupedCompiler rajoute une étape à get_group_by() pour insérer de
 manière simple les champs à    grouper  * GroupedQuery rajoute une liste
 stockant les champs à grouper  * GroupedQuerySet implémente la fonction
 group_by()  * GroupedManager change le type de QuerySet par défaut pour
 GroupedQuerySet

Le manager des cours se base sur GroupedManager
---
 models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'models.py')

diff --git a/models.py b/models.py
index 64fb675..26bb63d 100644
--- a/models.py
+++ b/models.py
@@ -4,6 +4,8 @@ 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
+
 import hashlib
 import os
 
@@ -111,7 +113,7 @@ class Room(models.Model):
         verbose_name_plural = "salles"
 
 
-class CourseManager(models.Manager):
+class CourseManager(GroupedManager):
     def __get_weeks(self, qs):
         extractYear = ExtractYear("begin")
 
@@ -130,6 +132,7 @@ class CourseManager(models.Manager):
         qs = self.get_courses_for_group(group, **filters)
         return self.__get_weeks(qs)
 
+
 class Course(models.Model):
     objects = CourseManager()
 
-- 
cgit v1.2.1


From 6a7f243eabdc1007e8effcc6d8efa6a990fe40c1 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 27 Jan 2017 21:40:24 +0100
Subject: Surcharge de l'opérateur in du modèle des groupes

---
 models.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'models.py')

diff --git a/models.py b/models.py
index 26bb63d..f1ff118 100644
--- a/models.py
+++ b/models.py
@@ -53,6 +53,9 @@ class Group(models.Model):
 
     slug = models.SlugField(max_length=64, unique=True, default="")
 
+    def __contains__(self, group):
+        return self.timetable == group.timetable and self.mention == group.mention and self.subgroup == group.subgroup and (self.td == group.td or self.td is None or group.td is None) and (self.tp == group.tp or self.tp is None or group.tp is None)
+
     def __str__(self):
         return self.name
 
-- 
cgit v1.2.1


From dfb352540ce5a66ef475f0c6d855fc2f322d553a Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 27 Jan 2017 21:48:53 +0100
Subject: Bon en fait pas de surcharge

---
 models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'models.py')

diff --git a/models.py b/models.py
index f1ff118..bcd9215 100644
--- a/models.py
+++ b/models.py
@@ -53,8 +53,8 @@ class Group(models.Model):
 
     slug = models.SlugField(max_length=64, unique=True, default="")
 
-    def __contains__(self, group):
-        return self.timetable == group.timetable and self.mention == group.mention and self.subgroup == group.subgroup and (self.td == group.td or self.td is None or group.td is None) and (self.tp == group.tp or self.tp is None or group.tp is None)
+    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)
 
     def __str__(self):
         return self.name
-- 
cgit v1.2.1


From ebb7c3bf0dc3eef2efa3f4add60ccfc7dc063248 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 28 Jan 2017 13:20:23 +0100
Subject: Traitement des semaines avec un group by, semblant diviser par deux
 le temps de traitement

---
 models.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'models.py')

diff --git a/models.py b/models.py
index bcd9215..aa7be24 100644
--- a/models.py
+++ b/models.py
@@ -119,6 +119,7 @@ class Room(models.Model):
 class CourseManager(GroupedManager):
     def __get_weeks(self, qs):
         extractYear = ExtractYear("begin")
+        qs = qs.group_by("groups", "year", "week").order_by("groups__name", "year", "week")
 
         if connection.vendor == "postgresql":
             return qs.annotate(week=ExtractWeek("begin"), year=extractYear)
@@ -128,11 +129,8 @@ class CourseManager(GroupedManager):
     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)
+    def get_weeks(self, **criteria):
+        qs = self.get_queryset().filter(**criteria)
         return self.__get_weeks(qs)
 
 
-- 
cgit v1.2.1