fix

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index e5ee3a9..46d026c 100644 (file)
--- 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 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):
 
 
 class Section(models.Model):


@@ -35,7 +35,7 @@ class Section(models.Model):
             lessons = [Lesson.objects.get(slug=part.slug)
                         for part in wldoc.book_info.parts]
         except Lesson.DoesNotExist, e:
             lessons = [Lesson.objects.get(slug=part.slug)
                         for part in wldoc.book_info.parts]
         except Lesson.DoesNotExist, e:

-            raise cls.IncompleteError(e)
+            raise cls.IncompleteError(part.slug)

 
         slug = wldoc.book_info.url.slug
         try:
 
         slug = wldoc.book_info.url.slug
         try:


@@ -56,10 +56,9 @@ class Section(models.Model):
 
         return section
 
 
         return section
 

-
-    def syntetic_lesson(self):
+    def syntetic_lesson(self, level):

         try:
         try:

-            return self.lesson_set.filter(type='synthetic')[0]
+            return self.lesson_set.filter(type='synthetic', level=level)[0]

         except IndexError:
             return None
 
         except IndexError:
             return None
 


@@ -72,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='{}')
     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
 
     xml_file = models.FileField(upload_to="catalogue/lesson/xml",
         null=True, blank=True) # FIXME: slug in paths


@@ -129,8 +129,6 @@ class Lesson(models.Model):
         lesson.level = Level.objects.get(slug=wldoc.book_info.audience)
         lesson.order = 0
         lesson.populate_dc()
         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_package()
         lesson.build_package(student=True)
         lesson.build_html()
         lesson.build_package()
         lesson.build_package(student=True)


@@ -140,8 +138,19 @@ class Lesson(models.Model):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)
         self.dc = wldoc.book_info.to_dict()
         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()
 
         self.save()
 

+        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):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)
     def build_html(self):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)


@@ -149,23 +158,49 @@ class Lesson(models.Model):
         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 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, 
+                "%s%s%s.pdf" % (prefix, self.slug, "_student" if student else ""))
+        
+

     def build_package(self, student=False):
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
     def build_package(self, student=False):
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)

-        zipf.write(self.xml_file.path, "pliki-zrodlowe/%s.xml" % self.slug)
-        pdf = self.student_pdf if student else self.pdf
-        if pdf:
-            zipf.write(self.xml_file.path, 
-                "%s%s.pdf" % (self.slug, "_student" if student else ""))
+        self.add_to_zip(zipf, student)

         zipf.close()
         fieldname = "student_package" if student else "package"
         getattr(self, fieldname).save(
             "%s%s.zip" % (self.slug, "_student" if student else ""),
             ContentFile(buff.getvalue()))
 
         zipf.close()
         fieldname = "student_package" if student else "package"
         getattr(self, fieldname).save(
             "%s%s.zip" % (self.slug, "_student" if student else ""),
             ContentFile(buff.getvalue()))
 

+    def get_syntetic(self):
+        return self.section.syntetic_lesson(self.level)
+
+    def get_previous(self):
+        if self.section is None: return None
+        try:
+            return self.section.lesson_set.filter(
+                type=self.type, level=self.level,
+                order__lt=self.order).order_by('-order')[0]
+        except IndexError:
+            return None
+
+    def get_next(self):
+        if self.section is None: return None
+        try:
+            return self.section.lesson_set.filter(
+                type=self.type, level=self.level,
+                order__gt=self.order).order_by('order')[0]
+        except IndexError:
+            return None
+

 
 class Attachment(models.Model):
     slug = models.CharField(max_length=255)
 
 class Attachment(models.Model):
     slug = models.CharField(max_length=255)