X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6c9978c5bf8b1ef20871557c22b8b02df647d700..a995c5d7c893b45ab2bd81d9cec4e0e98227f66a:/curriculum/models.py?ds=sidebyside

diff --git a/curriculum/models.py b/curriculum/models.py
index 22de956..3a069dd 100644
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -5,6 +5,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language
 from fnpdjango.storage import BofhFileSystemStorage
 from fnpdjango.utils.models.translation import add_translatable
+from fnpdjango.utils.text.slughifi import slughifi as slugify
 
 bofh_storage = BofhFileSystemStorage()
 
@@ -109,6 +110,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)
@@ -116,7 +118,14 @@ class Level(models.Model):
             prefix = 'Projekty/%d %s/' % (i, lesson.slug)
             lesson.add_to_zip(zipf, student, prefix)
         # Add all appendix lessons, from all levels.
-        for lesson in Lesson.objects.exclude(type__in=('synthetic', 'course', 'project')):
+        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()
@@ -182,15 +191,16 @@ class CurriculumCourse(models.Model):
 
 class Curriculum(models.Model):
     """Official curriculum."""
-    TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania'}
+    TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania', 'o': u'Osiągnięcia'}
 
-    identifier = models.CharField(max_length=255, db_index=True)
-    title = models.CharField(max_length=255)
+    identifier = models.CharField(max_length=255, db_index=True, unique=True)
+    title = models.CharField(max_length=1024)
     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")
 
@@ -204,9 +214,9 @@ class Curriculum(models.Model):
         assert m is not None, "Curriculum identifier doesn't match template."
         level, created = CurriculumLevel.objects.get_or_create(
                                        title=m.group('level'))
-        def_title = m.group('course').title()
+        def_title = m.group('course').capitalize()
         course, created = CurriculumCourse.objects.get_or_create(
-                                        slug=m.group('course').lower(),
+                                        slug=slugify(m.group('course')),
                                         defaults={
                                             'title': def_title,
                                             'accusative': def_title,