X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/698b793845a58fcac88a2bd40a8b93d018549931..abd66021256d14b8d3ac7a09d9673f5c0b7cc174:/catalogue/models.py diff --git a/catalogue/models.py b/catalogue/models.py index 6e615a8..d052d67 100644 --- a/catalogue/models.py +++ b/catalogue/models.py @@ -164,11 +164,12 @@ class Lesson(models.Model): wldoc = WLDocument.from_file(self.xml_file.path, provider=OrmDocProvider) else: wldoc = WLDocument(infile, provider=OrmDocProvider()) - pdf = PdfFormat(wldoc).build() 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()))) @@ -177,7 +178,7 @@ class Lesson(models.Model): "%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 ""))