Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Perform further validations for numeric fields, fixes #57

Roland Geider56883d7bb1ad
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 0c0201334..d50b971a1 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -306,7 +306,8 @@ class ScheduleStep(models.Model):
duration = Html5IntegerField(max_length=1,
verbose_name=_('Duration'),
help_text=_('The duration in weeks'),
- default=4)
+ default=4,
+ validators=[MinValueValidator(1), MaxValueValidator(25)])
'''The duration in weeks'''
order = models.IntegerField(verbose_name=_('Order'),
@@ -520,7 +521,7 @@ class Set(models.Model):
null=True,
verbose_name=_('Order'),
editable=False)
- sets = Html5IntegerField(validators=[MaxValueValidator(MAX_SETS)],
+ sets = Html5IntegerField(validators=[MinValueValidator(0), MaxValueValidator(MAX_SETS)],
verbose_name=_('Number of sets'),
default=DEFAULT_SETS)
@@ -563,10 +564,17 @@ class Setting(models.Model):
'''
set = models.ForeignKey(Set, verbose_name=_('Sets'), editable=False)
- exercise = models.ForeignKey(Exercise, verbose_name=_('Exercises'), editable=False)
- reps = Html5IntegerField(validators=[MaxValueValidator(100)], verbose_name=_('Repetitions'))
- order = Html5IntegerField(blank=True, verbose_name=_('Order'), editable=False)
- comment = models.CharField(max_length=100, blank=True, verbose_name=_('Comment'))
+ exercise = models.ForeignKey(Exercise,
+ verbose_name=_('Exercises'),
+ editable=False)
+ reps = Html5IntegerField(validators=[MinValueValidator(0), MaxValueValidator(100)],
+ verbose_name=_('Repetitions'))
+ order = Html5IntegerField(blank=True,
+ verbose_name=_('Order'),
+ editable=False)
+ comment = models.CharField(max_length=100,
+ blank=True,
+ verbose_name=_('Comment'))
# Metaclass to set some other properties
class Meta:
@@ -614,10 +622,12 @@ class WorkoutLog(models.Model):
verbose_name=_('Workout'),
editable=False)
- reps = Html5IntegerField(verbose_name=_('Repetitions'))
+ reps = Html5IntegerField(verbose_name=_('Repetitions'),
+ validators=[MinValueValidator(0)])
weight = Html5DecimalField(decimal_places=2,
max_digits=5,
- verbose_name=_('Weight'))
+ verbose_name=_('Weight'),
+ validators=[MinValueValidator(0)])
date = Html5DateField(verbose_name=_('Date'))
# Metaclass to set some other properties
@@ -694,12 +704,14 @@ by the US Department of Agriculture. It is extremely complete, with around
workout_reminder = Html5IntegerField(verbose_name=_('Remind before expiration'),
help_text=_('The number of days you want to be reminded '
'before a workout expires.'),
- default=14)
+ default=14,
+ validators=[MinValueValidator(1), MaxValueValidator(30)])
workout_duration = Html5IntegerField(verbose_name=_('Default duration of workouts'),
help_text=_('Default duration in weeks of workouts not '
'in a schedule. Used for email workout '
'reminders.'),
- default=12)
+ default=12,
+ validators=[MinValueValidator(1), MaxValueValidator(30)])
last_workout_notification = models.DateField(editable=False,
blank=False,
null=True)
@@ -724,7 +736,8 @@ by the US Department of Agriculture. It is extremely complete, with around
age = Html5IntegerField(max_length=2,
verbose_name=_('Age'),
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(10), MaxValueValidator(100)])
'''The user's age'''
height = Html5IntegerField(max_length=2,
@@ -745,14 +758,16 @@ by the US Department of Agriculture. It is extremely complete, with around
help_text=_('The average hours of sleep per day'),
default=7,
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(4), MaxValueValidator(10)])
'''The average hours of sleep per day'''
work_hours = Html5IntegerField(verbose_name=_('Work'),
help_text=_('Average hours per day'),
default=8,
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(15)])
'''The average hours at work per day'''
work_intensity = models.CharField(verbose_name=_('Physical intensity'),
@@ -768,7 +783,8 @@ by the US Department of Agriculture. It is extremely complete, with around
help_text=_('Average hours per week'),
default=3,
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(30)])
'''The average hours performing sports per week'''
sport_intensity = models.CharField(verbose_name=_('Physical intensity'),
@@ -784,7 +800,8 @@ by the US Department of Agriculture. It is extremely complete, with around
help_text=_('Average hours per day'),
default=8,
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(1), MaxValueValidator(15)])
'''The average hours of free time per day'''
freetime_intensity = models.CharField(verbose_name=_('Physical intensity'),
@@ -800,7 +817,8 @@ by the US Department of Agriculture. It is extremely complete, with around
help_text=_('Total caloric intake, including e.g. any surplus'),
default=2500,
blank=False,
- null=True)
+ null=True,
+ validators=[MinValueValidator(1500), MaxValueValidator(5000)])
'''Basic caloric intake based on physical activity'''
@property
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 08d9d9df4..12db70b9b 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -21,6 +21,7 @@ from django.db import models
from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!
from django.core.validators import MaxValueValidator
+from django.core.validators import MinValueValidator
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.core import mail
@@ -209,45 +210,53 @@ class Ingredient(models.Model):
protein = Html5DecimalField(decimal_places=3,
max_digits=6,
verbose_name=_('Protein'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
carbohydrates = Html5DecimalField(decimal_places=3,
max_digits=6,
verbose_name=_('Carbohydrates'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
carbohydrates_sugar = Html5DecimalField(decimal_places=3,
max_digits=6,
blank=True,
null=True,
verbose_name=_('Sugar content in carbohydrates'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0),
+ MaxValueValidator(100)])
fat = Html5DecimalField(decimal_places=3,
max_digits=6,
verbose_name=_('Fat'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
fat_saturated = Html5DecimalField(decimal_places=3,
max_digits=6,
blank=True,
null=True,
verbose_name=_('Saturated fat content in fats'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
fibres = Html5DecimalField(decimal_places=3,
max_digits=6,
blank=True,
null=True,
verbose_name=_('Fibres'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
sodium = Html5DecimalField(decimal_places=3,
max_digits=6,
blank=True,
null=True,
verbose_name=_('Sodium'),
- help_text=_('In g per 100g of product'))
+ help_text=_('In g per 100g of product'),
+ validators=[MinValueValidator(0), MaxValueValidator(100)])
#
# Django methods
@@ -509,7 +518,7 @@ class MealItem(models.Model):
editable=False)
amount = Html5DecimalField(decimal_places=2,
max_digits=6,
- validators=[MaxValueValidator(1000)],
+ validators=[MinValueValidator(1), MaxValueValidator(1000)],
verbose_name=_('Amount'))
def __unicode__(self):
diff --git a/wger/weight/models.py b/wger/weight/models.py
index fac4b300a..027c7abd0 100644
--- a/wger/weight/models.py
+++ b/wger/weight/models.py
@@ -16,6 +16,7 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from django.db import models
+from django.core.validators import MinValueValidator, MaxValueValidator
from django.contrib.auth.models import User
from django.utils.translation import ugettext_lazy as _
@@ -28,7 +29,8 @@ class WeightEntry(models.Model):
Model for a weight point
'''
creation_date = models.DateField(verbose_name=_('Date'))
- weight = Html5FloatField(verbose_name=_('Weight'))
+ weight = Html5FloatField(verbose_name=_('Weight'),
+ validators=[MinValueValidator(30), MaxValueValidator(300)])
user = models.ForeignKey(User,
verbose_name=_('User'))
'''