Merge branch 'develop' into 'master'

Filter paid member fees by date

See merge request vtmk/web2.0!118

members/views/members.py

@@ -10,8 +10,10 @@ from django.utils.translation import ugettext as _
 from django.utils import timezone
 from django.forms.models import model_to_dict
 from dal import autocomplete
+from django.utils import timezone
 
 import logging
+import datetime
 import html
 
 from rest_framework.views import APIView
@@ -47,10 +49,18 @@ def member_list(request, *args, **kwargs):
     table_html = convert_table_to_html(table, request)
 
     queryset = Member.get_members_with_latest_payment(members)
+    # Member fee is valid from 1.9.-31.8.
+    f_day = 1
+    f_month = 9
+    now = timezone.now()
+    if (now.month >= f_month):
+        filter_date = datetime.date(now.year, f_month, f_day)
+    else:
+        filter_date = datetime.date(now.year - 1, f_month, f_day)
     context = {
         'table': table_html,
         'member_count': len(members),
-        'paid_count': len(queryset.exclude(last_paid=None)),
+        'paid_count': len(queryset.filter(last_paid__gte=filter_date)),
         'notification': request.GET.get('notification', None),
     }
     return render(request, 'member_list.html', context)