From f033f310ac8331de24a5fc2028ba22978c1d941e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 19 Oct 2017 21:48:39 +0200
Subject: Adaptation de corresponds_to() et des tests de parsage

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

(limited to 'models.py')

diff --git a/models.py b/models.py
index 868cbd1..c69bec3 100644
--- a/models.py
+++ b/models.py
@@ -97,12 +97,15 @@ class Group(models.Model):
 
     hidden = models.BooleanField(verbose_name="caché", default=False)
 
-    def corresponds_to(self, timetable_id, mention, subgroup, td, tp):
+    def corresponds_to(self, timetable_id, mention, subgroup):
+        subgroup_corresponds = True
+        if self.subgroup is not None and subgroup is not None:
+            subgroup_corresponds = subgroup.startswith(self.subgroup) or \
+                                   self.subgroup.startswith(subgroup)
+
         return self.timetable.id == timetable_id and \
             self.mention.startswith(mention) and \
-            (self.subgroup == subgroup or self.subgroup is None) 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)
+            subgroup_corresponds
 
     @property
     def group_info(self):
-- 
cgit v1.2.1