Skip to content

Commit d97161d

Browse files
committed
Show indicator if a member can receive a key
1 parent 1aa33ce commit d97161d

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ opentelemetry-sdk = "^1.36.0"
2424
opentelemetry-exporter-otlp = "^1.36.0"
2525
opentelemetry-distro = "^0.58b0"
2626
opentelemetry-instrumentation-django = "^0.58b0"
27+
python-dateutil = "^2.9.0.post0"
2728

2829
[tool.poetry.group.dev.dependencies]
2930
pytest = "^8.3.3"
@@ -48,7 +49,7 @@ build-backend = "poetry.core.masonry.api"
4849
collectstatic = "python manage.py collectstatic"
4950
makemigrations = "python manage.py makemigrations"
5051
migrate = "python manage.py migrate"
51-
run = "python manage.py runserver"
52+
run = "OTEL_PYTHON_DJANGO_INSTRUMENT=False python manage.py runserver"
5253
shell = "python manage.py shell"
5354
test = "pytest -s --cov=thebook"
5455

thebook/members/models.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
import datetime
33
import itertools
44

5+
from dateutil.relativedelta import relativedelta
6+
57
from django.conf import settings
68
from django.db import models
79
from django.db.models import UniqueConstraint
@@ -210,6 +212,12 @@ class Meta:
210212
def __str__(self):
211213
return self.name
212214

215+
@property
216+
def can_have_key(self):
217+
return self.membership.start_date < datetime.date.today() - relativedelta(
218+
months=3
219+
)
220+
213221

214222
class ReceivableFee(models.Model):
215223
membership = models.ForeignKey(

thebook/members/templates/members/members.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ <h4 class="m-0 font-weight-bold text-primary">
3333
<td>{{ member.membership.membership_fee_amount }}</td>
3434
<td>{{ member.membership.get_payment_method_display }}</td>
3535
<td>{{ member.membership.get_payment_interval_display }}</td>
36-
<td>{{ member.has_key }}</td>
36+
<td>
37+
{% if member.has_key %}🔑{% endif %}
38+
{% if not member.has_key and member.can_have_key %}🚫{% endif %}
39+
{% if not member.can_have_key %}-{% endif %}
40+
</td>
3741
<td>{{ member.phone_number }}</td>
3842
<td>
3943
<center style="color: red">

0 commit comments

Comments
 (0)