Minor style tweaks

[prawokultury.git] / questions / views.py

diff --git a/questions/views.py b/questions/views.py
index b68d24b..f35f5fe 100644 (file)
--- a/questions/views.py
+++ b/questions/views.py
@@ -3,10 +3,12 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.core.urlresolvers import reverse_lazy
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.core.urlresolvers import reverse_lazy

+from django.db import models
+from django.shortcuts import get_object_or_404

 from django.views.generic import ListView
 from django.views.generic.edit import FormView
 from .forms import QuestionForm
 from django.views.generic import ListView
 from django.views.generic.edit import FormView
 from .forms import QuestionForm

-from .models import Question, Tag
+from .models import Question, Tag, TagCategory

 
 
 class QuestionFormView(FormView):
 
 
 class QuestionFormView(FormView):


@@ -24,20 +26,45 @@ class QuestionListView(ListView):
         self.tag = None
         if 'tag' in request.GET:
             try:
         self.tag = None
         if 'tag' in request.GET:
             try:

-                self.tag = Tag.objects.get(slug=request.GET['tag'])
-            except Tag.DoesNotExist:
+                self.tag = Tag.objects.filter(items__question__published=True, slug=request.GET['tag'])[0]
+            except IndexError:

                 pass
         return super(QuestionListView, self).get(request, *args, **kwargs)
 
     def get_queryset(self):
         qs = Question.objects.filter(published=True
                 ).order_by('-published_at')
                 pass
         return super(QuestionListView, self).get(request, *args, **kwargs)
 
     def get_queryset(self):
         qs = Question.objects.filter(published=True
                 ).order_by('-published_at')

-        if 'tag' in self.request.GET:
-            qs = qs.filter(tags__slug=self.request.GET['tag'])
+        if self.tag:
+            qs = qs.filter(tags=self.tag)
+            self.tag.click_count += 1
+            self.tag.save()

         return qs
 
     def get_context_data(self, *args, **kwargs):
         return qs
 
     def get_context_data(self, *args, **kwargs):

+        def get_cloud_size(clicks, relate_to):
+            return '%.2f' % (0.7 + (float(clicks) / relate_to if relate_to != 0 else 0))
+        

         context = super(QuestionListView, self).get_context_data(*args, **kwargs)
         context = super(QuestionListView, self).get_context_data(*args, **kwargs)

-        context['tags'] = Tag.objects.all()

         context['tag'] = self.tag
         context['tag'] = self.tag

+        context['tag_categories'] = TagCategory.objects.all().annotate(click_count = models.Sum('tags__click_count'))
+        context['tag_lists'] = dict()
+        
+        annotated_categories = dict()
+        all_tags_click_count = Tag.objects.all().aggregate(models.Sum('click_count'))['click_count__sum']
+        for category in context['tag_categories']:
+            annotated_categories[category.id] = category
+            category.cloud_size =  get_cloud_size(category.click_count, all_tags_click_count)
+        
+        tags = Tag.objects.filter(items__question__published=True) \
+                  .annotate(c=models.Count('items__tag')).order_by('category__slug', '-c', 'slug')
+        uncategorized_tags_click_count = Tag.objects.filter(category=None).aggregate(models.Sum('click_count'))['click_count__sum']
+        for tag in tags:
+            if tag.category:
+                category_click_count = annotated_categories[tag.category.id].click_count
+            else:
+                category_click_count = uncategorized_tags_click_count
+            tag.cloud_size = get_cloud_size(tag.click_count, category_click_count)
+            context['tag_lists'].setdefault(tag.category.id if tag.category else 0, []).append(tag)
+        context['has_uncategorized_tags'] = 0 in context['tag_lists']
+        

         return context
         return context