X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/c95c80ba092947ae3f7cfcc5eb02976d18d00247..bae802f258696c7d28745e052227026a574f66f6:/questions/views.py diff --git a/questions/views.py b/questions/views.py index 9c75ac6..43b812b 100644 --- a/questions/views.py +++ b/questions/views.py @@ -8,7 +8,7 @@ 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 .models import Question, Tag +from .models import Question, Tag, TagCategory class QuestionFormView(FormView): @@ -36,11 +36,27 @@ class QuestionListView(ListView): ).order_by('-published_at') 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): 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() + + 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'] + 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) if all_tag_clicks_count else 0)) + for tag in tags: + if tag.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)) + context['tag_lists'].setdefault(tag.category.id if tag.category else 0, []).append(tag) return context