Making pizza-chart reusable for different charts

Sergio Oliveira
1 parent eb2147d9
Showing 5 changed files with 20 additions and 17 deletions Show diff stats
src/accounts/templates/accounts/user_detail.html
src/accounts/views.py
src/home/views.py
src/templates/home.html
src/templates/pizza-chart.html
@@ -2,7 +2,7 @@
 {% load i18n gravatar %}
  
 {% block head_js %}
-  {% include "pizza-chart.html" with chart_div="collabs" chart_height=300 %}
+  {% include "pizza-chart.html" with chart_data=count_types chart_div="collabs" chart_height=300 %}
   {% include "pizza-chart.html" with chart_div="collabs2" chart_height=300 %}
 {% endblock %}
  
@@ -3,6 +3,8 @@
  
 import datetime
  
+from collections import OrderedDict
+
 from django.contrib import messages
  
 from django.contrib.auth import get_user_model
@@ -17,6 +19,7 @@ from haystack.query import SearchQuerySet
  
 from super_archives.models import EmailAddress, Message
 from super_archives.utils.email import send_email_lists
+from search.utils import trans
 from .forms import UserCreationForm, ListsForm, UserUpdateForm
  
  
@@ -48,7 +51,7 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
         user = self.object
         context = {}
  
-        count_types = {}
+        count_types = OrderedDict()
         six_months = timezone.now() - datetime.timedelta(days=180)
  
         fields_or_lookup = (
@@ -58,14 +61,14 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
         )
  
  
-        for type in ['wiki', 'thread', 'changeset', 'ticket']:
+        for type in ['thread', 'ticket', 'wiki', 'changeset']:
             sqs = SearchQuerySet().filter(
                 type=type,
                 modified__gte=six_months,
             )
             for filter_or in fields_or_lookup:
                 sqs = sqs.filter_or(**filter_or)
-            count_types[type] = sqs.count()
+            count_types[trans(type)] = sqs.count()
  
         context['type_count'] = count_types
  
-from django.shortcuts import render
  
+from collections import OrderedDict
+
+from django.shortcuts import render
 from django.utils import timezone
  
 from haystack.query import SearchQuerySet
 from super_archives import queries
+from search.utils import trans
  
  
 def index(request):
@@ -12,10 +15,10 @@ def index(request):
     latest_threads = queries.get_latest_threads()
     hottest_threads = queries.get_hottest_threads()
  
-    count_types = {}
+    count_types = OrderedDict()
     six_months = timezone.now() - timezone.timedelta(days=180)
