Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow all fields to be editable

Roland Geider68229f52f648
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
index ed916e4a6..96b0c8da3 100644
--- a/wger/exercises/forms.py
+++ b/wger/exercises/forms.py
@@ -17,6 +17,7 @@
from django import forms
from wger.exercises.models import ExerciseImage
+from wger.exercises.models import ExerciseComment
class ExerciseImageForm(forms.ModelForm):
@@ -26,3 +27,9 @@ class ExerciseImageForm(forms.ModelForm):
'is_main',
'license',
'license_author')
+
+
+class CommentForm(forms.ModelForm):
+ class Meta:
+ model = ExerciseComment
+ exclude = ('exercise',)
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 4191c8c27..25c59ac45 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -193,8 +193,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''The submission date'''
language = models.ForeignKey(Language,
- verbose_name=_('Language'),
- editable=False)
+ verbose_name=_('Language'))
'''The exercise's language'''
#
@@ -347,8 +346,7 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
'''Custom manager'''
exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercise'),
- editable=False)
+ verbose_name=_('Exercise'))
'''The exercise the image belongs to'''
image = models.ImageField(verbose_name=_('Image'),
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index d281d2540..0614de9f0 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -24,6 +24,7 @@ from django.utils.translation import ugettext_lazy
from django.views.generic import CreateView
from django.views.generic import UpdateView
+from wger.exercises.forms import CommentForm
from wger.exercises.models import Exercise
from wger.exercises.models import ExerciseComment
@@ -45,6 +46,7 @@ class ExerciseCommentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
'''
model = ExerciseComment
+ form_class = CommentForm
title = ugettext_lazy('Edit exercise comment')
permission_required = 'exercises.change_exercisecomment'
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 5204f58b7..4c233d60e 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -34,6 +34,7 @@ from wger.manager.models import WorkoutSession
from wger.manager.models import Workout
from wger.manager.models import Day
from wger.manager.models import Set
+from wger.manager.models import Setting
from wger.manager.models import WorkoutLog
from wger.utils.widgets import TranslatedSelectMultiple
from wger.utils.widgets import ExerciseAjaxSelect
@@ -63,7 +64,7 @@ class WorkoutCopyForm(Form):
class DayForm(ModelForm):
class Meta:
model = Day
-
+ exclude = ('training',)
widgets = {'day': TranslatedSelectMultiple()}
@@ -101,6 +102,12 @@ class SetFormMobile(ModelForm):
'they will be grouped together for a superset.')
+class SettingForm(ModelForm):
+ class Meta:
+ model = Setting
+ exclude = ('set', 'exercise', 'order', 'comment')
+
+
class HelperDateForm(Form):
'''
A helper form used in the workout log view
@@ -122,7 +129,7 @@ class WorkoutLogForm(ModelForm):
class Meta:
model = WorkoutLog
- exclude = ('exercise', )
+ exclude = ('workout', )
class HelperWorkoutSessionForm(ModelForm):
@@ -131,7 +138,7 @@ class HelperWorkoutSessionForm(ModelForm):
'''
class Meta:
model = WorkoutSession
- exclude = ('date', 'user')
+ exclude = ('user', 'workout', 'date')
class WorkoutSessionForm(ModelForm):
@@ -140,7 +147,7 @@ class WorkoutSessionForm(ModelForm):
'''
class Meta:
model = WorkoutSession
- exclude = ('user', )
+ exclude = ('user', 'workout', 'date')
class WorkoutSessionHiddenFieldsForm(ModelForm):
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 18537d8fa..1370dc356 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -327,8 +327,7 @@ class Day(models.Model):
'''
training = models.ForeignKey(Workout,
- verbose_name=_('Workout'),
- editable=False)
+ verbose_name=_('Workout'))
description = models.CharField(max_length=100,
verbose_name=_('Description'),
help_text=_('Ususally a description about what parts are '
@@ -525,15 +524,13 @@ class Setting(models.Model):
Settings for an exercise (weight, reps, etc.)
'''
- set = models.ForeignKey(Set, verbose_name=_('Sets'), editable=False)
+ set = models.ForeignKey(Set, verbose_name=_('Sets'))
exercise = models.ForeignKey(Exercise,
- verbose_name=_('Exercises'),
- editable=False)
+ verbose_name=_('Exercises'))
reps = Html5IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)],
verbose_name=_('Repetitions'))
order = Html5IntegerField(blank=True,
- verbose_name=_('Order'),
- editable=False)
+ verbose_name=_('Order'))
comment = models.CharField(max_length=100,
blank=True,
verbose_name=_('Comment'))
@@ -579,13 +576,14 @@ class WorkoutLog(models.Model):
user = models.ForeignKey(User,
verbose_name=_('User'),
editable=False)
- exercise = models.ForeignKey(Exercise, verbose_name=_('Exercise'))
+ exercise = models.ForeignKey(Exercise,
+ verbose_name=_('Exercise'))
workout = models.ForeignKey(Workout,
- verbose_name=_('Workout'),
- editable=False)
+ verbose_name=_('Workout'))
reps = Html5IntegerField(verbose_name=_('Repetitions'),
validators=[MinValueValidator(0)])
+
weight = Html5DecimalField(decimal_places=2,
max_digits=5,
verbose_name=_('Weight'),
@@ -649,14 +647,12 @@ class WorkoutSession(models.Model):
'''
workout = models.ForeignKey(Workout,
- verbose_name=_('Workout'),
- editable=False)
+ verbose_name=_('Workout'))
'''
The workout the session belongs to
'''
- date = Html5DateField(verbose_name=_('Date'),
- editable=False)
+ date = Html5DateField(verbose_name=_('Date'))
'''
The date the workout session was performed
'''
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 64456672d..2272c3132 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -208,6 +208,7 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):
{'date': '2012-01-01',
'reps': 10,
'weight': 10,
+ 'exercise': 1
})
date_after = WorkoutLog.objects.get(pk=1).date
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 1c7505bb5..645406b8b 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -79,6 +79,7 @@ class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = WorkoutLog
login_required = True
+ form_class = WorkoutLogForm
def dispatch(self, request, *args, **kwargs):
'''
@@ -167,7 +168,7 @@ def add(request, pk):
# Define the formset here because now we know the value to pass to 'extra'
WorkoutLogFormSet = modelformset_factory(WorkoutLog,
form=WorkoutLogForm,
- exclude=('date',),
+ exclude=('date', 'workout'),
extra = total_sets)
# Process the request
if request.method == 'POST':
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 47f85e862..472583eb6 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -30,7 +30,9 @@ from wger.manager.models import Day
from wger.manager.models import Set
from wger.manager.models import Setting
from wger.exercises.models import Exercise
-from wger.manager.forms import SetForm, SetFormMobile
+from wger.manager.forms import SetForm
+from wger.manager.forms import SetFormMobile
+from wger.manager.forms import SettingForm
from wger.utils.language import load_item_languages
from wger.config.models import LanguageConfig
@@ -40,9 +42,10 @@ logger = logging.getLogger('wger.custom')
# ************************
# Set functions
# ************************
-SETTING_FORMSET_EXCLUDE = ('comment',)
+SETTING_FORMSET_EXCLUDE = ('comment', 'exercise', 'set', 'order')
SettingFormset = modelformset_factory(Setting,
+ form=SettingForm,
exclude=SETTING_FORMSET_EXCLUDE,
can_delete=True,
can_order=False,
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 1eba42a90..942bff8d1 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -31,6 +31,7 @@ from wger.nutrition.models import IngredientWeightUnit
from wger.nutrition.models import NutritionPlan
from wger.utils.language import load_ingredient_languages
+from wger.utils.language import load_language
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
@@ -177,6 +178,7 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):
Set the owner
'''
obj.user = self.request.user
+ obj.language = load_language()
@link()
def nutritional_values(self, request, pk):