Self hosted FLOSS fitness/workout, nutrition and weight tracker
Rename SettingUnit to RepetitionUnit
Roland Geiderd3824556dfd1
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.pyindex aa0a373c5..a1f7e776e 100644--- a/extras/scripts/filter-fixtures.py+++ b/extras/scripts/filter-fixtures.py@@ -71,7 +71,7 @@ filter_dump(data, ('gym.contract',), 'gym_contracts.json')filter_dump(data, ('core.gym',), 'gyms.json')filter_dump(data, ('core.language',), 'languages.json')filter_dump(data, ('core.license',), 'licenses.json')-filter_dump(data, ('core.settingunit',), 'setting_units.json')+filter_dump(data, ('core.repetitionunit',), 'repetition_units.json')## Configurationsdiff --git a/wger/core/fixtures/setting_units.json b/repetition_units.jsonsimilarity index 70%rename from wger/core/fixtures/setting_units.jsonrename to repetition_units.jsonindex 6a1f6817a..b8d392776 100644--- a/wger/core/fixtures/setting_units.json+++ b/repetition_units.json@@ -4,48 +4,48 @@"fields": {"name": "Repetitions"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 2,"fields": {"name": "Seconds"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 3,"fields": {"name": "Minutes"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 4,"fields": {"name": "Miles"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 5,"fields": {"name": "Kilometers"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 6,"fields": {"name": "Plates"},- "model": "core.settingunit"+ "model": "core.repetitionunit"},{"pk": 7,"fields": {"name": "Rounds"},- "model": "core.settingunit"+ "model": "core.repetitionunit"}]diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex b06c9934d..52e94f4ec 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -22,7 +22,7 @@ from wger.core.models import (Language,DaysOfWeek,License,- SettingUnit+ RepetitionUnit)@@ -65,9 +65,9 @@ class LicenseSerializer(serializers.ModelSerializer):model = License-class SettingUnitSerializer(serializers.ModelSerializer):+class RepetitionUnitSerializer(serializers.ModelSerializer):'''License serializer'''class Meta:- model = SettingUnit+ model = RepetitionUnitdiff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 60fe29451..272a389bb 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -25,14 +25,14 @@ from wger.core.models import (Language,DaysOfWeek,License,- SettingUnit+ RepetitionUnit)from wger.core.api.serializers import (UsernameSerializer,LanguageSerializer,DaysOfWeekSerializer,LicenseSerializer,- SettingUnitSerializer+ RepetitionUnitSerializer)from wger.core.api.serializers import UserprofileSerializerfrom wger.utils.permissions import UpdateOnlyPermission, WgerPermission@@ -102,11 +102,11 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):'url')-class SettingUnitViewSet(viewsets.ReadOnlyModelViewSet):+class RepetitionUnitViewSet(viewsets.ReadOnlyModelViewSet):'''API endpoint for setting units objects'''- queryset = SettingUnit.objects.all()- serializer_class = SettingUnitSerializer+ queryset = RepetitionUnit.objects.all()+ serializer_class = RepetitionUnitSerializerordering_fields = '__all__'filter_fields = ('name', )diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.jsonindex 56278a82e..4aa1a98ec 100644--- a/wger/core/fixtures/groups.json+++ b/wger/core/fixtures/groups.json@@ -65,19 +65,19 @@"license"],[- "add_settingunit",+ "add_repetitionunit","core",- "settingunit"+ "repetitionunit"],[- "change_settingunit",+ "change_repetitionunit","core",- "settingunit"+ "repetitionunit"],[- "delete_settingunit",+ "delete_repetitionunit","core",- "settingunit"+ "repetitionunit"],["add_equipment",diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.pyindex 157c96a58..748bb3032 100644--- a/wger/core/management/commands/extract-i18n.py+++ b/wger/core/management/commands/extract-i18n.py@@ -16,7 +16,7 @@from django.core.management.base import BaseCommand-from wger.core.models import SettingUnit+from wger.core.models import RepetitionUnitfrom wger.exercises.models import (ExerciseCategory,Muscle,@@ -38,7 +38,7 @@ class Command(BaseCommand):out += [i for i in ExerciseCategory.objects.all()]out += [i for i in Equipment.objects.all()]out += [i for i in Muscle.objects.all()]- out += [i for i in SettingUnit.objects.all()]+ out += [i for i in RepetitionUnit.objects.all()]# Print the resultfor i in out:diff --git a/wger/core/migrations/0007_settingunit.py b/wger/core/migrations/0007_repetitionunit.pysimilarity index 68%rename from wger/core/migrations/0007_settingunit.pyrename to wger/core/migrations/0007_repetitionunit.pyindex c48681c94..683b8b58d 100644--- a/wger/core/migrations/0007_settingunit.py+++ b/wger/core/migrations/0007_repetitionunit.py@@ -12,11 +12,13 @@ class Migration(migrations.Migration):operations = [migrations.CreateModel(- name='SettingUnit',+ name='RepetitionUnit',fields=[('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),- ('name', models.CharField(max_length=100, verbose_name='Name')),+ ('name', models.CharField(verbose_name='Name', max_length=100)),],+ options={+ 'ordering': ['name'],+ },),- migrations.RunSQL("INSERT INTO core_settingunit (name) VALUES ('Repetitions');")]diff --git a/wger/core/migrations/0008_auto_20160113_1018.py b/wger/core/migrations/0008_auto_20160113_1018.pydeleted file mode 100644index 556d2ccb7..000000000--- a/wger/core/migrations/0008_auto_20160113_1018.py+++ /dev/null@@ -1,18 +0,0 @@-# -*- coding: utf-8 -*--from __future__ import unicode_literals--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('core', '0007_settingunit'),- ]-- operations = [- migrations.AlterModelOptions(- name='settingunit',- options={'ordering': ['name']},- ),- ]diff --git a/wger/core/models.py b/wger/core/models.pyindex b17923309..cd319c508 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -569,7 +569,7 @@ class License(models.Model):@python_2_unicode_compatible-class SettingUnit(models.Model):+class RepetitionUnit(models.Model):'''Setting unit, used in combination with an amount such as '10 reps', '5 km''''diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex 2938f1dba..7126dbb97 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -208,8 +208,8 @@{% if perms.core.change_license %}<li><a href="{% url 'core:license:list' %}">{% trans "Licenses" %} </a></li>{% endif %}- {% if perms.core.change_settingunit %}- <li><a href="{% url 'core:setting_unit:list' %}">{% trans "Setting units" %} </a></li>+ {% if perms.core.change_repetitionunit %}+ <li><a href="{% url 'core:repetition-unit:list' %}">{% trans "Setting units" %} </a></li>{% endif %}{% if perms.gym.manage_gyms %}<li><a href="{% url 'core:user:list' %}">{% trans "User list" %} </a></li>diff --git a/wger/core/templates/setting_unit/list.html b/wger/core/templates/repetition_unit/list.htmlsimilarity index 73%rename from wger/core/templates/setting_unit/list.htmlrename to wger/core/templates/repetition_unit/list.htmlindex c4ceb42ec..6803b65e6 100644--- a/wger/core/templates/setting_unit/list.html+++ b/wger/core/templates/repetition_unit/list.html@@ -15,10 +15,10 @@</button><ul class="dropdown-menu" role="menu"><li>- <a href="{% url 'core:setting_unit:edit' unit.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>+ <a href="{% url 'core:repetition-unit:edit' unit.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a></li><li>- <a href="{% url 'core:setting_unit:delete' unit.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a>+ <a href="{% url 'core:repetition-unit:delete' unit.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a></li></ul></div>@@ -38,7 +38,7 @@{% block sidebar %}{% if perms.core.add_license %}- <a href="{% url 'core:setting_unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ <a href="{% url 'core:repetition-unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">{% trans "Add" %}</a>{% endif %}diff --git a/wger/core/tests/test_setting_unit.py b/wger/core/tests/test_setting_unit.pyindex b79a10829..63f8a14fc 100644--- a/wger/core/tests/test_setting_unit.py+++ b/wger/core/tests/test_setting_unit.py@@ -13,7 +13,7 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.-from wger.core.models import SettingUnit+from wger.core.models import RepetitionUnitfrom wger.core.tests import api_base_testfrom wger.manager.tests.testcase import WorkoutManagerAccessTestCase, WorkoutManagerTestCase@@ -31,7 +31,7 @@ class RepresentationTestCase(WorkoutManagerTestCase):'''Test that the representation of an object is correct'''- self.assertEqual("{0}".format(SettingUnit.objects.get(pk=1)), 'Repetitions')+ self.assertEqual("{0}".format(RepetitionUnit.objects.get(pk=1)), 'Repetitions')class OverviewTest(WorkoutManagerAccessTestCase):@@ -39,7 +39,7 @@ class OverviewTest(WorkoutManagerAccessTestCase):Tests the settings unit overview page'''- url = 'core:setting_unit:list'+ url = 'core:repetition-unit:list'anonymous_fail = True@@ -48,8 +48,8 @@ class AddTestCase(WorkoutManagerAddTestCase):Tests adding a new unit'''- object_class = SettingUnit- url = 'core:setting_unit:add'+ object_class = RepetitionUnit+ url = 'core:repetition-unit:add'data = {'name': 'Furlongs'}user_success = 'admin',user_fail = ('general_manager1',@@ -68,8 +68,8 @@ class DeleteTestCase(WorkoutManagerDeleteTestCase):'''pk = 1- object_class = SettingUnit- url = 'core:setting_unit:delete'+ object_class = RepetitionUnit+ url = 'core:repetition-unit:delete'user_success = 'admin',user_fail = ('general_manager1','general_manager2',@@ -87,8 +87,8 @@ class EditTestCase(WorkoutManagerEditTestCase):'''pk = 1- object_class = SettingUnit- url = 'core:setting_unit:edit'+ object_class = RepetitionUnit+ url = 'core:repetition-unit:edit'data = {'name': 'Furlongs'}user_success = 'admin',user_fail = ('general_manager1',@@ -106,5 +106,5 @@ class ApiTestCase(api_base_test.ApiBaseResourceTestCase):Tests the unit resource'''pk = 1- resource = SettingUnit+ resource = RepetitionUnitprivate_resource = Falsediff --git a/wger/core/urls.py b/wger/core/urls.pyindex 23077f559..875b38f9b 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -28,7 +28,7 @@ from wger.core.views import (user,misc,license,- setting_units+ repetition_units)# sub patterns for user@@ -122,18 +122,18 @@ patterns_license = []# sub patterns for setting units-setting_units_license = [+patterns_repetition_units = [url(r'^list$',- setting_units.ListView.as_view(),+ repetition_units.ListView.as_view(),name='list'),url(r'^add$',- setting_units.AddView.as_view(),+ repetition_units.AddView.as_view(),name='add'),url(r'^(?P<pk>\d+)/edit',- setting_units.UpdateView.as_view(),+ repetition_units.UpdateView.as_view(),name='edit'),url(r'^(?P<pk>\d+)/delete',- setting_units.DeleteView.as_view(),+ repetition_units.DeleteView.as_view(),name='delete'),]@@ -166,5 +166,5 @@ urlpatterns = [url(r'^user/', include(patterns_user, namespace="user")),url(r'^license/', include(patterns_license, namespace="license")),- url(r'^setting-unit/', include(setting_units_license, namespace="setting_unit")),+ url(r'^setting-unit/', include(patterns_repetition_units, namespace="repetition-unit")),]diff --git a/wger/core/views/setting_units.py b/wger/core/views/repetition_units.pysimilarity index 77%rename from wger/core/views/setting_units.pyrename to wger/core/views/repetition_units.pyindex eed374040..43199f4a5 100644--- a/wger/core/views/setting_units.py+++ b/wger/core/views/repetition_units.py@@ -33,7 +33,7 @@ from wger.utils.generic_views import (WgerPermissionMixin)-from wger.core.models import License, SettingUnit+from wger.core.models import License, RepetitionUnitlogger = logging.getLogger(__name__)@@ -42,9 +42,9 @@ class ListView(WgerPermissionMixin, ListView):'''Overview of all available setting units'''- model = SettingUnit- permission_required = 'core.add_settingunit'- template_name = 'setting_unit/list.html'+ model = RepetitionUnit+ permission_required = 'core.add_repetitionunit'+ template_name = 'repetition_unit/list.html'class AddView(WgerFormMixin, CreateView, WgerPermissionMixin):@@ -52,12 +52,12 @@ class AddView(WgerFormMixin, CreateView, WgerPermissionMixin):View to add a new setting unit'''- model = SettingUnit+ model = RepetitionUnitfields = ['name']title = ugettext_lazy('Add')- success_url = reverse_lazy('core:setting_unit:list')- form_action = reverse_lazy('core:setting_unit:add')- permission_required = 'core.add_settingunit'+ success_url = reverse_lazy('core:repetition-unit:list')+ form_action = reverse_lazy('core:repetition-unit:add')+ permission_required = 'core.add_repetitionunit'class UpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):@@ -65,11 +65,11 @@ class UpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):View to update an existing setting unit'''- model = SettingUnit+ model = RepetitionUnitfields = ['name']- success_url = reverse_lazy('core:setting_unit:list')- form_action_urlname = 'core:setting_unit:edit'- permission_required = 'core.change_settingunit'+ success_url = reverse_lazy('core:repetition-unit:list')+ form_action_urlname = 'core:repetition-unit:edit'+ permission_required = 'core.change_repetitionunit'def get_context_data(self, **kwargs):'''@@ -85,10 +85,10 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):View to delete an existing license'''- model = SettingUnit- success_url = reverse_lazy('core:setting_unit:list')- permission_required = 'core.delete_settingunit'- form_action_urlname = 'core:setting_unit:delete'+ model = RepetitionUnit+ success_url = reverse_lazy('core:repetition-unit:list')+ permission_required = 'core.delete_repetitionunit'+ form_action_urlname = 'core:repetition-unit:delete'def dispatch(self, request, *args, **kwargs):'''diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 3bfbb1703..2f3a98d54 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -17,7 +17,7 @@from rest_framework import serializers-from wger.core.api.serializers import DaysOfWeekSerializer, SettingUnitSerializer+from wger.core.api.serializers import DaysOfWeekSerializer, RepetitionUnitSerializerfrom wger.exercises.api.serializers import ExerciseSerializerfrom wger.manager.models import (@@ -116,7 +116,7 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):has_weight = serializers.ReadOnlyField()weight_list = serializers.ReadOnlyField()setting_text = serializers.ReadOnlyField()- setting_units = SettingUnitSerializer(many=True)+ repetition_units = RepetitionUnitSerializer(many=True)comment_list = serializers.ReadOnlyField()obj = ExerciseSerializer()diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 709d29f53..098ea95de 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -207,7 +207,7 @@ def reps_smart_text(settings, set_obj):setting_list = []weight_list = []reps_list = []- setting_units = []+ repetition_units = []# Only one setting entry, this is a "compact" representation such as e.g.# 4x10 or similar@@ -231,7 +231,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- setting_units = [settings[0].unit] * set_obj.sets+ repetition_units = [settings[0].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@@ -256,11 +256,11 @@ def reps_smart_text(settings, set_obj):setting_text = u' – '.join(tmp_reps_text)setting_list = tmp_reps_text- setting_units = tmp_unit+ repetition_units = tmp_unitreps_list = tmp_repsweight_list = tmp_weight- return setting_text, setting_list, weight_list, reps_list, setting_units+ return setting_text, setting_list, weight_list, reps_list, repetition_unitsclass WorkoutCalendar(HTMLCalendar):diff --git a/wger/manager/migrations/0005_auto_20160107_1852.py b/wger/manager/migrations/0005_auto_20160107_1852.pydeleted file mode 100644index 648bf9583..000000000--- a/wger/manager/migrations/0005_auto_20160107_1852.py+++ /dev/null@@ -1,21 +0,0 @@-# -*- coding: utf-8 -*--from __future__ import unicode_literals--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('core', '0007_settingunit'),- ('manager', '0004_auto_20150609_1603'),- ]-- operations = [- migrations.AddField(- model_name='setting',- name='unit',- field=models.ForeignKey(default=1, to='core.SettingUnit', verbose_name='Unit'),- preserve_default=False,- ),- ]diff --git a/wger/manager/migrations/0005_auto_20160303_2008.py b/wger/manager/migrations/0005_auto_20160303_2008.pynew file mode 100644index 000000000..588548bbe--- /dev/null+++ b/wger/manager/migrations/0005_auto_20160303_2008.py@@ -0,0 +1,51 @@+# -*- coding: utf-8 -*-+from __future__ import unicode_literals++from django.db import migrations, models+import django.core.validators+++class Migration(migrations.Migration):++ dependencies = [+ ('core', '0007_repetitionunit'),+ ('manager', '0004_auto_20150609_1603'),+ ]++ operations = [+ migrations.AddField(+ model_name='setting',+ name='unit',+ field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit'),+ ),+ migrations.AddField(+ model_name='workoutlog',+ name='unit',+ field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit'),+ ),+ migrations.AlterField(+ model_name='day',+ name='description',+ field=models.CharField(verbose_name='Description', help_text='A description of what is done on this day (e.g. "Pull day") or what body parts are trained (e.g. "Arms and abs")', max_length=100),+ ),+ migrations.AlterField(+ model_name='schedule',+ name='is_loop',+ field=models.BooleanField(verbose_name='Is a loop', default=False, help_text='Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)'),+ ),+ migrations.AlterField(+ model_name='schedulestep',+ name='order',+ field=models.IntegerField(verbose_name='Order', default=1),+ ),+ migrations.AlterField(+ model_name='setting',+ name='reps',+ field=models.IntegerField(verbose_name='Amount', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)]),+ ),+ migrations.AlterField(+ model_name='workoutsession',+ name='impression',+ field=models.CharField(verbose_name='General impression', default='2', choices=[('1', 'Bad'), ('2', 'Neutral'), ('3', 'Good')], help_text='Your impression about this workout session. Did you exercise as well as you could?', max_length=2),+ ),+ ]diff --git a/wger/manager/migrations/0006_auto_20160113_1018.py b/wger/manager/migrations/0006_auto_20160113_1018.pydeleted file mode 100644index 788b37779..000000000--- a/wger/manager/migrations/0006_auto_20160113_1018.py+++ /dev/null@@ -1,31 +0,0 @@-# -*- coding: utf-8 -*--from __future__ import unicode_literals--from django.db import migrations, models-import django.core.validators---class Migration(migrations.Migration):-- dependencies = [- ('core', '0008_auto_20160113_1018'),- ('manager', '0005_auto_20160107_1852'),- ]-- operations = [- migrations.AddField(- model_name='workoutlog',- name='unit',- field=models.ForeignKey(verbose_name='Unit', to='core.SettingUnit', default=1),- ),- migrations.AlterField(- model_name='setting',- name='reps',- field=models.IntegerField(verbose_name='Amount', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)]),- ),- migrations.AlterField(- model_name='setting',- name='unit',- field=models.ForeignKey(verbose_name='Unit', to='core.SettingUnit', default=1),- ),- ]diff --git a/wger/manager/models.py b/wger/manager/models.pyindex b2ad9f22b..20a3a20e4 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, SettingUnit+from wger.core.models import DaysOfWeek, RepetitionUnitfrom wger.exercises.models import Exercisefrom wger.manager.helpers import reps_smart_textfrom wger.utils.cache import (@@ -445,7 +445,7 @@ class Day(models.Model):setting_tmp.append(setting)# "Smart" textual representation- setting_text, setting_list, weight_list, reps_list, setting_units \+ setting_text, setting_list, weight_list, reps_list, repetition_units \= reps_smart_text(setting_tmp, set_obj)# Flag indicating whether all exercises have settings@@ -466,7 +466,7 @@ class Day(models.Model):exercise_tmp.append({'obj': exercise,'setting_obj_list': setting_tmp,'setting_list': setting_list,- 'setting_units': setting_units,+ 'repetition_units': repetition_units,'weight_list': weight_list,'has_weight': has_weight,'reps_list': reps_list,@@ -486,10 +486,10 @@ class Day(models.Model):if len(exercise['setting_list']) > common_reps:exercise['setting_list'].pop(-1)exercise['setting_obj_list'].pop(-1)- setting_text, setting_list, weight_list, reps_list, setting_units = \+ setting_text, setting_list, weight_list, reps_list, repetition_units = \reps_smart_text(exercise['setting_obj_list'], set_obj)exercise['setting_text'] = setting_text- exercise['setting_units'] = setting_units+ exercise['repetition_units'] = repetition_unitscanonical_repr.append({'obj': set_obj,'exercise_list': exercise_tmp,@@ -578,7 +578,7 @@ class Setting(models.Model):set = models.ForeignKey(Set, verbose_name=_('Sets'))exercise = models.ForeignKey(Exercise,verbose_name=_('Exercises'))- unit = models.ForeignKey(SettingUnit,+ unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),default=1)'''@@ -655,7 +655,7 @@ class WorkoutLog(models.Model):workout = models.ForeignKey(Workout,verbose_name=_('Workout'))- unit = models.ForeignKey(SettingUnit,+ unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),default=1)'''diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex be4eb9448..14133fb9a 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -16,7 +16,7 @@ from decimal import Decimalfrom django.core.cache import cache-from wger.core.models import DaysOfWeek, SettingUnit+from wger.core.models import DaysOfWeek, RepetitionUnitfrom wger.exercises.models import Exercisefrom wger.manager.models import Workoutfrom wger.manager.models import Day@@ -41,7 +41,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):workout = Workout.objects.get(pk=1)setting_1 = Setting.objects.get(pk=1)setting_2 = Setting.objects.get(pk=2)- setting_unit = SettingUnit.objects.get(pk=1)+ repetition_unit = RepetitionUnit.objects.get(pk=1)self.assertEqual(workout.canonical_representation['muscles'], {'back': [2], 'front': [1]})self.assertEqual(workout.canonical_representation['obj'], workout)@@ -57,8 +57,8 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'weight_list': [None, None],'setting_obj_list': [setting_1],'setting_text': u'2 \xd7 8',- 'setting_units': [setting_unit,- setting_unit]}],+ 'repetition_units': [repetition_unit,+ repetition_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': [1]},@@ -80,10 +80,10 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],'setting_text': u'4 \xd7 10 (15kg)',- 'setting_units': [setting_unit,- setting_unit,- setting_unit,- setting_unit]}],+ 'repetition_units': [repetition_unit,+ repetition_unit,+ repetition_unit,+ repetition_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},@@ -105,7 +105,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):day = Day.objects.get(pk=5)weekday1 = DaysOfWeek.objects.get(pk=3)weekday2 = DaysOfWeek.objects.get(pk=5)- setting_unit = SettingUnit.objects.get(pk=1)+ repetition_unit = RepetitionUnit.objects.get(pk=1)self.assertEqual(day.canonical_representation['days_of_week'],{'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'})self.assertEqual(day.canonical_representation['muscles'], {'back': [2], 'front': []})@@ -119,10 +119,10 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'weight_list': [None, None, None, None],'setting_obj_list': [Setting.objects.get(pk=3)],'setting_text': u'4 \xd7 10',- 'setting_units': [setting_unit,- setting_unit,- setting_unit,- setting_unit]}],+ 'repetition_units': [repetition_unit,+ repetition_unit,+ repetition_unit,+ repetition_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.pyindex 037f70d6b..7fec0ef86 100644--- a/wger/manager/tests/testcase.py+++ b/wger/manager/tests/testcase.py@@ -89,7 +89,7 @@ class BaseTestCase(object):fixtures = ('days_of_week','gym_config','groups',- 'setting_units',+ 'repetition_units','test-languages','test-licenses','test-gyms',diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.pyindex a62b12ab7..e48699786 100644--- a/wger/manager/views/pdf.py+++ b/wger/manager/views/pdf.py@@ -172,4 +172,4 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N# Create the HttpResponse object with the appropriate PDF headers.response['Content-Disposition'] = 'attachment; filename=Workout-{0}-table.pdf'.format(id)response['Content-Length'] = len(response.content)- return response\ No newline at end of file+ return responsediff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 97d784143..032838ea7 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -291,7 +291,7 @@ def timer(request, day_pk):exercise = exercise_dict['obj']for key, element in enumerate(exercise_dict['reps_list']):reps = exercise_dict['reps_list'][key]- unit = exercise_dict['setting_units'][key]+ unit = exercise_dict['repetition_units'][key]default_weight = last_log.get_last_weight(exercise,reps,exercise_dict['weight_list'][key])@@ -317,7 +317,7 @@ def timer(request, day_pk):for i in range(0, total_reps):for exercise_dict in set_dict['exercise_list']:reps = exercise_dict['reps_list'][i]- unit = exercise_dict['setting_units'][i]+ unit = exercise_dict['repetition_units'][i]default_weight = exercise_dict['weight_list'][i]exercise = exercise_dict['obj']diff --git a/wger/tasks.py b/wger/tasks.pyindex 489aa1459..93ceaa509 100644--- a/wger/tasks.py+++ b/wger/tasks.py@@ -251,7 +251,7 @@ def load_fixtures(settings_path=None):call_command("loaddata", path + "users.json")call_command("loaddata", path + "licenses.json")call_command("loaddata", path + "days_of_week.json")- call_command("loaddata", path + "setting_units.json")+ call_command("loaddata", path + "repetition_units.json")# Configpath = os.path.join(current_dir, 'config', 'fixtures/')diff --git a/wger/urls.py b/wger/urls.pyindex 585678868..13bb1dd60 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -96,7 +96,7 @@ router.register(r'userprofile', core_api_views.UserProfileViewSet, base_name='usrouter.register(r'language', core_api_views.LanguageViewSet, base_name='language')router.register(r'daysofweek', core_api_views.DaysOfWeekViewSet, base_name='daysofweek')router.register(r'license', core_api_views.LicenseViewSet, base_name='license')-router.register(r'settingunit', core_api_views.SettingUnitViewSet, base_name='setting-unit')+router.register(r'repetitionunit', core_api_views.RepetitionUnitViewSet, base_name='setting-unit')# Exercises approuter.register(r'exercise', exercises_api_views.ExerciseViewSet, base_name='exercise')