Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Start working on units for settings

Roland Geider4457edb9db05
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index b88d28f4c..aa0a373c5 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -71,6 +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')
#
# Configurations
diff --git a/tasks.py b/tasks.py
index 497d6c28c..b6ee8a885 100644
--- a/tasks.py
+++ b/tasks.py
@@ -236,6 +236,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")
# Config
path = os.path.join(current_dir, 'config', 'fixtures/')
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index ac0c49fce..b06c9934d 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -21,7 +21,8 @@ from wger.core.models import (
UserProfile,
Language,
DaysOfWeek,
- License
+ License,
+ SettingUnit
)
@@ -62,3 +63,11 @@ class LicenseSerializer(serializers.ModelSerializer):
'''
class Meta:
model = License
+
+
+class SettingUnitSerializer(serializers.ModelSerializer):
+ '''
+ License serializer
+ '''
+ class Meta:
+ model = SettingUnit
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 58d835c18..60fe29451 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -24,13 +24,15 @@ from wger.core.models import (
UserProfile,
Language,
DaysOfWeek,
- License
+ License,
+ SettingUnit
)
from wger.core.api.serializers import (
UsernameSerializer,
LanguageSerializer,
DaysOfWeekSerializer,
- LicenseSerializer
+ LicenseSerializer,
+ SettingUnitSerializer
)
from wger.core.api.serializers import UserprofileSerializer
from wger.utils.permissions import UpdateOnlyPermission, WgerPermission
@@ -98,3 +100,13 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):
filter_fields = ('full_name',
'short_name',
'url')
+
+
+class SettingUnitViewSet(viewsets.ReadOnlyModelViewSet):
+ '''
+ API endpoint for setting units objects
+ '''
+ queryset = SettingUnit.objects.all()
+ serializer_class = SettingUnitSerializer
+ ordering_fields = '__all__'
+ filter_fields = ('name', )
diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.json
index 3654cb568..9adbd3155 100644
--- a/wger/core/fixtures/groups.json
+++ b/wger/core/fixtures/groups.json
@@ -1,8 +1,7 @@
[
{
- "model": "auth.group",
- "pk": 1,
"fields": {
+ "name": "admin",
"permissions": [
[
"add_gymconfig",
@@ -64,6 +63,21 @@
"core",
"license"
],
+ [
+ "add_settingunit",
+ "core",
+ "settingunit"
+ ],
+ [
+ "change_settingunit",
+ "core",
+ "settingunit"
+ ],
+ [
+ "delete_settingunit",
+ "core",
+ "settingunit"
+ ],
[
"add_equipment",
"exercises",
@@ -244,14 +258,14 @@
"nutrition",
"weightunit"
]
- ],
- "name": "admin"
- }
+ ]
+ },
+ "model": "auth.group",
+ "pk": 1
},
{
- "model": "auth.group",
- "pk": 2,
"fields": {
+ "name": "general_gym_manager",
"permissions": [
[
"change_gymconfig",
@@ -283,14 +297,14 @@
"gym",
"gymadminconfig"
]
- ],
- "name": "general_gym_manager"
- }
+ ]
+ },
+ "model": "auth.group",
+ "pk": 2
},
{
- "model": "auth.group",
- "pk": 3,
"fields": {
+ "name": "gym_manager",
"permissions": [
[
"add_log",
@@ -332,21 +346,6 @@
"gym",
"contracttype"
],
- [
- "add_contractoption",
- "gym",
- "contractoption"
- ],
- [
- "change_contractoption",
- "gym",
- "contractoption"
- ],
- [
- "delete_contractoption",
- "gym",
- "contractoption"
- ],
[
"change_gym",
"gym",
@@ -367,14 +366,14 @@
"gym",
"gymconfig"
]
- ],
- "name": "gym_manager"
- }
+ ]
+ },
+ "model": "auth.group",
+ "pk": 3
},
{
- "model": "auth.group",
- "pk": 4,
"fields": {
+ "name": "gym_trainer",
"permissions": [
[
"add_adminusernote",
@@ -421,16 +420,17 @@
"gym",
"userdocument"
]
- ],
- "name": "gym_trainer"
- }
+ ]
+ },
+ "model": "auth.group",
+ "pk": 4
},
{
- "model": "auth.group",
- "pk": 5,
"fields": {
- "permissions": [],
- "name": "gym_member"
- }
+ "name": "gym_member",
+ "permissions": []
+ },
+ "model": "auth.group",
+ "pk": 5
}
]
\ No newline at end of file
diff --git a/wger/core/fixtures/setting_units.json b/wger/core/fixtures/setting_units.json
new file mode 100644
index 000000000..6a1f6817a
--- /dev/null
+++ b/wger/core/fixtures/setting_units.json
@@ -0,0 +1,51 @@
+[
+ {
+ "pk": 1,
+ "fields": {
+ "name": "Repetitions"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 2,
+ "fields": {
+ "name": "Seconds"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 3,
+ "fields": {
+ "name": "Minutes"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 4,
+ "fields": {
+ "name": "Miles"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 5,
+ "fields": {
+ "name": "Kilometers"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 6,
+ "fields": {
+ "name": "Plates"
+ },
+ "model": "core.settingunit"
+ },
+ {
+ "pk": 7,
+ "fields": {
+ "name": "Rounds"
+ },
+ "model": "core.settingunit"
+ }
+]
diff --git a/wger/core/migrations/0007_settingunit.py b/wger/core/migrations/0007_settingunit.py
new file mode 100644
index 000000000..c48681c94
--- /dev/null
+++ b/wger/core/migrations/0007_settingunit.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0006_auto_20151025_2237'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='SettingUnit',
+ fields=[
+ ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)),
+ ('name', models.CharField(max_length=100, verbose_name='Name')),
+ ],
+ ),
+ migrations.RunSQL("INSERT INTO core_settingunit (name) VALUES ('Repetitions');")
+ ]
diff --git a/wger/core/models.py b/wger/core/models.py
index e3bea3522..b17923309 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -566,3 +566,33 @@ class License(models.Model):
License has no owner information
'''
return None
+
+
+@python_2_unicode_compatible
+class SettingUnit(models.Model):
+ '''
+ Setting unit, used in combination with an amount such as '10 reps', '5 km'
+ '''
+ class Meta:
+ '''
+ Set Meta options
+ '''
+ ordering = ["name", ]
+
+ name = models.CharField(max_length=100,
+ verbose_name=_('Name'))
+
+ def __str__(self):
+ '''
+ Return a more human-readable representation
+ '''
+ return self.name
+
+ #
+ # Own methods
+ #
+ def get_owner_object(self):
+ '''
+ Unit has no owner information
+ '''
+ return None
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 0b373047e..24bba7b0a 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -206,6 +206,9 @@
{% 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>
+ {% endif %}
{% if perms.gym.manage_gyms %}
<li><a href="{% url 'core:user:list' %}">{% trans "User list" %} </a></li>
<li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>
diff --git a/wger/core/templates/setting_unit/list.html b/wger/core/templates/setting_unit/list.html
new file mode 100644
index 000000000..7fee57b85
--- /dev/null
+++ b/wger/core/templates/setting_unit/list.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras %}
+
+{% block title %}{% trans "Setting units" %}{% endblock %}
+
+
+{% block content %}
+<ul class="list-group">
+ {% for unit in object_list %}
+ <li class="list-group-item ">
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <span class="glyphicon glyphicon-cog"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{% url 'core:setting_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>
+ </li>
+ </ul>
+ </div>
+ {{unit}}
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% trans "Nothing found" %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% if perms.core.add_license %}
+ <a href="{% url 'core:setting_unit:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ {% trans "Add" %}
+ </a>
+{% endif %}
+{% endblock %}
diff --git a/wger/core/tests/test_setting_unit.py b/wger/core/tests/test_setting_unit.py
new file mode 100644
index 000000000..3e34ecece
--- /dev/null
+++ b/wger/core/tests/test_setting_unit.py
@@ -0,0 +1,83 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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.tests import api_base_test
+
+from wger.manager.tests.testcase import WorkoutManagerAccessTestCase, WorkoutManagerTestCase
+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+
+
+class RepresentationTestCase(WorkoutManagerTestCase):
+ '''
+ Test the representation of a model
+ '''
+
+ def test_representation(self):
+ '''
+ Test that the representation of an object is correct
+ '''
+ self.assertEqual("{0}".format(SettingUnit.objects.get(pk=1)), 'Repetitions')
+
+
+class OverviewTest(WorkoutManagerAccessTestCase):
+ '''
+ Tests the settings unit overview page
+ '''
+
+ url = 'core:setting_unit:list'
+ anonymous_fail = True
+
+
+class AddTestCase(WorkoutManagerAddTestCase):
+ '''
+ Tests adding a new unit
+ '''
+
+ object_class = SettingUnit
+ url = 'core:setting_unit:add'
+ data = {'name': 'Furlongs'}
+
+
+class DeleteTestCase(WorkoutManagerDeleteTestCase):
+ '''
+ Tests deleting a unit
+ '''
+
+ object_class = SettingUnit
+ url = 'core:setting_unit:delete'
+ pk = 1
+
+
+class EditTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing a unit
+ '''
+
+ pk = 1
+ object_class = SettingUnit
+ url = 'core:setting_unit:edit'
+ data = {'name': 'Furlongs'}
+
+
+class ApiTestCase(api_base_test.ApiBaseResourceTestCase):
+ '''
+ Tests the unit resource
+ '''
+ pk = 1
+ resource = SettingUnit
+ private_resource = False
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 589936496..23077f559 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -27,7 +27,8 @@ from django.core.urlresolvers import reverse_lazy
from wger.core.views import (
user,
misc,
- license
+ license,
+ setting_units
)
# sub patterns for user
@@ -120,6 +121,22 @@ patterns_license = [
name='delete'),
]
+# sub patterns for setting units
+setting_units_license = [
+ url(r'^list$',
+ setting_units.ListView.as_view(),
+ name='list'),
+ url(r'^add$',
+ setting_units.AddView.as_view(),
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit',
+ setting_units.UpdateView.as_view(),
+ name='edit'),
+ url(r'^(?P<pk>\d+)/delete',
+ setting_units.DeleteView.as_view(),
+ name='delete'),
+]
+
#
# Actual patterns
@@ -149,4 +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")),
]
diff --git a/wger/core/views/setting_units.py b/wger/core/views/setting_units.py
new file mode 100644
index 000000000..a78deecc6
--- /dev/null
+++ b/wger/core/views/setting_units.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+import logging
+
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
+
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
+
+from wger.core.models import License, SettingUnit
+
+logger = logging.getLogger(__name__)
+
+
+class ListView(WgerPermissionMixin, ListView):
+ '''
+ Overview of all available setting units
+ '''
+ model = SettingUnit
+ permission_required = 'core.add_settingunit'
+ template_name = 'setting_unit/list.html'
+
+
+class AddView(WgerFormMixin, CreateView, WgerPermissionMixin):
+ '''
+ View to add a new setting unit
+ '''
+
+ model = SettingUnit
+ fields = ['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'
+
+
+class UpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
+ '''
+ View to update an existing setting unit
+ '''
+
+ model = SettingUnit
+ fields = ['name']
+ success_url = reverse_lazy('core:setting_unit:list')
+ form_action_urlname = 'core:setting_unit:edit'
+ permission_required = 'core.change_settingunit'
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(UpdateView, self).get_context_data(**kwargs)
+ context['title'] = _(u'Edit {0}').format(self.object)
+ return context
+
+
+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'
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(DeleteView, self).get_context_data(**kwargs)
+ context['title'] = _(u'Delete {0}?').format(self.object)
+ return context
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.json
index c174421f6..3793edcb1 100644
--- a/wger/manager/fixtures/test-workout-data.json
+++ b/wger/manager/fixtures/test-workout-data.json
@@ -130,6 +130,7 @@
"comment": "",
"set": 1,
"reps": 8,
+ "unit_id": 1,
"weight": null,
"order": 1,
"exercise": 1
@@ -142,6 +143,7 @@
"comment": "",
"set": 2,
"reps": 10,
+ "unit_id": 1,
"weight": 15,
"order": 1,
"exercise": 2
@@ -154,6 +156,7 @@
"comment": "",
"set": 3,
"reps": 10,
+ "unit_id": 1,
"weight": null,
"order": 1,
"exercise": 2
diff --git a/wger/manager/migrations/0005_auto_20160107_1852.py b/wger/manager/migrations/0005_auto_20160107_1852.py
new file mode 100644
index 000000000..648bf9583
--- /dev/null
+++ b/wger/manager/migrations/0005_auto_20160107_1852.py
@@ -0,0 +1,21 @@
+# -*- 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/models.py b/wger/manager/models.py
index 628e69e63..515f8ef66 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -31,7 +31,7 @@ from django.core.cache import cache
from django.core.validators import MinValueValidator
from sortedm2m.fields import SortedManyToManyField
-from wger.core.models import DaysOfWeek
+from wger.core.models import DaysOfWeek, SettingUnit
from wger.exercises.models import Exercise
from wger.manager.helpers import reps_smart_text
from wger.utils.cache import (
@@ -575,6 +575,9 @@ class Setting(models.Model):
set = models.ForeignKey(Set, verbose_name=_('Sets'))
exercise = models.ForeignKey(Exercise,
verbose_name=_('Exercises'))
+ unit = models.ForeignKey(SettingUnit,
+ verbose_name=_('Unit'),
+ default=1)
reps = models.IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)],
verbose_name=_('Repetitions'))
weight = models.DecimalField(verbose_name=_('Weight'),
diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.html
index ba8b2e2b9..c5f45006e 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-4">
+ <div class="col-xs-3">
{{ i.label }}
{% if not i.field.required %}
<br>
@@ -39,7 +39,7 @@
{% endif %}
{% if not i.is_hidden %}
- <div class="col-xs-4">
+ <div class="col-xs-3">
{% endif %}
{# Field elements #}
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index 8462e399e..280b43f08 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -89,6 +89,7 @@ class BaseTestCase(object):
fixtures = ('days_of_week',
'gym_config',
'groups',
+ 'setting_units',
'test-languages',
'test-licenses',
'test-gyms',
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 4ced75b40..09dda93bd 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', 'weight')
+SETTING_FORMSET_FIELDS = ('reps', 'weight', 'unit')
SettingFormset = modelformset_factory(Setting,
form=SettingForm,
diff --git a/wger/urls.py b/wger/urls.py
index 4380a554e..585678868 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -96,6 +96,7 @@ router.register(r'userprofile', core_api_views.UserProfileViewSet, base_name='us
router.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')
# Exercises app
router.register(r'exercise', exercises_api_views.ExerciseViewSet, base_name='exercise')