layout fix for info

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 46d026c..c684ab5 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -110,26 +110,19 @@ class Lesson(models.Model):
         slug = wldoc.book_info.url.slug
         try:
             lesson = cls.objects.get(slug=slug)
         slug = wldoc.book_info.url.slug
         try:
             lesson = cls.objects.get(slug=slug)

+            lesson.attachment_set.all().delete()

         except cls.DoesNotExist:
         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)
 
         # 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.populate_dc()

-        lesson.build_html()
+        lesson.build_html(infile=infile)
+        lesson.build_pdf(infile=infile)
+        lesson.build_pdf(student=True, infile=infile)

         lesson.build_package()
         lesson.build_package(student=True)
         return lesson
         lesson.build_package()
         lesson.build_package(student=True)
         return lesson


@@ -151,20 +144,46 @@ class Lesson(models.Model):
                 courses.add(curr.course)
         self.curriculum_courses = courses
 
                 courses.add(curr.course)
         self.curriculum_courses = courses
 

-    def build_html(self):
+    def build_html(self, infile=None):

         from librarian.parser import WLDocument
         from librarian.parser import WLDocument

-        wldoc = WLDocument.from_file(self.xml_file.path)
-        html = wldoc.as_html()
+        from .publish import HtmlFormat, OrmDocProvider
+
+        if infile is None:
+            wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider)
+        else:
+            wldoc = WLDocument(infile, provider=OrmDocProvider())
+        html = HtmlFormat(wldoc).build()

         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))
 
         self.html_file.save("%s.html" % self.slug,
             File(open(html.get_filename())))
 

+    def build_pdf(self, student=False, infile=None):
+        from librarian.parser import WLDocument
+        from .publish import PdfFormat, OrmDocProvider
+
+        if infile is None:
+            wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider)
+        else:
+            wldoc = WLDocument(infile, provider=OrmDocProvider())
+        if student:
+            pdf = PdfFormat(wldoc).build()
+            self.student_pdf.save("%s.pdf" % self.slug,
+                File(open(pdf.get_filename())))
+        else:
+            pdf = PdfFormat(wldoc, teacher=True).build()
+            self.pdf.save("%s.pdf" % self.slug,
+                File(open(pdf.get_filename())))
+

     def add_to_zip(self, zipf, student=False, prefix=''):
         zipf.write(self.xml_file.path,
             "%spliki-zrodlowe/%s.xml" % (prefix, self.slug))
         pdf = self.student_pdf if student else self.pdf
         if pdf:
     def add_to_zip(self, zipf, student=False, prefix=''):
         zipf.write(self.xml_file.path,
             "%spliki-zrodlowe/%s.xml" % (prefix, self.slug))
         pdf = self.student_pdf if student else self.pdf
         if pdf:

-            zipf.write(self.xml_file.path, 
+            zipf.write(pdf.path, 

                 "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else ""))
                 "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else ""))

+        for attachment in self.attachment_set.all():
+            zipf.write(attachment.file.path,
+                u"%smaterialy/%s.%s" % (prefix, attachment.slug, attachment.ext))
+            

         
 
     def build_package(self, student=False):
         
 
     def build_package(self, student=False):