From b0154d43011825731b0e4ff7c4f44b7f5770b3c2 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 26 Mar 2017 14:23:44 +0200
Subject: Modification de la regex de validation de groupe pour gérer
 globalement les licences entières Modification de la méthode de
 correspondance des groupes

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

(limited to 'models.py')

diff --git a/models.py b/models.py
index 478b48f..32a5903 100644
--- a/models.py
+++ b/models.py
@@ -66,14 +66,14 @@ class Group(models.Model):
     timetable = models.ForeignKey(Timetable, on_delete=models.CASCADE, verbose_name="emploi du temps")
 
     mention = models.CharField(max_length=32)
-    subgroup = models.CharField(max_length=1, verbose_name="sous-groupe")
+    subgroup = models.CharField(max_length=1, verbose_name="sous-groupe", null=True)
     td = models.IntegerField(verbose_name="groupe de TD", null=True)
     tp = models.IntegerField(verbose_name="groupe de TP", null=True)
 
     slug = models.SlugField(max_length=64, default="")
 
     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)
+        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)
 
     @property
     def group_info(self):
-- 
cgit v1.2.1