X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/54431b5080c621c05714ccfc1accca816aeff2fc..ca7ebe153aa3986421f5c161f08c674b4eaaf141:/catalogue/models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index f1c5377..b42a463 100644
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -2,7 +2,7 @@ from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.db import models
 from jsonfield import JSONField
-from curriculum.models import Level
+from curriculum.models import Level, Curriculum, CurriculumCourse
 
 
 class Section(models.Model):
@@ -71,6 +71,7 @@ class Lesson(models.Model):
     type = models.CharField(max_length=15, db_index=True)
     order = models.IntegerField(db_index=True)
     dc = JSONField(default='{}')
+    curriculum_courses = models.ManyToManyField(CurriculumCourse)
 
     xml_file = models.FileField(upload_to="catalogue/lesson/xml",
         null=True, blank=True) # FIXME: slug in paths
@@ -109,28 +110,17 @@ class Lesson(models.Model):
         slug = wldoc.book_info.url.slug
         try:
             lesson = cls.objects.get(slug=slug)
+            lesson.attachment_set.all().delete()
         except cls.DoesNotExist:
-            lesson = cls(slug=slug)
-
-        lesson.attachment_set.all().delete()
-        for att_name, att_file in infile.attachments.items():
-            try:
-                slug, ext = att_name.rsplit('.', 1)
-            except ValueError:
-                slug, ext = att_name, ''
-            attachment = lesson.attachment_set.create(slug=slug, ext=ext)
-            attachment.file.save(att_name, ContentFile(att_file.get_string()))
+            lesson = cls(slug=slug, order=0)
 
         # Save XML file
         lesson.xml_file.save('%s.xml' % slug, ContentFile(xml), save=False)
         lesson.title = wldoc.book_info.title
 
         lesson.level = Level.objects.get(slug=wldoc.book_info.audience)
-        lesson.order = 0
         lesson.populate_dc()
-        lesson.type = lesson.dc["type"]
-        lesson.save()
-        lesson.build_html()
+        lesson.build_html(infile=infile)
         lesson.build_package()
         lesson.build_package(student=True)
         return lesson
@@ -139,12 +129,28 @@ class Lesson(models.Model):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)
         self.dc = wldoc.book_info.to_dict()
+        self.type = self.dc["type"]
         self.save()
 
-    def build_html(self):
+        courses = set()
+        for identifier in wldoc.book_info.curriculum:
+            try:
+                curr = Curriculum.objects.get(identifier=identifier)
+            except Curriculum.DoesNotExist:
+                pass
+            else:
+                courses.add(curr.course)
+        self.curriculum_courses = courses
+
+    def build_html(self, infile=None):
         from librarian.parser import WLDocument
-        wldoc = WLDocument.from_file(self.xml_file.path)
-        html = wldoc.as_html()
+        from .publish import HtmlFormat
+
+        if infile is None:
+            wldoc = WLDocument.from_file(self.xml_file.path)
+        else:
+            wldoc = WLDocument(infile)
+        html = HtmlFormat(wldoc).build()
         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))