From 2aacb6e59e40c9d47d02719dc7b5541a36b3c9ed Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 26 Nov 2017 14:08:11 +0100
Subject: Correction d’un cas pouvant provoquer une erreur de parsage de groupe
 (si jamais il n’y a pas de semestre), renvoi du numéro de semestre dans
 group_info, adaptation de corresponds_to.

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

(limited to 'models.py')

diff --git a/models.py b/models.py
index abb00bf..fb0e757 100644
--- a/models.py
+++ b/models.py
@@ -101,7 +101,7 @@ class Group(models.Model):
 
     hidden = models.BooleanField(verbose_name="caché", default=False)
 
-    def corresponds_to(self, mention, subgroup):
+    def corresponds_to(self, mention, semester, subgroup):
         subgroup_corresponds = True
         if self.subgroup is not None and subgroup is not None:
             subgroup_corresponds = self.subgroup.startswith(subgroup)
@@ -109,11 +109,12 @@ class Group(models.Model):
         # TODO adapter pour semester
         return (self.mention.startswith(mention) or \
                 mention.startswith(self.mention)) and \
+                (self.semester == semester or semester is None) and \
                 subgroup_corresponds
 
     @property
     def group_info(self):
-        return self.mention, self.subgroup
+        return self.mention, self.semester, self.subgroup
 
     def __str__(self):
         return self.name
-- 
cgit v1.2.1