Fixes #3315: Lessons ordering.

[edumed.git] / curriculum / models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index e34e5ab..b8cd81d 100644 (file)
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -2,10 +2,10 @@
 import re
 from django.core.urlresolvers import reverse
 from django.db import models
 import re
 from django.core.urlresolvers import reverse
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, get_language
+from fnpdjango.utils.models.translation import add_translatable

 
 class Section(models.Model):
 
 class Section(models.Model):

-    name = models.CharField(_('name'), max_length=255)

     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 


@@ -17,14 +17,24 @@ class Section(models.Model):
     def __unicode__(self):
         return self.name
 
     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)
 class Competence(models.Model):
     section = models.ForeignKey(Section)

-    name = models.CharField(_('name'), max_length=255)

     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 
     class Meta:
     slug = models.SlugField(_('slug'))
     order = models.IntegerField(_('order'))
 
     class Meta:

-        ordering = ['order']
+        ordering = ['section', 'order']

         verbose_name = _('competence')
         verbose_name_plural = _('competences')
 
         verbose_name = _('competence')
         verbose_name_plural = _('competences')
 


@@ -37,16 +47,32 @@ class Competence(models.Model):
     def for_level(self, level):
         return self.competencelevel_set.get(level=level)
 
     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):
     @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)
+        lookup_field_name = 'name_%s__iexact' % get_language()
+        if len(parts) == 1:
+            return Section.objects.get(**{lookup_field_name: text.strip()})
+        else:
+            return cls.objects.get(**{lookup_field_name: parts[1].strip()})
+
+add_translatable(Competence, {
+    'name': models.CharField(_('name'), max_length=255, default = '')
+})
+

 
 class Level(models.Model):
 
 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)
+    slug = models.CharField(_('slug'), max_length=255, unique=True)
+    meta_name = models.CharField(_('meta name'), max_length=255, unique=True)

     order = models.IntegerField(_('order'))
     order = models.IntegerField(_('order'))

+    package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,
+        null=True, blank=True, max_length=255)
+    student_package = models.FileField(upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,
+        null=True, blank=True, max_length=255)

 
     class Meta:
         ordering = ['order']
 
     class Meta:
         ordering = ['order']


@@ -56,10 +82,57 @@ class Level(models.Model):
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name
 

+    def length_course(self):
+        return self.lesson_set.filter(type='course').count()
+
+    def length_synthetic(self):
+        return self.lesson_set.filter(type='synthetic').count()
+
+    def build_package(self, student):
+        from StringIO import StringIO
+        import zipfile
+        from django.core.files.base import ContentFile
+        from catalogue.templatetags.catalogue_tags import level_box
+        from catalogue.models import Lesson
+
+        buff = StringIO()
+        zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
+
+        lessons = level_box(self)['lessons']
+        for i, lesson in enumerate(lessons['synthetic']):
+            prefix = 'Skrocony kurs/%d %s/' % (i, lesson.slug)
+            lesson.add_to_zip(zipf, student, prefix)
+        for c, (section, clessons) in enumerate(lessons['course'].items()):
+            for i, lesson in enumerate(clessons):
+                prefix = 'Pelny kurs/%d %s/%d %s/' % (c, section.slug, i, lesson.slug)
+                lesson.add_to_zip(zipf, student, prefix)
+        for i, lesson in enumerate(lessons['project']):
+            prefix = 'Projekty/%d %s/' % (i, lesson.slug)
+            lesson.add_to_zip(zipf, student, prefix)
+        # Add all appendix lessons, from all levels.
+        for lesson in Lesson.objects.exclude(type__in=('synthetic', 'course', 'project')):
+            prefix = '%s/' % lesson.slug
+            lesson.add_to_zip(zipf, student, prefix)
+        zipf.close()
+
+        fieldname = "student_package" if student else "package"
+        getattr(self, fieldname).save(None, ContentFile(buff.getvalue()))
+
+    def build_packages(self):
+        self.build_package(False)
+        self.build_package(True)
+
+
+
+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)
 class CompetenceLevel(models.Model):
     competence = models.ForeignKey(Competence)
     level = models.ForeignKey(Level)

-    description = models.TextField(_('description'))

 
     class Meta:
         ordering = ['competence', 'level']
 
     class Meta:
         ordering = ['competence', 'level']


@@ -72,6 +145,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)
 
     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):
 
 
 class CurriculumLevel(models.Model):