From fafc988a605c89d16740c90b1c92198e0b5fe801 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Fri, 2 Mar 2018 00:31:05 +0200
Subject: [PATCH] Fix sorting bug #105

Also removed unneeded code
---
 members/models.py | 10 ----------
 members/tables.py |  4 ++--
 members/views.py  |  1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/members/models.py b/members/models.py
index 9f2145c..ff023b1 100644
--- a/members/models.py
+++ b/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."""
diff --git a/members/tables.py b/members/tables.py
index acb24e8..7ad9870 100644
--- a/members/tables.py
+++ b/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" '
diff --git a/members/views.py b/members/views.py
index b95f85e..558bd5e 100644
--- a/members/views.py
+++ b/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)