From: Radek Czajka Date: Tue, 19 Feb 2013 13:38:25 +0000 (+0100) Subject: allow competence sections in dc X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/8489d044ccb3f0ea247eae2dec8387d5b206e4b4?ds=inline allow competence sections in dc --- diff --git a/curriculum/models.py b/curriculum/models.py index 1f543b9..004e78e 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) @@ -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 = text.rsplit(u'\u2013', 1) + if len(parts) == 1: + return Section.objects.get(name__iexact=text.strip()) + else: + return cls.objects.get(name__iexact=parts[1]) class Level(models.Model): group = models.CharField(_('group'), max_length=255) diff --git a/curriculum/templatetags/curriculum_tags.py b/curriculum/templatetags/curriculum_tags.py index 6839885..cf0cc7d 100755 --- a/curriculum/templatetags/curriculum_tags.py +++ b/curriculum/templatetags/curriculum_tags.py @@ -42,7 +42,7 @@ def curriculum(identifiers): @register.filter def url_for_level(comp, level): try: - return comp.for_level(level).get_absolute_url() + return comp.url_for_level(level) except: return comp.get_absolute_url()