X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/abd66021256d14b8d3ac7a09d9673f5c0b7cc174..8489d044ccb3f0ea247eae2dec8387d5b206e4b4:/catalogue/models.py?ds=inline diff --git a/catalogue/models.py b/catalogue/models.py index d052d67..ea1063e 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -7,10 +7,10 @@ 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) + null=True, blank=True, max_length=255) class Meta: ordering = ['order'] @@ -67,24 +67,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) 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'] @@ -180,6 +180,10 @@ class Lesson(models.Model): 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)) + def build_package(self, student=False):