X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/196e0116ea78f78b2eeab0e76b8a4d79d5ded9aa..5bd425286aab85aa853b3c1ff4e5e730795b299e:/curriculum/models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index cfe5ffe..314fa1f 100644
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -109,6 +109,7 @@ class Level(models.Model):
             prefix = 'Skrocony kurs/%d %s/' % (i, lesson.slug)
             lesson.add_to_zip(zipf, student, prefix)
         for c, (section, clessons) in enumerate(lessons['course'].items()):
+            assert section, clessons
             for i, lesson in enumerate(clessons):
                 prefix = 'Pelny kurs/%d %s/%d %s/' % (c, section.slug, i, lesson.slug)
                 lesson.add_to_zip(zipf, student, prefix)
@@ -117,6 +118,13 @@ class Level(models.Model):
             lesson.add_to_zip(zipf, student, prefix)
         # Add all appendix lessons, from all levels.
         for lesson in Lesson.objects.filter(type='appendix'):
+            # ugly fix
+            if self.slug in ('przedszkole', 'sp1-3', 'sp4-6'):
+                if lesson.slug == 'slowniczek':
+                    continue
+            else:
+                if lesson.slug == 'slowniczek-sp':
+                    continue
             prefix = '%s/' % lesson.slug
             lesson.add_to_zip(zipf, student, prefix)
         zipf.close()
@@ -184,13 +192,14 @@ class Curriculum(models.Model):
     """Official curriculum."""
     TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania'}
 
-    identifier = models.CharField(max_length=255, db_index=True)
+    identifier = models.CharField(max_length=255, db_index=True, unique=True)
     title = models.CharField(max_length=255)
     course = models.ForeignKey(CurriculumCourse)
     level = models.ForeignKey(CurriculumLevel)
     type = models.CharField(max_length=16, choices=TYPES.items())
 
     class Meta:
+        ordering = ['identifier']
         verbose_name = _("curriculum item")
         verbose_name_plural = _("curriculum items")