From: Aleksander Łukasz Date: Thu, 9 May 2013 10:39:04 +0000 (+0200) Subject: Refactoring questions.views X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/73996a2b72e0fc1026a3b6de57b1c00be8dd4525 Refactoring questions.views --- diff --git a/questions/templates/questions/question_list.html b/questions/templates/questions/question_list.html index 7206487..d20b8b2 100755 --- a/questions/templates/questions/question_list.html +++ b/questions/templates/questions/question_list.html @@ -34,7 +34,7 @@ doświadczenie doradcze w tej tematyce.

bez kategorii {% for category in tag_categories %} / - {{category}} + {{category}} {% endfor %}
@@ -43,8 +43,8 @@ doświadczenie doradcze w tej tematyce.

Wyświetl tylko na temat: {% for atag in tag_list %} {% if not forloop.first %}/{% endif %} - {% if atag == tag %}{{ atag }} - {% else %}{{ atag }} + {% if atag == tag %}{{ atag }} + {% else %}{{ atag }} {% endif %} {% endfor %}
diff --git a/questions/views.py b/questions/views.py index 5b90325..076a2e0 100644 --- a/questions/views.py +++ b/questions/views.py @@ -41,25 +41,29 @@ 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['tag'] = self.tag context['tag_categories'] = TagCategory.objects.all().annotate(click_count = models.Sum('tags__click_count')) context['tag_lists'] = dict() - tags = Tag.objects.filter(items__question__published=True - ).annotate(c=models.Count('items__tag')).order_by('category__slug', '-c', 'slug') - all_tag_clicks_count = Tag.objects.all().aggregate(models.Sum('click_count'))['click_count__sum'] - uncategorized_tag_clicks_count = Tag.objects.filter(category=None).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) if all_tag_clicks_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: - click_count = annotated_categories[tag.category.id].click_count + category_click_count = annotated_categories[tag.category.id].click_count else: - click_count = uncategorized_tag_clicks_count - tag.factor = '%.2f' % (minimum_factor + ((float(tag.click_count) / click_count) if click_count else 0)) + 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) + return context