-    for type in ['wiki', 'thread', 'changeset', 'ticket']:
-        count_types[type] = SearchQuerySet().filter(
+    for type in ['thread', 'ticket', 'wiki', 'changeset']:
+        count_types[trans(type)] = SearchQuerySet().filter(
             type=type,
             modified__gte=six_months,
         ).count()
@@ -2,7 +2,7 @@
 {% load i18n %}
  
 {% block head_js %}
-  {% include "pizza-chart.html" with chart_div="collabs" chart_height=330 %}
+  {% include "pizza-chart.html" with chart_data=type_count chart_div="collabs" chart_height=330 %}
 {% endblock %}
  
 {% block header %}
@@ -20,14 +20,11 @@
       data.addColumn('string', 'Topping');
       data.addColumn('number', 'Slices');
       data.addRows([
-      {% if type_count %}
-        ['{% trans "Emails"%}', {% firstof type_count.thread '0' %}],
-        ['{% trans "Tickets"%}', {% firstof type_count.ticket '0' %}],
-        ['{% trans "Wiki"%}', {% firstof type_count.wiki '0' %}],
-        ['{% trans "Code"%}', {% firstof type_count.changeset '0' %}],
-      {% else %}
-        ['{% trans "Willing to help" %}', 100],
-      {% endif %}
+        {% for key, value in chart_data.items %}
+          ['{{ key }}', {{ value }} ],
+        {% empty %}
+          ['{% trans "Willing to help" %}', 100],
+        {% endfor %}
       ]);
  
       // Set chart options
...	...	@@ -2,7 +2,7 @@
2	2	{% load i18n gravatar %}
3	3
4	4	{% block head_js %}
5		- {% include "pizza-chart.html" with chart_div="collabs" chart_height=300 %}
	5	+ {% include "pizza-chart.html" with chart_data=count_types chart_div="collabs" chart_height=300 %}
6	6	{% include "pizza-chart.html" with chart_div="collabs2" chart_height=300 %}
7	7	{% endblock %}
8	8
...	...
...	...	@@ -3,6 +3,8 @@
3	3
4	4	import datetime
5	5
	6	+from collections import OrderedDict
	7	+
6	8	from django.contrib import messages
7	9
8	10	from django.contrib.auth import get_user_model
...	...	@@ -17,6 +19,7 @@ from haystack.query import SearchQuerySet
17	19
18	20	from super_archives.models import EmailAddress, Message
19	21	from super_archives.utils.email import send_email_lists
	22	+from search.utils import trans
20	23	from .forms import UserCreationForm, ListsForm, UserUpdateForm
21	24
22	25
...	...	@@ -48,7 +51,7 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
48	51	user = self.object
49	52	context = {}
50	53
51		- count_types = {}
	54	+ count_types = OrderedDict()
52	55	six_months = timezone.now() - datetime.timedelta(days=180)
53	56
54	57	fields_or_lookup = (
...	...	@@ -58,14 +61,14 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
58	61	)
59	62
60	63
61		- for type in ['wiki', 'thread', 'changeset', 'ticket']:
	64	+ for type in ['thread', 'ticket', 'wiki', 'changeset']:
62	65	sqs = SearchQuerySet().filter(
63	66	type=type,
64	67	modified__gte=six_months,
65	68	)
66	69	for filter_or in fields_or_lookup:
67	70	sqs = sqs.filter_or(**filter_or)
68		- count_types[type] = sqs.count()
	71	+ count_types[trans(type)] = sqs.count()
69	72
70	73	context['type_count'] = count_types
71	74
...	...
1		-from django.shortcuts import render
2	1
	2	+from collections import OrderedDict
	3	+
	4	+from django.shortcuts import render
3	5	from django.utils import timezone
4	6
5	7	from haystack.query import SearchQuerySet
6	8	from super_archives import queries
	9	+from search.utils import trans
7	10
8	11
9	12	def index(request):
...	...	@@ -12,10 +15,10 @@ def index(request):
12	15	latest_threads = queries.get_latest_threads()
13	16	hottest_threads = queries.get_hottest_threads()
14	17
15		- count_types = {}
	18	+ count_types = OrderedDict()
16	19	six_months = timezone.now() - timezone.timedelta(days=180)
17		- for type in ['wiki', 'thread', 'changeset', 'ticket']:
18		- count_types[type] = SearchQuerySet().filter(
	20	+ for type in ['thread', 'ticket', 'wiki', 'changeset']:
	21	+ count_types[trans(type)] = SearchQuerySet().filter(
19	22	type=type,
20	23	modified__gte=six_months,
21	24	).count()
...	...
...	...	@@ -2,7 +2,7 @@
2	2	{% load i18n %}
3	3
4	4	{% block head_js %}
5		- {% include "pizza-chart.html" with chart_div="collabs" chart_height=330 %}
	5	+ {% include "pizza-chart.html" with chart_data=type_count chart_div="collabs" chart_height=330 %}
6	6	{% endblock %}
7	7
8	8	{% block header %}
...	...
...	...	@@ -20,14 +20,11 @@
20	20	data.addColumn('string', 'Topping');
21	21	data.addColumn('number', 'Slices');
22	22	data.addRows([
23		- {% if type_count %}
24		- ['{% trans "Emails"%}', {% firstof type_count.thread '0' %}],
25		- ['{% trans "Tickets"%}', {% firstof type_count.ticket '0' %}],
26		- ['{% trans "Wiki"%}', {% firstof type_count.wiki '0' %}],
27		- ['{% trans "Code"%}', {% firstof type_count.changeset '0' %}],
28		- {% else %}
29		- ['{% trans "Willing to help" %}', 100],
30		- {% endif %}
	23	+ {% for key, value in chart_data.items %}
	24	+ ['{{ key }}', {{ value }} ],
	25	+ {% empty %}
	26	+ ['{% trans "Willing to help" %}', 100],
	27	+ {% endfor %}
31	28	]);
32	29
33	30	// Set chart options
...	...