gaugendre/workout
1
0
Fork 0
Code Issues Pull requests Releases Activity

Display real percentage of the round

Browse source
This commit is contained in:
Gabriel Augendre 2019-06-23 16:06:52 +02:00
parent 65d604de15
commit 2c499addfa
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gym/models.py
View file

@ -165,3 +165,12 @@ class Round(models.Model):
null=True,
)
notes = models.TextField("notes", blank=True)
@property
def real_percentage(self):
theoretical_max = (
self.equipment.theoretical_maxs.filter(date__lte=self.session.start)
.order_by("-date")
.first()
)
return self.chosen_weight / theoretical_max.value * 100

8
gym/templates/gym/equipment.html
View file

@ -2,7 +2,10 @@
{% load humanize %}
{% block title %}{{ equipment.name }} ({{ equipment.room.name }}){% endblock %}
{% block h1 %}{{ equipment.name }} <small class="text-muted">({{ equipment.room.name }})</small>{% endblock %}
{% block h1 %}
{{ equipment.name }}
<small class="text-muted">({{ equipment.room.name }})</small>
{% endblock %}
{% block content %}
@ -49,7 +52,8 @@
{% for round in rounds %}
<a href="{% url 'round-edit' round.pk %}"
class="list-group-item list-group-item-action">{{ round.repetition_number }} répétitions
&times; {{ round.chosen_weight }} {{ equipment.unit }}</a>
&times; {{ round.chosen_weight }} {{ equipment.unit }}
({{ round.theoretical_max_percentage }}% -> {{ round.real_percentage }}%)</a>
{% endfor %}
</ul>
{% else %}

3
gym/templates/gym/session_detail.html
View file

@ -51,7 +51,8 @@
<a href="{% url 'round-edit' round.pk %}"
class="list-group-item list-group-item-action">{{ round.equipment.name }}
&ndash; {{ round.repetition_number }} répétitions
&times; {{ round.chosen_weight }} {{ round.equipment.unit }}</a>
&times; {{ round.chosen_weight }} {{ round.equipment.unit }}
({{ round.theoretical_max_percentage }}% -> {{ round.real_percentage }}%)</a>
{% endfor %}
</ul>
{% else %}