Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / src / reporting / views.py

diff --git a/src/reporting/views.py b/src/reporting/views.py
index d17d212..9eecf0d 100644 (file)
--- a/src/reporting/views.py
+++ b/src/reporting/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -7,8 +6,7 @@ from datetime import date
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.db.models import Count
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.db.models import Count

-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render

 
 from catalogue.models import Book, BookMedia
 from reporting.utils import render_to_pdf, render_to_csv, generated_file_view
 
 from catalogue.models import Book, BookMedia
 from reporting.utils import render_to_pdf, render_to_csv, generated_file_view


@@ -16,7 +14,6 @@ from reporting.utils import render_to_pdf, render_to_csv, generated_file_view
 
 @staff_member_required
 def stats_page(request):
 
 @staff_member_required
 def stats_page(request):

-    media = BookMedia.objects.count()

     media_types = BookMedia.objects.values('type').annotate(count=Count('type')).order_by('type')
     for mt in media_types:
         mt['size'] = sum(b.file.size for b in BookMedia.objects.filter(type=mt['type']).iterator())
     media_types = BookMedia.objects.values('type').annotate(count=Count('type')).order_by('type')
     for mt in media_types:
         mt['size'] = sum(b.file.size for b in BookMedia.objects.filter(type=mt['type']).iterator())


@@ -27,18 +24,27 @@ def stats_page(request):
         else:
             mt['deprecated'] = '-'
 
         else:
             mt['deprecated'] = '-'
 

-    licenses = set((
-        (b.extra_info.get('license'), b.extra_info.get('license_description'))
-        for b in Book.objects.all().iterator() if b.extra_info.get('license')))
+    licenses = set()
+    for b in Book.objects.all().iterator():
+        extra_info = b.get_extra_info_json()
+        if extra_info.get('license'):
+            licenses.add((extra_info.get('license'), extra_info.get('license_description')))

 
 

-    return render_to_response('reporting/main.html', locals(), context_instance=RequestContext(request))
+    return render(request, 'reporting/main.html', {
+        'media_types': media_types,
+        'licenses': licenses,
+    })

 
 
 @generated_file_view('reports/katalog.pdf', 'application/pdf',
                      send_name=lambda: 'wolnelektury_%s.pdf' % date.today(), signals=[Book.published])
 def catalogue_pdf(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
 
 
 @generated_file_view('reports/katalog.pdf', 'application/pdf',
                      send_name=lambda: 'wolnelektury_%s.pdf' % date.today(), signals=[Book.published])
 def catalogue_pdf(path):
     books_by_author, orphans, books_by_parent = Book.book_list()

-    render_to_pdf(path, 'reporting/catalogue.texml', locals(), {
+    render_to_pdf(path, 'reporting/catalogue.texml', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    }, {

         "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
     })
 
         "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
     })
 


@@ -47,4 +53,8 @@ def catalogue_pdf(path):
                      send_name=lambda: 'wolnelektury_%s.csv' % date.today(), signals=[Book.published])
 def catalogue_csv(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
                      send_name=lambda: 'wolnelektury_%s.csv' % date.today(), signals=[Book.published])
 def catalogue_csv(path):
     books_by_author, orphans, books_by_parent = Book.book_list()

-    render_to_csv(path, 'reporting/catalogue.csv', locals())
+    render_to_csv(path, 'reporting/catalogue.csv', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    })