From 033e1e78b2038e5d9dfca8960a939a0bb3f1308e Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Jan 2017 21:18:12 +0100 Subject: Revert "Fonction pour récupérer l'année et la semaine d'un cours directement depuis le manager" This reverts commit 98a7494b6f930490e62cfc134f23d69b32203977. --- models.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'models.py') diff --git a/models.py b/models.py index 64fb675..62274d2 100644 --- a/models.py +++ b/models.py @@ -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() -- cgit v1.2.1 From 70869e67c13e463c03dd6e6a618604de7f85e2d8 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Jan 2017 21:18:14 +0100 Subject: Revert "Ajout d'un extracteur de semaine pour les DateTimeField." This reverts commit 46e4a2d58503dd7c97056a4e543edcbc4e4ca353. --- models.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'models.py') diff --git a/models.py b/models.py index 62274d2..18e0246 100644 --- a/models.py +++ b/models.py @@ -1,17 +1,11 @@ from django.db import models from django.db.models import Q -from django.db.models.functions import Extract from django.utils.text import slugify import hashlib import os -@models.DateTimeField.register_lookup -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 73fe8ff6ac3945696a24a31c150dc82f74c1389b Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Jan 2017 21:29:24 +0100 Subject: DJANGO FFS LAISSE MOI FAIRE UN GROUP BY AVEC TON ORM BORDEL --- models.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'models.py') diff --git a/models.py b/models.py index 18e0246..5e5ee1b 100644 --- a/models.py +++ b/models.py @@ -108,6 +108,9 @@ class CourseManager(models.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, **filters).order_by("begin") + def get_weeks(self): + return self.get_queryset().raw("select edt_course.id, cast(strftime('%%W', begin) as integer) as week, cast(strftime('%%Y', begin) as integer) as year, edt_group.name, edt_group.timetable_id, edt_group.mention, edt_group.subgroup, edt_group.td, edt_group.tp, edt_group.slug, edt_group.id as group_id from edt_course inner join edt_course_groups on (edt_course.id = edt_course_groups.course_id) inner join edt_group on (edt_course_groups.group_id = edt_group.id) group by group_id, week, year order by group_id, year, week") + class Course(models.Model): objects = CourseManager() -- cgit v1.2.1 From 47624b1e6973e8a4394d9985a30e23db7fdfb096 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Jan 2017 21:36:26 +0100 Subject: Ajout d'un critère de date --- models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'models.py') diff --git a/models.py b/models.py index 5e5ee1b..981d8fb 100644 --- a/models.py +++ b/models.py @@ -108,8 +108,8 @@ class CourseManager(models.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, **filters).order_by("begin") - def get_weeks(self): - return self.get_queryset().raw("select edt_course.id, cast(strftime('%%W', begin) as integer) as week, cast(strftime('%%Y', begin) as integer) as year, edt_group.name, edt_group.timetable_id, edt_group.mention, edt_group.subgroup, edt_group.td, edt_group.tp, edt_group.slug, edt_group.id as group_id from edt_course inner join edt_course_groups on (edt_course.id = edt_course_groups.course_id) inner join edt_group on (edt_course_groups.group_id = edt_group.id) group by group_id, week, year order by group_id, year, week") + def get_weeks(self, date): + return self.get_queryset().raw("select edt_course.id, cast(strftime('%%W', begin) as integer) as week, cast(strftime('%%Y', begin) as integer) as year, edt_group.name, edt_group.timetable_id, edt_group.mention, edt_group.subgroup, edt_group.td, edt_group.tp, edt_group.slug, edt_group.id as group_id from edt_course inner join edt_course_groups on (edt_course.id = edt_course_groups.course_id) inner join edt_group on (edt_course_groups.group_id = edt_group.id) where begin >= %s group by group_id, week, year order by group_id, year, week", [date]) class Course(models.Model): -- cgit v1.2.1 From 4b9ff291e35163b6d0ffcff78878e9ba23bf23dc 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 981d8fb..9bf5866 100644 --- a/models.py +++ b/models.py @@ -44,6 +44,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 64145d7d43d8e6fbda5630e6e643ef259b6fa881 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 9bf5866..9cb3bca 100644 --- a/models.py +++ b/models.py @@ -44,8 +44,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