Merge branch 'futur'

1 files changed, 25 insertions, 3 deletions

diff --git a/models.py b/models.py
index c8e7b3d..448b996 100644
--- a/models.py
+++ b/models.py
@@ -1,4 +1,4 @@
-#    Copyright (C) 2017-2018  Alban Gruin
+#    Copyright (C) 2017-2019  Alban Gruin
 #
 #    celcatsanitizer is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published
@@ -48,13 +48,15 @@ class Year(SlugModel):
 
 
 class Source(models.Model):
-    url = models.URLField(max_length=255, verbose_name="URL", unique=True)
+    url = models.URLField(max_length=255, verbose_name="URL")
+    metadata = models.CharField(max_length=256, verbose_name="Métadonnée",
+                                blank=True, null=True)
     last_update_date = models.DateTimeField(null=True, blank=True,
                                             verbose_name="dernière mise à jour"
                                             " Celcat")
 
     def __str__(self):
-        return self.url
+        return "{}, {}".format(self.url, self.metadata)
 
     @property
     def formatted_timetables(self):
@@ -62,6 +64,7 @@ class Source(models.Model):
                           self.timetables.all()])
 
     class Meta:
+        unique_together = (("url", "metadata",),)
         verbose_name = "source d’emploi du temps"
         verbose_name_plural = "sources d’emploi du temps"
 
@@ -200,6 +203,18 @@ class Room(SlugModel):
         verbose_name_plural = "salles"
 
 
+class Module(SlugModel):
+    name = models.CharField(max_length=255, unique=True, verbose_name="nom")
+    slug = models.SlugField(max_length=64, default="", unique=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = "module"
+        verbose_name_plural = "modules"
+
+
 class CourseManager(Manager):
     def get_courses(self, obj, **criteria):
         qs = self.get_queryset()
@@ -246,6 +261,12 @@ class Course(models.Model):
     last_update = models.DateTimeField(verbose_name="dernière mise à jour",
                                        default=timezone.now)
 
+    celcat_id = models.CharField(max_length=64, verbose_name="ID Celcat",
+                                 null=True)
+    module = models.ForeignKey(Module, on_delete=models.SET_NULL, null=True)
+
+    buggy = models.BooleanField(verbose_name="Bogué", default=False)
+
     def __str__(self):
         return self.name
 
@@ -253,6 +274,7 @@ class Course(models.Model):
         if self.type is not None:
             self.type = self.type.replace("COURS", "cours")
             self.type = self.type.replace("REUNION", "réunion")
+            self.type = self.type.replace("RENCONTRE", "rencontre")
         if self.name is not None:
             self.name = self.name.split("(")[0].strip()