Some archeology.

[edumed.git] / curriculum / models.py

diff --git a/curriculum/models.py b/curriculum/models.py
index b4d8ac4..0c3acb2 100644 (file)
--- a/curriculum/models.py
+++ b/curriculum/models.py
@@ -3,7 +3,12 @@ import re
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _, get_language

+from fnpdjango.storage import BofhFileSystemStorage

 from fnpdjango.utils.models.translation import add_translatable
 from fnpdjango.utils.models.translation import add_translatable

+from fnpdjango.utils.text.slughifi import slughifi as slugify
+
+bofh_storage = BofhFileSystemStorage()
+

 
 class Section(models.Model):
     slug = models.SlugField(_('slug'))
 
 class Section(models.Model):
     slug = models.SlugField(_('slug'))


@@ -24,7 +29,7 @@ class Section(models.Model):
         return "%s?s=%d&level=%s&d=1" % (reverse("curriculum"), self.pk, level.slug)
 
 add_translatable(Section, {
         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 = '')
+    'name': models.CharField(_('name'), max_length=255, default='')

 })
 
 
 })
 
 


@@ -61,7 +66,7 @@ class Competence(models.Model):
             return cls.objects.get(**{lookup_field_name: parts[1].strip()})
 
 add_translatable(Competence, {
             return cls.objects.get(**{lookup_field_name: parts[1].strip()})
 
 add_translatable(Competence, {

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

 })
 
 
 })
 
 


@@ -69,10 +74,12 @@ class Level(models.Model):
     slug = models.CharField(_('slug'), max_length=255, unique=True)
     meta_name = models.CharField(_('meta name'), max_length=255, unique=True)
     order = models.IntegerField(_('order'))
     slug = models.CharField(_('slug'), max_length=255, unique=True)
     meta_name = models.CharField(_('meta name'), max_length=255, unique=True)
     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)
+    package = models.FileField(
+        upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s.zip" % i.slug,
+        null=True, blank=True, max_length=255, storage=bofh_storage)
+    student_package = models.FileField(
+        upload_to=lambda i, f: "curriculum/pack/edukacjamedialna_%s_uczen.zip" % i.slug,
+        null=True, blank=True, max_length=255, storage=bofh_storage)

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


@@ -92,25 +99,33 @@ class Level(models.Model):
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile
         from StringIO import StringIO
         import zipfile
         from django.core.files.base import ContentFile

-        from catalogue.templatetags.catalogue_tags import section_box
+        from catalogue.templatetags.catalogue_tags import level_box

         from catalogue.models import Lesson
 
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
 
         from catalogue.models import Lesson
 
         buff = StringIO()
         zipf = zipfile.ZipFile(buff, 'w', zipfile.ZIP_STORED)
 

-        lessons = section_box(self)['lessons']
+        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(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()):

+            assert section, clessons

             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']):
             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 = 'Kurs skrocony/%d %s/' % (i, lesson.slug)
+            prefix = 'Projekty/%d %s/' % (i, lesson.slug)

             lesson.add_to_zip(zipf, student, prefix)
         # Add all appendix lessons, from all levels.
             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')):
+        for lesson in Lesson.objects.filter(type='appendix'):
+            # ugly fix
+            if self.slug in ('przedszkole', 'sp1-3', 'sp4-6'):
+                if lesson.slug == 'slowniczek':
+                    continue
+            else:
+                if lesson.slug == 'slowniczek-sp':
+                    continue

             prefix = '%s/' % lesson.slug
             lesson.add_to_zip(zipf, student, prefix)
         zipf.close()
             prefix = '%s/' % lesson.slug
             lesson.add_to_zip(zipf, student, prefix)
         zipf.close()


@@ -123,10 +138,9 @@ class Level(models.Model):
         self.build_package(True)
 
 
         self.build_package(True)
 
 

-

 add_translatable(Level, {
 add_translatable(Level, {

-    'name': models.CharField(_('name'), max_length=255, default = ''),
-    'group': models.CharField(_('group'), max_length=255, default = '')
+    'name': models.CharField(_('name'), max_length=255, default=''),
+    'group': models.CharField(_('group'), max_length=255, default='')

 })
 
 
 })
 
 


