diff --git a/apps/meps/views.py b/apps/meps/views.py index 7f7d0522..e4b33d61 100644 --- a/apps/meps/views.py +++ b/apps/meps/views.py @@ -61,7 +61,8 @@ def autoTrophies(mep): def score_sort(request): return render_to_response("meps/mep_list.html", - {'object_list': sorted(MEP.objects.filter(active=True).exclude(score__isnull=True), + {'object_list': enumerate(sorted(MEP.objects.filter(active=True).exclude(score__isnull=True), key=lambda x: x.total_score, - reverse=True)}, + reverse=True), start=1), + 'score': True}, context_instance=RequestContext(request)) diff --git a/memopol2/templates/meps/mep_list.html b/memopol2/templates/meps/mep_list.html index 133bccd6..0efcc0bf 100644 --- a/memopol2/templates/meps/mep_list.html +++ b/memopol2/templates/meps/mep_list.html @@ -7,9 +7,15 @@

{% trans "Members of the European Parliament" %}

{% include "meps/meps_table_thead.html" %} + {% if score %} + {% for place, mep in object_list %} + {% include "meps/meps_table_tr.html" %} + {% endfor %} + {% else %} {% for mep in object_list %} {% include "meps/meps_table_tr.html" %} {% endfor %} + {% endif %}
{% endblock %} diff --git a/memopol2/templates/meps/meps_table_thead.html b/memopol2/templates/meps/meps_table_thead.html index 04c353e3..d80b3529 100644 --- a/memopol2/templates/meps/meps_table_thead.html +++ b/memopol2/templates/meps/meps_table_thead.html @@ -1,5 +1,6 @@ + {% if score %}Score{% endif %} MEP {% if not 'country' in hidden_fields %}Country{% endif %} {% if not 'group' in hidden_fields %}Group{% endif %} diff --git a/memopol2/templates/meps/meps_table_tr.html b/memopol2/templates/meps/meps_table_tr.html index a078cf12..a82fa558 100644 --- a/memopol2/templates/meps/meps_table_tr.html +++ b/memopol2/templates/meps/meps_table_tr.html @@ -1,5 +1,10 @@ {% load memopol2 i18n %} + {% if score %} + + {{ place }} + + {% endif %} {{ mep.last_name|upper }} {{ mep.first_name }}