X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/bab28a58fcd4c7df766d69b9c34d14122af75165..985a407d3afd4dae71a362116a2d8bd91fe6babd:/catalogue/models.py?ds=inline diff --git a/catalogue/models.py b/catalogue/models.py index c684ab5..239f60c 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -7,9 +7,11 @@ from curriculum.models import Level, Curriculum, CurriculumCourse class Section(models.Model): title = models.CharField(max_length=255, unique=True) - slug = models.SlugField(unique=True) + slug = models.SlugField(max_length=255, unique=True) order = models.IntegerField() xml_file = models.FileField(upload_to="catalogue/section/xml", + null=True, blank=True, max_length=255) + image = models.ImageField(upload_to="catalogue/section/image", null=True, blank=True) class Meta: @@ -67,24 +69,24 @@ class Lesson(models.Model): section = models.ForeignKey(Section, null=True, blank=True) level = models.ForeignKey(Level) title = models.CharField(max_length=255) - slug = models.SlugField(unique=True) + slug = models.SlugField(max_length=255, unique=True) type = models.CharField(max_length=15, db_index=True) order = models.IntegerField(db_index=True) dc = JSONField(default='{}') - curriculum_courses = models.ManyToManyField(CurriculumCourse) + curriculum_courses = models.ManyToManyField(CurriculumCourse, blank=True) xml_file = models.FileField(upload_to="catalogue/lesson/xml", - null=True, blank=True) # FIXME: slug in paths + null=True, blank=True, max_length=255) html_file = models.FileField(upload_to="catalogue/lesson/html", - null=True, blank=True) + null=True, blank=True, max_length=255) package = models.FileField(upload_to="catalogue/lesson/pack", - null=True, blank=True) + null=True, blank=True, max_length=255) student_package = models.FileField(upload_to="catalogue/lesson/student_pack", - null=True, blank=True) + null=True, blank=True, max_length=255) pdf = models.FileField(upload_to="catalogue/lesson/pdf", - null=True, blank=True) + null=True, blank=True, max_length=255) student_pdf = models.FileField(upload_to="catalogue/lesson/student_pdf", - null=True, blank=True) + null=True, blank=True, max_length=255) class Meta: ordering = ['section', 'level', 'order'] @@ -122,9 +124,10 @@ class Lesson(models.Model): lesson.populate_dc() 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) + if lesson.type != 'project': + lesson.build_pdf(student=True, infile=infile) + lesson.build_package(student=True) return lesson def populate_dc(self): @@ -144,26 +147,28 @@ class Lesson(models.Model): courses.add(curr.course) self.curriculum_courses = courses - def build_html(self, infile=None): + def wldocument(self, infile=None): + from librarian import IOFile from librarian.parser import WLDocument - from .publish import HtmlFormat, OrmDocProvider + from .publish import OrmDocProvider if infile is None: - wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider) - else: - wldoc = WLDocument(infile, provider=OrmDocProvider()) + infile = IOFile.from_filename(self.xml_file.path) + for att in self.attachment_set.all(): + infile.attachments["%s.%s" % (att.slug, att.ext)] = \ + IOFile.from_filename(att.file.path) + return WLDocument(infile, provider=OrmDocProvider()) + + def build_html(self, infile=None): + from .publish import HtmlFormat + wldoc = self.wldocument(infile) html = HtmlFormat(wldoc).build() 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()) + from .publish import PdfFormat + wldoc = self.wldocument(infile) if student: pdf = PdfFormat(wldoc).build() self.student_pdf.save("%s.pdf" % self.slug, @@ -174,17 +179,15 @@ class Lesson(models.Model): 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: zipf.write(pdf.path, "%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)) - - + for attachment in self.attachment_set.all(): + zipf.write(attachment.file.path, + u"%smaterialy/%s.%s" % (prefix, attachment.slug, attachment.ext)) + zipf.write(self.xml_file.path, + "%spliki-zrodlowe/%s.xml" % (prefix, self.slug)) def build_package(self, student=False): from StringIO import StringIO @@ -200,8 +203,15 @@ class Lesson(models.Model): ContentFile(buff.getvalue())) def get_syntetic(self): + if self.section is None: return None return self.section.syntetic_lesson(self.level) + def get_other_level(self): + if self.section is None: return None + other_levels = self.section.lesson_set.exclude(level=self.level) + if other_levels.exists(): + return other_levels[0].level + def get_previous(self): if self.section is None: return None try: @@ -241,3 +251,17 @@ class Part(models.Model): null=True, blank=True) student_pdf = models.FileField(upload_to="catalogue/part/student_pdf", null=True, blank=True) + + +class LessonStub(models.Model): + section = models.ForeignKey(Section, null=True, blank=True) + level = models.ForeignKey(Level) + title = models.CharField(max_length=255) + type = models.CharField(max_length=15, db_index=True) + order = models.IntegerField(db_index=True) + + class Meta: + ordering = ['section', 'level', 'order'] + + def __unicode__(self): + return self.title