From db6f856c53ece8bb3d3a34bd955efb27f496ba51 Mon Sep 17 00:00:00 2001 From: Lou King Date: Fri, 24 Dec 2021 14:54:51 -0500 Subject: [PATCH] Memberships view: handle future members correctly (#481) --- members/version.py | 4 ++-- scripts/membership_cli.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/members/version.py b/members/version.py index 70b67bc..694c377 100644 --- a/members/version.py +++ b/members/version.py @@ -1,5 +1,5 @@ # See https://packaging.python.org/guides/distributing-packages-using-setuptools/#semantic-versioning-preferred -__version__ = '1.2.8.1' +__version__ = '1.2.8.2.dev1' __docversion__ = __version__ # uncomment for development -# __docversion__ = 'latest' \ No newline at end of file +__docversion__ = 'latest' \ No newline at end of file diff --git a/scripts/membership_cli.py b/scripts/membership_cli.py index 79e2fed..35ac2b5 100644 --- a/scripts/membership_cli.py +++ b/scripts/membership_cli.py @@ -104,9 +104,10 @@ def doxform(ms): return membership with rsu: - # get current members from RunSignUp, and put into common format - rawmemberships = rsu.members(club_id) - memberships = [doxform(ms) for ms in rawmemberships] + # get current and future members from RunSignUp, and put into common format + rawmemberships = rsu.members(club_id, current_members_only='F') + currfuturememberships = [m for m in rawmemberships if m['membership_end'] >= datetime.today().date().isoformat()] + memberships = [doxform(ms) for ms in currfuturememberships] # membershipfile supplied else: