From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Thu, 25 Apr 2013 15:13:52 +0000 (+0200)
Subject: Delivering factors for tags/categories to the template
X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/41d4a9b08fb78fd0087da89dd9eb52b482ad4c09?hp=abd62809a8ddece8fc94f621f3bffb6c850948a4

Delivering factors for tags/categories to the template
---

diff --git a/questions/templates/questions/question_list.html b/questions/templates/questions/question_list.html
index d9841a3..b6cea5a 100755
--- a/questions/templates/questions/question_list.html
+++ b/questions/templates/questions/question_list.html
@@ -28,9 +28,11 @@ technologii informacyjno-komunikacyjnych oraz posiada wieloletnie
 doświadczenie doradcze w tej tematyce.</p>
 
 Kategorie:
+<div>
 {% for category in tag_categories %}
-    <p>{{category}} {{category.click_count}}</p>
+        <span style="font-size: {{category.factor}}em;">{{category}}</span>
 {% endfor %}
+</div>
 
 Tematy: 
 {% if tag %}<a href=".">wszystkie</a>
diff --git a/questions/views.py b/questions/views.py
index 6a2dc52..d493dd9 100644
--- a/questions/views.py
+++ b/questions/views.py
@@ -46,4 +46,16 @@ class QuestionListView(ListView):
             ).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'))
+        
+        # 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
+        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))
+        
         return context