Fixing broken search form markup

[edumed.git] / curriculum / models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index 1f543b9..a3e2280 100644 (file)
--- 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'))
 
@@ -17,9 +17,19 @@ 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)
+        
+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'))
 
@@ -37,14 +47,24 @@ 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())
+
+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'))
 
@@ -56,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']
@@ -72,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):