Merge branch 'bugfix-members-sort' into 'develop'

Bugfix: #105

See merge request vtmk/web2.0!113

.gitignore

@@ -19,3 +19,4 @@ mydatabase
 settings.json
 .vscode/
 .DS_Store
+*.code-workspace

members/models.py

@@ -103,16 +103,6 @@ class Member(BaseMember):
         verbose_name = _('Member')
         verbose_name_plural = _('Members')
 
-    def last_paid(self):
-        """Return member's last payment."""
-        try:
-            payments = Payment.objects.filter(member=self)
-            latest = payments.latest('date')
-            date = latest.date
-            return date
-        except Payment.DoesNotExist:
-            return None
-
     @staticmethod
     def from_array(array):
         """Create member from array."""

members/tables.py

@@ -4,13 +4,13 @@ import django_tables2 as tables
 from django.utils.translation import ugettext as _
 
 from members.models import Member, Payment, Request
+from django.db.models import F
 
 
 class MemberTable(tables.Table):
     """Table for member."""
 
-    last_paid = tables.DateTimeColumn(
-        accessor='last_paid', verbose_name=_('Last paid'))
+    last_paid = tables.DateTimeColumn(verbose_name=_('Last paid'), order_by='payments.date')
 
     options = tables.TemplateColumn(
         ('<a class="data-table-button btn btn-primary" '

members/views.py

@@ -27,7 +27,6 @@ from smtplib import SMTPAuthenticationError
 
 from members.models import Member, Request, Payment
 from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
-from members.tables import MemberTable, PaymentTable, RequestTable
 
 
 @receiver(post_save, sender=Request)