X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/0b7c6a7b88888fe948faa33edc988ba10d62b7c5..334d0b5148de69b0509e001631154aa3ec788d36:/catalogue/templatetags/catalogue_tags.py diff --git a/catalogue/templatetags/catalogue_tags.py b/catalogue/templatetags/catalogue_tags.py index 4485e18..b74224d 100755 --- a/catalogue/templatetags/catalogue_tags.py +++ b/catalogue/templatetags/catalogue_tags.py @@ -1,6 +1,9 @@ +# -*- coding: utf-8 -*- +from collections import defaultdict from django import template from django.utils.datastructures import SortedDict from ..models import Lesson, Section +from curriculum.models import Level, CurriculumCourse from librarian.dcparser import WLURI, Person register = template.Library() @@ -8,62 +11,131 @@ register = template.Library() @register.inclusion_tag("catalogue/snippets/carousel.html") def catalogue_carousel(): - lessons_count = Lesson.objects.filter(type__in=('course', 'synthetic')).count() - if 1 < lessons_count % 10 < 5 and lessons_count / 10 % 10 != 1: - lessons_desc = u'kompletne lekcje' - else: - lessons_desc = u'kompletnych lekcji' - return locals() - -@register.inclusion_tag("catalogue/snippets/section_buttons.html") -def catalogue_section_buttons(): return { "object_list": Section.objects.all() } -@register.inclusion_tag("catalogue/snippets/section_box.html") -def section_box(section): - lessons = SortedDict() + +@register.inclusion_tag("catalogue/snippets/levels_main.html") +def catalogue_levels_main(): + object_list = Level.objects.exclude(lesson=None) + c = object_list.count() + return { + 'object_list': object_list, + # 'section_width': (700 - 20 * (c - 1)) / c, + 'section_width': (700 - 20 * 2) / 3 + } + + +@register.inclusion_tag("catalogue/snippets/level_box.html") +def level_box(level): + lessons = {'synthetic': [], 'course': SortedDict(), 'project': []} + by_course = defaultdict(lambda: defaultdict(list)) + lesson_lists = [alist for alist in [ - list(section.lesson_set.all()), - list(section.lessonstub_set.all()) + list(level.lesson_set.exclude(type='appendix').order_by('section__order', 'order')), + list(level.lessonstub_set.all()) ] if alist] + while lesson_lists: min_index, min_list = min(enumerate(lesson_lists), key=lambda x: x[1][0].order) lesson = min_list.pop(0) if not min_list: lesson_lists.pop(min_index) - if lesson.level not in lessons: - newdict = SortedDict() - newdict['synthetic'] = [] - newdict['course'] = [] - lessons[lesson.level] = newdict - if lesson.type not in lessons[lesson.level]: - lessons[lesson.level][lesson.type] = [] - lessons[lesson.level][lesson.type].append(lesson) + if lesson.type == 'course': + if lesson.section not in lessons['course']: + lessons['course'][lesson.section] = [] + lessons['course'][lesson.section].append(lesson) + elif lesson.type.startswith('added'): + continue + else: + lessons[lesson.type].append(lesson) + + if hasattr(lesson, 'curriculum_courses'): + for course in lesson.curriculum_courses.all(): + by_course[course][lesson.type].append(lesson) + + courses = [(course, by_course[course]) + for course in CurriculumCourse.objects.filter(lesson__level=level).distinct()] + + added = [] + if level.slug == 'liceum': + added.append({ + 'slug': 'filmowa', + 'title': u'Edukacja filmowa', + 'lessons': [ + Lesson.objects.get(slug=s) for s in [ + 'film-co-to-wlasciwie-jest', + 'scenariusz-scenopis-i-srodki-realizacyjne', + 'kompozycja-obrazu-filmowego', + 'praca-kamery-kadr-kat', + 'montaz-materialu-filmowego', + 'swiatlo-i-dzwiek-w-filmie', + 'scenografia-charakteryzacja-kostiumy-i-aktorzy', + 'narracja-w-filmie-tekst-i-fabula', + ] + ], + }) + added.append({ + 'slug': 'varsaviana', + 'title': u'Edukacja varsavianistyczna', + 'lessons': [ + Lesson.objects.get(slug=s) for s in [ + 'czego-prus-w-lalce-o-zydach-nie-powiedzial', + 'jak-zmienila-sie-warszawa-o-dworcu-dawniej-i-dzis', + 'o-gwarze-praskiej', + 'poznaj-i-pokaz-prage', + 'praga-trzech-religii', + 'sladami-zydow-w-warszawie', + 'tajemnice-palacu-saskiego', + 'warszawa-przedwojenne-miasto-neonow', + 'warszawski-barok', + 'ziemianska-jako-soczewka-swiata-lat-miedzywojennych', + ] + ], + }) + return { - "section": section, + "level": level, "lessons": lessons, + "courses": courses, + "added": added, } + @register.inclusion_tag("catalogue/snippets/lesson_nav.html") def lesson_nav(lesson): - if lesson.type in ('course', 'project'): + if lesson.type == 'course': root = lesson.section siblings = Lesson.objects.filter(type='course', level=lesson.level, section=root) - mark_level = False - else: + elif lesson.type == 'appendix': root = None siblings = Lesson.objects.filter(type=lesson.type) - mark_level = True + elif lesson.type == 'added': + root = None + siblings = [ + Lesson.objects.get(slug=s) for s in [ + 'film-co-to-wlasciwie-jest', + 'scenariusz-scenopis-i-srodki-realizacyjne', + 'kompozycja-obrazu-filmowego', + 'praca-kamery-kadr-kat', + 'montaz-materialu-filmowego', + 'swiatlo-i-dzwiek-w-filmie', + 'scenografia-charakteryzacja-kostiumy-i-aktorzy', + 'narracja-w-filmie-tekst-i-fabula', + ] + ] + else: + root = None + siblings = Lesson.objects.filter(type=lesson.type, level=lesson.level) return { "lesson": lesson, "root": root, "siblings": siblings, - "mark_level": mark_level } + @register.inclusion_tag("catalogue/snippets/lesson_link.html") def lesson_link(uri): try: @@ -71,6 +143,7 @@ def lesson_link(uri): except Lesson.DoesNotExist: return {} + @register.filter def person_list(persons): return u", ".join(Person.from_text(p).readable() for p in persons) @@ -79,6 +152,8 @@ def person_list(persons): # FIXME: Move to fnpdjango import feedparser import datetime + + @register.inclusion_tag('catalogue/latest_blog_posts.html') def latest_blog_posts(feed_url, posts_to_show=5): try: @@ -86,7 +161,7 @@ def latest_blog_posts(feed_url, posts_to_show=5): posts = [] for i in range(posts_to_show): pub_date = feed['entries'][i].updated_parsed - published = datetime.date(pub_date[0], pub_date[1], pub_date[2] ) + published = datetime.date(pub_date[0], pub_date[1], pub_date[2]) posts.append({ 'title': feed['entries'][i].title, 'summary': feed['entries'][i].summary,