Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add rep and weight units to log tables
Roland Geiderb858a0bb7161
diff --git a/wger/core/static/css/workout-manager.css b/wger/core/static/css/workout-manager.cssindex 699e3c8fd..07d5371aa 100644--- a/wger/core/static/css/workout-manager.css+++ b/wger/core/static/css/workout-manager.css@@ -154,7 +154,7 @@ div.muscle-background* Workout log entry page needs the horizontal space*/.workout-log-table .narrow-input {- width: 9em;+ width: 7em;}diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 098ea95de..f06e85853 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -213,7 +213,10 @@ def reps_smart_text(settings, set_obj):# 4x10 or similarelif len(settings) == 1:reps = settings[0].reps if settings[0].reps != 99 else u'∞'- rep_unit = _(settings[0].unit.name) if settings[0].unit.id != 1 else ''+ if settings[0].repetition_unit.id != 1:+ rep_unit = _(settings[0].repetition_unit.name)+ else:+ rep_unit = ''setting_text = u'{0} × {1} {2}'.format(set_obj.sets, reps, rep_unit).strip()setting_list_text = u'{0} {1}'.format(reps, rep_unit).strip()@@ -231,7 +234,7 @@ def reps_smart_text(settings, set_obj):setting_list = [setting_list_text] * set_obj.setsreps_list = [settings[0].reps] * set_obj.setsweight_list = [weight] * set_obj.sets- repetition_units = [settings[0].unit] * set_obj.sets+ repetition_units = [settings[0].repetition_unit] * set_obj.sets# There's more than one setting, each set can have a different combination# of repetitions, weight, etc. e.g. 10, 8, 8, 12@@ -241,7 +244,7 @@ def reps_smart_text(settings, set_obj):tmp_weight = []tmp_unit = []for i in settings:- rep_unit = _(i.unit.name) if i.unit.id != 1 else ''+ rep_unit = _(i.repetition_unit.name) if i.repetition_unit.id != 1 else ''reps = "{0} {1}".format(i.reps, rep_unit).strip() if i.reps != 99 else u'∞'weight = i.weight@@ -252,7 +255,7 @@ def reps_smart_text(settings, set_obj):tmp_reps_text.append(reps)tmp_reps.append(i.reps)tmp_weight.append(weight)- tmp_unit.append(i.unit)+ tmp_unit.append(i.repetition_unit)setting_text = u' – '.join(tmp_reps_text)setting_list = tmp_reps_textdiff --git a/wger/manager/migrations/0006_auto_20160303_2138.py b/wger/manager/migrations/0006_auto_20160303_2138.pynew file mode 100644index 000000000..af1f96f52--- /dev/null+++ b/wger/manager/migrations/0006_auto_20160303_2138.py@@ -0,0 +1,35 @@+# -*- coding: utf-8 -*-+from __future__ import unicode_literals++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ('core', '0008_weightunit'),+ ('manager', '0005_auto_20160303_2008'),+ ]++ operations = [+ migrations.RenameField(+ model_name='setting',+ old_name='unit',+ new_name='repetition_unit',+ ),+ migrations.RenameField(+ model_name='workoutlog',+ old_name='unit',+ new_name='repetition_unit',+ ),+ migrations.AddField(+ model_name='setting',+ name='weight_unit',+ field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1),+ ),+ migrations.AddField(+ model_name='workoutlog',+ name='weight_unit',+ field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1),+ ),+ ]diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 20a3a20e4..b2553e003 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -31,7 +31,7 @@ from django.core.cache import cachefrom django.core.validators import MinValueValidatorfrom sortedm2m.fields import SortedManyToManyField-from wger.core.models import DaysOfWeek, RepetitionUnit+from wger.core.models import DaysOfWeek, RepetitionUnit, WeightUnitfrom wger.exercises.models import Exercisefrom wger.manager.helpers import reps_smart_textfrom wger.utils.cache import (@@ -578,11 +578,11 @@ class Setting(models.Model):set = models.ForeignKey(Set, verbose_name=_('Sets'))exercise = models.ForeignKey(Exercise,verbose_name=_('Exercises'))- unit = models.ForeignKey(RepetitionUnit,- verbose_name=_('Unit'),- default=1)+ repetition_unit = models.ForeignKey(RepetitionUnit,+ verbose_name=_('Unit'),+ default=1)'''- The unit of a set. This can be e.g. a repetition, a minute, etc.+ The repetition unit of a set. This can be e.g. a repetition, a minute, etc.'''reps = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)],@@ -602,6 +602,13 @@ class Setting(models.Model):validators=[MinValueValidator(0), MaxValueValidator(1500)])'''Planed weight for the repetitions'''+ weight_unit = models.ForeignKey(WeightUnit,+ verbose_name=_('Unit'),+ default=1)+ '''+ The weight unit of a set. This can be e.g. kg, lb, km/h, etc.+ '''+order = models.IntegerField(blank=True,verbose_name=_('Order'))comment = models.CharField(max_length=100,@@ -655,9 +662,9 @@ class WorkoutLog(models.Model):workout = models.ForeignKey(Workout,verbose_name=_('Workout'))- unit = models.ForeignKey(RepetitionUnit,- verbose_name=_('Unit'),- default=1)+ repetition_unit = models.ForeignKey(RepetitionUnit,+ verbose_name=_('Unit'),+ default=1)'''The unit of the log. This can be e.g. a repetition, a minute, etc.'''@@ -675,6 +682,14 @@ class WorkoutLog(models.Model):max_digits=5,verbose_name=_('Weight'),validators=[MinValueValidator(0)])++ weight_unit = models.ForeignKey(WeightUnit,+ verbose_name=_('Unit'),+ default=1)+ '''+ The weight unit of the log. This can be e.g. kg, lb, km/h, etc.+ '''+date = Html5DateField(verbose_name=_('Date'))# Metaclass to set some other propertiesdiff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.htmlindex d8f9aeb2c..eb351e349 100644--- a/wger/manager/templates/day/log.html+++ b/wger/manager/templates/day/log.html@@ -41,9 +41,8 @@ $(document).ready(function () {<tr><td>{% trans "Amount" %}</td><td>{% trans "Unit" %}</td>- <td>- {% trans "Weight" %}- </td>+ <td>{% trans "Weight" %}</td>+ <td>{% trans "Unit" %}</td></tr>{% for form in value.forms %}<tr>@@ -58,10 +57,10 @@ $(document).ready(function () {</div></td><td>- <div {% if form.unit.errors %}class="has-error"{% endif %}>- {{ form.unit|form_field_add_css:'form-control narrow-input' }}+ <div {% if form.repetition_unit.errors %}class="has-error"{% endif %}>+ {{ form.repetition_unit|form_field_add_css:'form-control narrow-input' }}<span class="help-block">- {% for error in form.unit.errors %}+ {% for error in form.repetition_unit.errors %}<p>{% trans error %}</p>{% endfor %}</span>@@ -77,6 +76,16 @@ $(document).ready(function () {</span></div></td>+ <td>+ <div {% if form.weight_unit.errors %}class="has-error"{% endif %}>+ {{ form.weight_unit|form_field_add_css:'form-control narrow-input' }}+ <span class="help-block">+ {% for error in form.weight_unit.errors %}+ <p>{% trans error %}</p>+ {% endfor %}+ </span>+ </div>+ </td></tr>{% endfor %}diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.htmlindex c36b0c13f..5c481f096 100644--- a/wger/manager/templates/set/formset.html+++ b/wger/manager/templates/set/formset.html@@ -17,7 +17,7 @@{% endif %}{% if forloop.parentloop.first %}- <div class="col-xs-3">+ <div class="col-xs-2">{{ i.label }}{% if not i.field.required %}<br>@@ -39,7 +39,7 @@{% endif %}{% if not i.is_hidden %}- <div class="col-xs-3 {% if i.errors %}has-error{% endif %}">+ <div class="col-xs-2 {% if i.errors %}has-error{% endif %}">{% endif %}{# Field elements #}diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 851ed25fc..de3a841cd 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)# ************************# Set functions# ************************-SETTING_FORMSET_FIELDS = ('reps', 'unit', 'weight')+SETTING_FORMSET_FIELDS = ('reps', 'repetition_unit', 'weight', 'weight_unit')SettingFormset = modelformset_factory(Setting,form=SettingForm,