Commit c9101d25 authored by Nicolas Joyard's avatar Nicolas Joyard
Browse files

Add pagination and active filter to group views

parent 2ca64493
...@@ -2,19 +2,24 @@ ...@@ -2,19 +2,24 @@
import datetime import datetime
from core.views import PaginationMixin, ActiveLegislatureMixin
from django.db import models from django.db import models
from django.views import generic from django.views import generic
from representatives.models import Group from representatives.models import Group
class GroupList(generic.ListView): class GroupList(PaginationMixin, ActiveLegislatureMixin, generic.ListView):
def get_queryset(self): def get_queryset(self):
qs = Group.objects.filter( qs = Group.objects.all()
models.Q(mandates__end_date__gte=datetime.date.today()) |
models.Q(mandates__end_date__isnull=True) if self.get_active_only():
) qs = qs.filter(
models.Q(mandates__end_date__gte=datetime.date.today()) |
models.Q(mandates__end_date__isnull=True)
)
kind = self.kwargs.get('kind', None) kind = self.kwargs.get('kind', None)
if kind: if kind:
......
...@@ -3,25 +3,29 @@ ...@@ -3,25 +3,29 @@
- load memopol_tags - load memopol_tags
- load representatives_tags - load representatives_tags
- block content - block content
%table.table
- for group in object_list
%tr
- if group.kind != 'country' and group.kind != 'chamber'
%td
%a{'href': "{% chamber_url group.chamber %}"}
= group.chamber|chamber_icon
%td - include 'core/blocks/pagination.html'
%a{'href': "{% group_url group %}"}
- if group.abbreviation - block list
={group.abbreviation}
%td %table.table
%a{'href': "{% group_url group %}"}= - for group in object_list
- if group.kind == 'chamber' %tr
= group|chamber_icon - if group.kind != 'country' and group.kind != 'chamber'
- elif group.kind == 'group' %td
= group|group_long_icon %a{'href': "{% chamber_url group.chamber %}"}
- else = group.chamber|chamber_icon
= group.name
%td
%a{'href': "{% group_url group %}"}
- if group.abbreviation
={group.abbreviation}
%td
%a{'href': "{% group_url group %}"}=
- if group.kind == 'chamber'
= group|chamber_icon
- elif group.kind == 'group'
= group|group_long_icon
- else
= group.name
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment