X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/7210db1597376df2228e65dcea91141f1d78495f..a995c5d7c893b45ab2bd81d9cec4e0e98227f66a:/curriculum/models.py?ds=inline

diff --git a/curriculum/models.py b/curriculum/models.py
index a5d531f..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()
 
@@ -28,7 +29,7 @@ class Section(models.Model):
         return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug)
 
 add_translatable(Section, {
-    'name': models.CharField(_('name'), max_length=255, default = '')
+    'name': models.CharField(_('name'), max_length=255, default='')
 })
 
 
@@ -65,7 +66,7 @@ class Competence(models.Model):
             return cls.objects.get(**{lookup_field_name: parts[1].strip()})
 
 add_translatable(Competence, {
-    'name': models.CharField(_('name'), max_length=255, default = '')
+    'name': models.CharField(_('name'), max_length=255, default='')
 })
 
 
@@ -73,9 +74,11 @@ class Level(models.Model):
     slug = models.CharField(_('slug'), max_length=255, unique=True)
     meta_name = models.CharField(_('meta name'), max_length=255, unique=True)
     order = models.IntegerField(_('order'))
-    package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,
+    package = models.FileField(
+        upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,
         null=True, blank=True, max_length=255, storage=bofh_storage)
-    student_package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,
+    student_package = models.FileField(
+        upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,
         null=True, blank=True, max_length=255, storage=bofh_storage)
 
     class Meta:
@@ -107,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)
@@ -114,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()
@@ -127,10 +138,9 @@ class Level(models.Model):
         self.build_package(True)
 
 
-
 add_translatable(Level, {
-    'name': models.CharField(_('name'), max_length=255, default = ''),
-    'group': models.CharField(_('group'), max_length=255, default = '')
+    'name': models.CharField(_('name'), max_length=255, default=''),
+    'group': models.CharField(_('group'), max_length=255, default='')
 })
 
 
@@ -150,7 +160,7 @@ class CompetenceLevel(models.Model):
         return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug)
 
 add_translatable(CompetenceLevel, {
-    'description': models.TextField(_('description'), default = '')
+    'description': models.TextField(_('description'), default='')
 })
 
 
@@ -181,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")
 
@@ -199,14 +210,13 @@ class Curriculum(models.Model):
     @classmethod
     def from_text(cls, identifier, title):
         m = re.match(r"^\d+/(?P<level>[^/]+)/(?P<course>[^/]+)/"
-                     "(?P<type>(?:%s))[^/]+(?P<roz>/roz)?" %
-                        "|".join(cls.TYPES), identifier)
+                     r"(?P<type>(?:%s))[^/]+(?P<roz>/roz)?" % "|".join(cls.TYPES), identifier)
         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,
@@ -225,4 +235,3 @@ class Curriculum(models.Model):
         curr.type = type_
         curr.save()
         return curr
-