X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/12313cd815102f970c09afc1999d26cec8d99d5c..f3e40709f5b8ebcdf42bbfd705cf8043759d9e64:/curriculum/models.py diff --git a/curriculum/models.py b/curriculum/models.py index 314fa1f..0c3acb2 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() @@ -165,6 +166,7 @@ add_translatable(CompetenceLevel, { class CurriculumLevel(models.Model): title = models.CharField(max_length=16, db_index=True) + verbose = models.CharField(max_length=32) class Meta: verbose_name = _("curriculum level") @@ -190,10 +192,10 @@ 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, unique=True) - title = models.CharField(max_length=255) + title = models.CharField(max_length=1024) course = models.ForeignKey(CurriculumCourse) level = models.ForeignKey(CurriculumLevel) type = models.CharField(max_length=16, choices=TYPES.items()) @@ -213,13 +215,17 @@ 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() + if created: + print 'created level:', m.group('level') + 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, }) + if created: + print 'created course:', slugify(m.group('course')), def_title type_ = m.group('type') if m.group('roz'): title += " (zakres rozszerzony)"