X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/8489d044ccb3f0ea247eae2dec8387d5b206e4b4..fef1b19bb026b1515092b0215307fea285464a26:/curriculum/models.py?ds=sidebyside diff --git a/curriculum/models.py b/curriculum/models.py index 004e78e..a3e2280 100644 --- a/curriculum/models.py +++ b/curriculum/models.py @@ -3,9 +3,9 @@ import re from django.core.urlresolvers import reverse from django.db import models from django.utils.translation import ugettext_lazy as _ +from fnpdjango.utils.models.translation import add_translatable class Section(models.Model): - name = models.CharField(_('name'), max_length=255) slug = models.SlugField(_('slug')) order = models.IntegerField(_('order')) @@ -23,10 +23,13 @@ class Section(models.Model): def url_for_level(self, level): 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 = '') +}) + class Competence(models.Model): section = models.ForeignKey(Section) - name = models.CharField(_('name'), max_length=255) slug = models.SlugField(_('slug')) order = models.IntegerField(_('order')) @@ -50,15 +53,18 @@ class Competence(models.Model): @classmethod def from_text(cls, text): """Tries to return a Competence or a Section.""" - parts = text.rsplit(u'\u2013', 1) + parts = re.split(ur'[-\u2013]', text, 1) if len(parts) == 1: return Section.objects.get(name__iexact=text.strip()) else: - return cls.objects.get(name__iexact=parts[1]) + return cls.objects.get(name__iexact=parts[1].strip()) + +add_translatable(Competence, { + 'name': models.CharField(_('name'), max_length=255, default = '') +}) + class Level(models.Model): - group = models.CharField(_('group'), max_length=255) - name = models.CharField(_('name'), max_length=255) slug = models.CharField(_('slug'), max_length=255) order = models.IntegerField(_('order')) @@ -70,10 +76,15 @@ class Level(models.Model): def __unicode__(self): return self.name +add_translatable(Level, { + 'name': models.CharField(_('name'), max_length=255, default = ''), + 'group': models.CharField(_('group'), max_length=255, default = '') +}) + + class CompetenceLevel(models.Model): competence = models.ForeignKey(Competence) level = models.ForeignKey(Level) - description = models.TextField(_('description')) class Meta: ordering = ['competence', 'level'] @@ -86,6 +97,9 @@ class CompetenceLevel(models.Model): def get_absolute_url(self): return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug) +add_translatable(CompetenceLevel, { + 'description': models.TextField(_('description'), default = '') +}) class CurriculumLevel(models.Model):