Running the old version.

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 8ecf7ac..c73c762 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8
 # -*- coding: utf-8

+from django.conf import settings

 from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.db import models


@@ -109,6 +110,9 @@ class Lesson(models.Model):
     student_pdf = models.FileField(
         upload_to="catalogue/lesson/student_pdf",
         null=True, blank=True, max_length=255, storage=bofh_storage)
     student_pdf = models.FileField(
         upload_to="catalogue/lesson/student_pdf",
         null=True, blank=True, max_length=255, storage=bofh_storage)

+    weasy_pdf = models.FileField(
+        upload_to="catalogue/lesson/weasy",
+        null=True, blank=True, max_length=255, storage=bofh_storage)

 
     class Meta:
         ordering = ['section', 'level', 'order']
 
     class Meta:
         ordering = ['section', 'level', 'order']


@@ -235,6 +239,15 @@ class Lesson(models.Model):
             pdf = PdfFormat(wldoc, teacher=True).build()
             self.pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename())))
 
             pdf = PdfFormat(wldoc, teacher=True).build()
             self.pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename())))
 

+    def build_pdf_from_html(self, **kwargs):
+        from .publish import PdfFromHtmlFormat
+        wldoc = self.wldocument()
+        pdf = PdfFromHtmlFormat(
+            wldoc, media_root=settings.MEDIA_ROOT,
+            html_to_pdf_command=settings.HTML_TO_PDF_COMMAND,
+            **kwargs).build()
+        self.weasy_pdf.save("%s.pdf" % self.slug, File(open(pdf.get_filename())))
+

     def add_to_zip(self, zipf, student=False, prefix=''):
         pdf = self.student_pdf if student else self.pdf
         if pdf:
     def add_to_zip(self, zipf, student=False, prefix=''):
         pdf = self.student_pdf if student else self.pdf
         if pdf:


@@ -292,11 +305,15 @@ class Lesson(models.Model):
         return any(requirement in self.dc.get('requires', []) for requirement in ('internet', 'Internet'))
 
 
         return any(requirement in self.dc.get('requires', []) for requirement in ('internet', 'Internet'))
 
 

+def attachment_path(instance, filename):
+    return 'catalogue/attachment/%s/%s' % (instance.lesson.slug, filename)
+
+

 class Attachment(models.Model):
     slug = models.CharField(max_length=255)
     ext = models.CharField(max_length=15)
     lesson = models.ForeignKey(Lesson)
 class Attachment(models.Model):
     slug = models.CharField(max_length=255)
     ext = models.CharField(max_length=15)
     lesson = models.ForeignKey(Lesson)

-    file = models.FileField(upload_to="catalogue/attachment", storage=bofh_storage, max_length=255)
+    file = models.FileField(upload_to=attachment_path, storage=bofh_storage, max_length=255)

 
     class Meta:
         ordering = ['slug', 'ext']
 
     class Meta:
         ordering = ['slug', 'ext']