From 1e3ff7475a0bc70e1bac00cdef036635d5fb92be Mon Sep 17 00:00:00 2001 From: Yingtong Li Date: Wed, 19 Jun 2019 16:04:00 +1000 Subject: [PATCH] Add associate membership model fields --- ssmembership/jinja2/ssmembership/index.html | 4 ++++ ssmembership/models.py | 7 +++++++ ssmembership/monboard.py | 1 + 3 files changed, 12 insertions(+) diff --git a/ssmembership/jinja2/ssmembership/index.html b/ssmembership/jinja2/ssmembership/index.html index 409ea76..b050468 100644 --- a/ssmembership/jinja2/ssmembership/index.html +++ b/ssmembership/jinja2/ssmembership/index.html @@ -32,6 +32,10 @@
{{ member.id }}
+
+ +
{{ member.get_member_type_display() }}
+
diff --git a/ssmembership/models.py b/ssmembership/models.py index a0f38b1..aae2f33 100644 --- a/ssmembership/models.py +++ b/ssmembership/models.py @@ -42,6 +42,13 @@ class Member(models.Model): phone = models.CharField(max_length=20) + MEMBER_TYPES = ( + (1, 'Ordinary Member'), + (2, 'Associate Member'), + (3, 'Honorary Life Member'), + ) + member_type = models.IntegerField(choices=MEMBER_TYPES) + expires = models.DateField() class Meta: diff --git a/ssmembership/monboard.py b/ssmembership/monboard.py index 1cefe98..c5dc9b5 100644 --- a/ssmembership/monboard.py +++ b/ssmembership/monboard.py @@ -53,6 +53,7 @@ def by_email(email): member.year = {'Year A': 0, 'Year 1': 1, 'Year 2': 2, 'Year 3B': 3, 'Year 4C': 4, 'Year 5D': 5, 'BMedSci': 97, 'PhD': 98, 'Intermission': 99}[result[5]] member.is_msa = result[6] member.phone = result[7] + member.member_type = 1 # Ordinary Member # Calculate expiration date member.expires = timezone.now().date().replace(month=3, day=31)