no functional changes

Formatting updated to pep8
This commit is contained in:
2020-07-19 14:31:03 +00:00
parent f2f288a447
commit 263c2a6e05
10 changed files with 98 additions and 86 deletions

View File

@@ -29,12 +29,8 @@ class ActiveMemberManager(models.Manager):
date_today = timezone.now().date()
return super().get_queryset().filter(
Q(member__role='A') &
(
Q(job_end__gt=date_today) |
Q(job_end__isnull=True)
)
)
Q(member__role='A')
& (Q(job_end__gt=date_today) | Q(job_end__isnull=True)))
class InactiveMemberManager(models.Manager):
@@ -45,12 +41,8 @@ class InactiveMemberManager(models.Manager):
date_today = timezone.now().date()
return super().get_queryset().filter(
Q(member__role='P') |
(
Q(job_end__lt=date_today + timedelta(days=1)) &
Q(job_end__isnull=False)
)
)
Q(member__role='P')
| (Q(job_end__lt=date_today + timedelta(days=1)) & Q(job_end__isnull=False)))
class Member(models.Model):
@@ -61,7 +53,7 @@ class Member(models.Model):
__choices = [
('A', _('Active')),
('P', _('Pension'))
('P', _('Pension')),
]
role = models.CharField(max_length=1, choices=__choices, default='A')
@@ -76,12 +68,12 @@ class Member(models.Model):
))
phone_regex = RegexValidator(
regex=r'^\+?1?\d{9,15}$',
message=phone_error_msg
message=phone_error_msg,
)
phone = models.CharField(
validators=[phone_regex],
max_length=17,
blank=True
blank=True,
)
address = models.TextField(null=True, blank=True)
@@ -112,7 +104,7 @@ class MemberSerializer(serializers.HyperlinkedModelSerializer):
'mailaccount',
'role',
'description',
'image'
'image',
]