diff --git a/.gitignore b/.gitignore index 3027d51..cd21f02 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ mydatabase settings.json .vscode/ .DS_Store +*.code-workspace \ No newline at end of file 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( ('