@@ -146,12 +160,13 @@ class CompetenceLevel(models.Model):
         return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug)
 
 add_translatable(CompetenceLevel, {
         return "%s?c=%d&level=%s&d=1" % (reverse("curriculum"), self.competence.pk, self.level.slug)
 
 add_translatable(CompetenceLevel, {

-    'description': models.TextField(_('description'), default = '')
+    'description': models.TextField(_('description'), default='')

 })
 
 
 class CurriculumLevel(models.Model):
     title = models.CharField(max_length=16, db_index=True)
 })
 
 
 class CurriculumLevel(models.Model):
     title = models.CharField(max_length=16, db_index=True)

+    verbose = models.CharField(max_length=32)

 
     class Meta:
         verbose_name = _("curriculum level")
 
     class Meta:
         verbose_name = _("curriculum level")


@@ -177,15 +192,16 @@ class CurriculumCourse(models.Model):
 
 class Curriculum(models.Model):
     """Official curriculum."""
 
 class Curriculum(models.Model):
     """Official curriculum."""

-    TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania'}
+    TYPES = {'c': u'Cele kształcenia', 't': u'Treści nauczania', 'o': u'Osiągnięcia'}

 
 

-    identifier = models.CharField(max_length=255, db_index=True)
-    title = models.CharField(max_length=255)
+    identifier = models.CharField(max_length=255, db_index=True, unique=True)
+    title = models.CharField(max_length=1024)

     course = models.ForeignKey(CurriculumCourse)
     level = models.ForeignKey(CurriculumLevel)
     type = models.CharField(max_length=16, choices=TYPES.items())
 
     class Meta:
     course = models.ForeignKey(CurriculumCourse)
     level = models.ForeignKey(CurriculumLevel)
     type = models.CharField(max_length=16, choices=TYPES.items())
 
     class Meta:

+        ordering = ['identifier']

         verbose_name = _("curriculum item")
         verbose_name_plural = _("curriculum items")
 
         verbose_name = _("curriculum item")
         verbose_name_plural = _("curriculum items")
 


@@ -195,18 +211,21 @@ class Curriculum(models.Model):
     @classmethod
     def from_text(cls, identifier, title):
         m = re.match(r"^\d+/(?P<level>[^/]+)/(?P<course>[^/]+)/"
     @classmethod
     def from_text(cls, identifier, title):
         m = re.match(r"^\d+/(?P<level>[^/]+)/(?P<course>[^/]+)/"

-                     "(?P<type>(?:%s))[^/]+(?P<roz>/roz)?" %
-                        "|".join(cls.TYPES), identifier)
+                     r"(?P<type>(?:%s))[^/]+(?P<roz>/roz)?" % "|".join(cls.TYPES), identifier)

         assert m is not None, "Curriculum identifier doesn't match template."
         level, created = CurriculumLevel.objects.get_or_create(
                                        title=m.group('level'))
         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()
+        if created:
+            print 'created level:', m.group('level')
+        def_title = m.group('course').capitalize()

         course, created = CurriculumCourse.objects.get_or_create(
         course, created = CurriculumCourse.objects.get_or_create(

-                                        slug=m.group('course').lower(),
+                                        slug=slugify(m.group('course')),

                                         defaults={
                                             'title': def_title,
                                             'accusative': def_title,
                                         })
                                         defaults={
                                             'title': def_title,
                                             'accusative': def_title,
                                         })

+        if created:
+            print 'created course:', slugify(m.group('course')), def_title

         type_ = m.group('type')
         if m.group('roz'):
             title += " (zakres rozszerzony)"
         type_ = m.group('type')
         if m.group('roz'):
             title += " (zakres rozszerzony)"


@@ -221,4 +240,3 @@ class Curriculum(models.Model):
         curr.type = type_
         curr.save()
         return curr
         curr.type = type_
         curr.save()
         return curr

-