X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cf52e60f9665dc878fc2b3ab9db17d981c52030b..63afb46b7a39881c3a3655af645d5414bdd730ea:/curriculum/models.py?ds=inline diff --git a/curriculum/models.py b/curriculum/models.py index 14c916f..ad98877 100644 --- a/curriculum/models.py +++ b/curriculum/models.py @@ -17,6 +17,13 @@ class Section(models.Model): def __unicode__(self): return self.name + def get_absolute_url(self): + return "%s?s=%d" % (reverse("curriculum"), self.pk) + + def url_for_level(self, level): + return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug) + + class Competence(models.Model): section = models.ForeignKey(Section) name = models.CharField(_('name'), max_length=255) @@ -24,7 +31,7 @@ class Competence(models.Model): order = models.IntegerField(_('order')) class Meta: - ordering = ['order'] + ordering = ['section', 'order'] verbose_name = _('competence') verbose_name_plural = _('competences') @@ -37,10 +44,17 @@ class Competence(models.Model): def for_level(self, level): return self.competencelevel_set.get(level=level) + def url_for_level(self, level): + return self.for_level(level).get_absolute_url() + @classmethod def from_text(cls, text): - name = text.rsplit(u'\u2013', 1)[-1].strip() - return cls.objects.get(name__iexact=name) + """Tries to return a Competence or a Section.""" + 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].strip()) class Level(models.Model): group = models.CharField(_('group'), max_length=255) @@ -87,11 +101,13 @@ class CurriculumLevel(models.Model): class CurriculumCourse(models.Model): title = models.CharField(max_length=255) + accusative = models.CharField(max_length=255) slug = models.CharField(max_length=255, db_index=True) class Meta: verbose_name = _("curriculum course") verbose_name_plural = _("curriculum courses") + ordering = ['slug'] def __unicode__(self): return self.title @@ -122,9 +138,13 @@ 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() course, created = CurriculumCourse.objects.get_or_create( - slug=m.group('course'), - defaults={'title': m.group('course').title()}) + slug=m.group('course').lower(), + defaults={ + 'title': def_title, + 'accusative': def_title, + }) type_ = m.group('type') if m.group('roz'): title += " (zakres rozszerzony)"