Minor style tweaks

[prawokultury.git] / questions / views.py

diff --git a/questions/views.py b/questions/views.py
index d493dd9..f35f5fe 100644 (file)
--- a/questions/views.py
+++ b/questions/views.py
@@ -41,21 +41,30 @@ class QuestionListView(ListView):
         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['tags'] = Tag.objects.filter(items__question__published=True
-            ).annotate(c=models.Count('items__tag')).order_by('-c', 'slug')
         context['tag'] = self.tag
         context['tag_categories'] = TagCategory.objects.all().annotate(click_count = models.Sum('tags__click_count'))
+        context['tag_lists'] = dict()
         
-        # Calculating factors for category and tag clouds
-        all_tag_clicks_count = Tag.objects.all().aggregate(models.Sum('click_count'))['click_count__sum']
         annotated_categories = dict()
-        minimum_factor = 0.7
+        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.factor =  '%.2f' % (minimum_factor + (float(category.click_count) / all_tag_clicks_count))
-        for tag in [t for t in context['tags'] if t.category]:
-            category = annotated_categories[tag.category.id]
-            tag.factor = '%.2f' % (minimum_factor + ((float(tag.click_count) / category.click_count) if category.click_count else 0))
+            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