Self hosted FLOSS fitness/workout, nutrition and weight tracker
Move user profile model to core app
Roland Geider52cf14680f1b
diff --git a/wger/core/forms.py b/wger/core/forms.pyindex b99ac4fe3..39b8c90fa 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -20,8 +20,7 @@ from django.contrib.auth.models import User as Django_Userfrom django.core.exceptions import ValidationErrorfrom django.forms import ModelForm, EmailField, Form, CharField, widgetsfrom django.utils.translation import ugettext as _--from wger.manager.models import UserProfile+from wger.core.models import UserProfileclass UserPreferencesForm(ModelForm):diff --git a/wger/core/migrations/0002_auto__add_userprofile.py b/wger/core/migrations/0002_auto__add_userprofile.pynew file mode 100644index 000000000..b5586203c--- /dev/null+++ b/wger/core/migrations/0002_auto__add_userprofile.py@@ -0,0 +1,102 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import SchemaMigration+from django.db import models+++class Migration(SchemaMigration):++ def forwards(self, orm):+ '''+ Manually rename the table, don't do anything else+ '''+ db.rename_table('manager_userprofile', 'core_userprofile')++ if not db.dry_run:+ # For permissions to work properly after migrating+ orm['contenttypes.contenttype'].objects.filter(app_label='manager', model='userprofile').update(app_label='core')++ def backwards(self, orm):+ '''+ Manually rename the table, don't do anything else+ '''+ db.rename_table('core_userprofile', 'manager_userprofile')++ if not db.dry_run:+ # For permissions to work properly after migrating+ orm['contenttypes.contenttype'].objects.filter(app_label='core', model='userprofile').update(app_label='manager')+++ models = {+ u'auth.group': {+ 'Meta': {'object_name': 'Group'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})+ },+ u'auth.permission': {+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'auth.user': {+ 'Meta': {'object_name': 'User'},+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})+ },+ u'contenttypes.contenttype': {+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'core.userprofile': {+ 'Meta': {'object_name': 'UserProfile'},+ 'age': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ 'calories': ('wger.utils.fields.Html5IntegerField', [], {'default': '2500', 'null': 'True'}),+ 'freetime_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'height': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_workout_notification': ('django.db.models.fields.DateField', [], {'null': 'True'}),+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['exercises.Language']"}),+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'sleep_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '7', 'null': 'True'}),+ 'sport_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '3', 'null': 'True'}),+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),+ 'timer_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'timer_pause': ('wger.utils.fields.Html5IntegerField', [], {'default': '90'}),+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),+ 'work_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'workout_duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '12'}),+ 'workout_reminder': ('wger.utils.fields.Html5IntegerField', [], {'default': '14'}),+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})+ },+ u'exercises.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ }+ }++ complete_apps = ['core']\ No newline at end of filediff --git a/wger/core/models.py b/wger/core/models.pyindex 5ec532924..f9938fdef 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -13,7 +13,341 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License+import datetime+import decimalfrom django.db import models+from django.db.models.signals import post_save+from django.contrib.auth.models import User+from django.core.exceptions import ValidationError+from django.core.validators import MinValueValidator, MaxValueValidator+from django.utils.translation import ugettext_lazy as _, ugettext_lazy-# Create your models here.+from wger.utils.helpers import disable_for_loaddata+from wger.utils.constants import TWOPLACES+from wger.utils.fields import Html5IntegerField++from wger.exercises.models import Language+from wger.weight.models import WeightEntry+++class UserProfile(models.Model):+ GENDER_MALE = '1'+ GENDER_FEMALE = '2'+ GENDER = (+ (GENDER_MALE, _('Male')),+ (GENDER_FEMALE, _('Female')),+ )++ INTENSITY_LOW = '1'+ INTENSITY_MEDIUM = '2'+ INTENSITY_HIGH = '3'+ INTENSITY = (+ (INTENSITY_LOW, _('Low')),+ (INTENSITY_MEDIUM, _('Medium')),+ (INTENSITY_HIGH, _('High')),+ )++ # This field is required.+ user = models.OneToOneField(User,+ editable=False)++ # Flag to mark a temporary user (demo account)+ is_temporary = models.BooleanField(default=False,+ editable=False)++ #+ # User preferences+ #++ # Show exercise comments on workout view+ show_comments = models.BooleanField(verbose_name=_('Show exercise comments'),+ help_text=_('Check to show exercise comments on the '+ 'workout view'),+ default=True)++ # Also show ingredients in english while composing a nutritional plan+ # (obviously this is only meaningful if the user has a language other than english)+ show_english_ingredients = models.BooleanField(+ verbose_name=_('Also use ingredients in English'),+ help_text=_('''Check to also show ingredients in English while creating+a nutritional plan. These ingredients are extracted from a list provided+by the US Department of Agriculture. It is extremely complete, with around+7000 entries, but can be somewhat overwhelming and make the search difficult.'''),+ default=True)++ workout_reminder_active = models.BooleanField(verbose_name=_('Activate workout reminders'),+ help_text=_('Check to activate automatic '+ 'reminders for workouts. You need '+ 'to provide a valid email for this '+ 'to work.'),+ default=False)++ 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,+ 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,+ validators=[MinValueValidator(1), MaxValueValidator(30)])+ last_workout_notification = models.DateField(editable=False,+ blank=False,+ null=True)+ '''+ The last time the user got a workout reminder email++ This is needed e.g. to check daily per cron for old workouts but only+ send users an email once per week+ '''++ notification_language = models.ForeignKey(Language,+ verbose_name=_('Notification language'),+ help_text=_('Language to use when sending you email '+ 'notifications, e.g. email reminders for '+ 'workouts. This does not affect the '+ 'language used on the website.'),+ default=2)++ timer_active = models.BooleanField(verbose_name=_('Use pauses in workout timer'),+ help_text=_('Check to activate timer pauses between '+ 'exercises.'),+ default=True)+ '''+ Switch to activate pauses in the gym view+ '''++ timer_pause = Html5IntegerField(verbose_name=_('Default duration of workout pauses'),+ help_text=_('Default duration in seconds of pauses used by '+ 'the timer in the gym mode.'),+ default=90,+ validators=[MinValueValidator(10), MaxValueValidator(400)])+ '''+ Default duration of workout pauses in the gym view+ '''++ #+ # User statistics+ #+ age = Html5IntegerField(max_length=2,+ verbose_name=_('Age'),+ blank=False,+ null=True,+ validators=[MinValueValidator(10), MaxValueValidator(100)])+ '''The user's age'''++ height = Html5IntegerField(max_length=2,+ verbose_name=_('Height (cm)'),+ blank=False,+ validators=[MinValueValidator(140), MaxValueValidator(230)],+ null=True)+ '''The user's height'''++ gender = models.CharField(max_length=1,+ choices=GENDER,+ default=GENDER_MALE,+ blank=False,+ null=True)+ '''Gender'''++ sleep_hours = Html5IntegerField(verbose_name=_('Hours of sleep'),+ help_text=_('The average hours of sleep per day'),+ default=7,+ blank=False,+ 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,+ validators=[MinValueValidator(1), MaxValueValidator(15)])+ '''The average hours at work per day'''++ work_intensity = models.CharField(verbose_name=_('Physical intensity'),+ help_text=_('Approximately'),+ max_length=1,+ choices=INTENSITY,+ default=INTENSITY_LOW,+ blank=False,+ null=True)+ '''Physical intensity of work'''++ sport_hours = Html5IntegerField(verbose_name=_('Sport'),+ help_text=_('Average hours per week'),+ default=3,+ blank=False,+ null=True,+ validators=[MinValueValidator(1), MaxValueValidator(30)])+ '''The average hours performing sports per week'''++ sport_intensity = models.CharField(verbose_name=_('Physical intensity'),+ help_text=_('Approximately'),+ max_length=1,+ choices=INTENSITY,+ default=INTENSITY_MEDIUM,+ blank=False,+ null=True)+ '''Physical intensity of sport activities'''++ freetime_hours = Html5IntegerField(verbose_name=_('Free time'),+ help_text=_('Average hours per day'),+ default=8,+ blank=False,+ null=True,+ validators=[MinValueValidator(1), MaxValueValidator(15)])+ '''The average hours of free time per day'''++ freetime_intensity = models.CharField(verbose_name=_('Physical intensity'),+ help_text=_('Approximately'),+ max_length=1,+ choices=INTENSITY,+ default=INTENSITY_LOW,+ blank=False,+ null=True)+ '''Physical intensity during free time'''++ calories = Html5IntegerField(verbose_name=_('Total daily calories'),+ help_text=_('Total caloric intake, including e.g. any surplus'),+ default=2500,+ blank=False,+ null=True,+ validators=[MinValueValidator(1500), MaxValueValidator(5000)])+ '''Basic caloric intake based on physical activity'''++ @property+ def weight(self):+ '''+ Returns the last weight entry, done here to make the behaviour+ more consistent with the other settings (age, height, etc.)+ '''+ try:+ weight = WeightEntry.objects.filter(user=self.user).latest().weight+ except WeightEntry.DoesNotExist:+ weight = 0+ return weight++ def clean(self):+ '''+ Make sure the total amount of hours is 24+ '''+ if ((self.sleep_hours and self.freetime_hours and self.work_hours)+ and (self.sleep_hours + self.freetime_hours + self.work_hours) > 24):+ raise ValidationError(_('The sum of all hours has to be 24'))++ def __unicode__(self):+ '''+ Return a more human-readable representation+ '''+ return u"Profile for user {0}".format(self.user)++ def calculate_bmi(self):+ '''+ Calculates the user's BMI++ Formula: weight/height^2+ - weight in kg+ - height in m+ '''+ return self.weight / (self.height / 100.0 * self.height / 100.0)++ def calculate_basal_metabolic_rate(self, formula=1):+ '''+ Calculates the basal metabolic rate.++ Currently only the Mifflin-St.Jeor formula is supported+ '''++ if self.gender == self.GENDER_MALE:+ factor = 5+ else:+ factor = -161++ try:+ rate = ((10 * self.weight) # in kg+ + (6.25 * self.height) # in cm+ - (5 * self.age) # in years+ + factor)+ except TypeError:+ # Any of the entries is missing+ rate = 0++ return decimal.Decimal(str(rate)).quantize(TWOPLACES)++ def calculate_activities(self):+ '''+ Calculates the calories needed by additional physical activities++ Factors taken from+ * https://en.wikipedia.org/wiki/Physical_activity_level+ * http://www.fao.org/docrep/007/y5686e/y5686e07.htm+ '''+ # Sleep+ sleep = self.sleep_hours * 0.95++ # Work+ if self.work_intensity == self.INTENSITY_LOW:+ work_factor = 1.5+ elif self.work_intensity == self.INTENSITY_MEDIUM:+ work_factor = 1.8+ else:+ work_factor = 2.2+ work = self.work_hours * work_factor++ # Sport (entered in hours/week, so we must divide)+ if self.sport_intensity == self.INTENSITY_LOW:+ sport_factor = 4+ elif self.sport_intensity == self.INTENSITY_MEDIUM:+ sport_factor = 6+ else:+ sport_factor = 10+ sport = (self.sport_hours / 7.0) * sport_factor++ # Free time+ if self.freetime_intensity == self.INTENSITY_LOW:+ freetime_factor = 1.3+ elif self.freetime_intensity == self.INTENSITY_MEDIUM:+ freetime_factor = 1.9+ else:+ freetime_factor = 2.4+ freetime = self.freetime_hours * freetime_factor++ # Total+ total = (sleep + work + sport + freetime) / 24.0+ return decimal.Decimal(str(total)).quantize(TWOPLACES)++ def user_bodyweight(self, weight):+ '''+ Create a new weight entry as needed+ '''+ if (not WeightEntry.objects.filter(user=self.user).exists()+ or (datetime.date.today()+ - WeightEntry.objects.filter(user=self.user).latest().creation_date+ > datetime.timedelta(days=3))):+ entry = WeightEntry()+ entry.weight = weight+ entry.user = self.user+ entry.creation_date = datetime.date.today()+ entry.save()++ # Update the last entry+ else:+ entry = WeightEntry.objects.filter(user=self.user).latest()+ entry.weight = weight+ entry.save()+ return entry+++# Every new user gets a profile+@disable_for_loaddata+def create_user_profile(sender, instance, created, **kwargs):+ if created:+ UserProfile.objects.create(user=instance)+++post_save.connect(create_user_profile, sender=User)\ No newline at end of filediff --git a/wger/manager/admin.py b/wger/manager/admin.pyindex f1e03ac30..99fa13b5f 100644--- a/wger/manager/admin.py+++ b/wger/manager/admin.py@@ -12,6 +12,7 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License+from wger.core.models import UserProfilefrom wger.manager import models as manager_models@@ -21,6 +22,6 @@ admin.site.register(manager_models.Workout)admin.site.register(manager_models.Set)admin.site.register(manager_models.Day)admin.site.register(manager_models.WorkoutLog)-admin.site.register(manager_models.UserProfile)+admin.site.register(UserProfile)admin.site.register(manager_models.Setting)diff --git a/wger/manager/api/resources.py b/wger/manager/api/resources.pyindex 40d68c2a6..c55435b27 100644--- a/wger/manager/api/resources.py+++ b/wger/manager/api/resources.py@@ -20,11 +20,11 @@ from tastypie.authentication import MultiAuthenticationfrom tastypie.authentication import SessionAuthenticationfrom tastypie.resources import ModelResourcefrom tastypie.constants import ALL, ALL_WITH_RELATIONS+from wger.core.models import UserProfilefrom wger.exercises.api.resources import ExerciseResourcefrom wger.utils.resources import UserObjectsOnlyAuthorization-from wger.manager.models import UserProfilefrom wger.manager.models import WorkoutSessionfrom wger.manager.models import Workoutfrom wger.manager.models import Schedulediff --git a/wger/manager/management/commands/delete-temp-users.py b/wger/manager/management/commands/delete-temp-users.pyindex a03cb060c..22158f9f2 100644--- a/wger/manager/management/commands/delete-temp-users.py+++ b/wger/manager/management/commands/delete-temp-users.py@@ -18,7 +18,7 @@ import datetimefrom django.utils.timezone import nowfrom django.core.management.base import BaseCommand-from wger.manager.models import UserProfile+from wger.core.models import UserProfileclass Command(BaseCommand):diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.pyindex 298a52a96..5ef6ff0f2 100644--- a/wger/manager/management/commands/email-reminders.py+++ b/wger/manager/management/commands/email-reminders.py@@ -24,7 +24,7 @@ from django.conf import settingsfrom django.utils import translationfrom django.contrib.sites.models import Site-from wger.manager.models import UserProfile+from wger.core.models import UserProfilefrom wger.manager.models import Schedulefrom wger.utils.constants import EMAIL_FROMdiff --git a/wger/manager/migrations/0015_auto__del_userprofile.py b/wger/manager/migrations/0015_auto__del_userprofile.pynew file mode 100644index 000000000..8800be040--- /dev/null+++ b/wger/manager/migrations/0015_auto__del_userprofile.py@@ -0,0 +1,176 @@+# -*- coding: utf-8 -*-+from south.utils import datetime_utils as datetime+from south.db import db+from south.v2 import SchemaMigration+from django.db import models+++class Migration(SchemaMigration):++ depends_on = (+ ('core', '0002_auto__add_userprofile'),+ )++ def forwards(self, orm):+ '''+ Don't do anything here, everything happens in 0002_auto__add_userprofile+ '''+ pass++ def backwards(self, orm):+ '''+ Don't do anything here, everything happens in 0002_auto__add_userprofile+ '''+ pass+++ models = {+ u'auth.group': {+ 'Meta': {'object_name': 'Group'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})+ },+ u'auth.permission': {+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'auth.user': {+ 'Meta': {'object_name': 'User'},+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})+ },+ u'contenttypes.contenttype': {+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Language']"}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Muscle']", 'null': 'True', 'blank': 'True'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'manager.day': {+ 'Meta': {'object_name': 'Day'},+ 'day': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['manager.DaysOfWeek']", 'symmetrical': 'False'}),+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'training': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.daysofweek': {+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'manager.schedule': {+ 'Meta': {'object_name': 'Schedule'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_loop': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'start_date': ('wger.utils.fields.Html5DateField', [], {'default': 'datetime.date.today'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.schedulestep': {+ 'Meta': {'ordering': "['order']", 'object_name': 'ScheduleStep'},+ 'duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '4', 'max_length': '1'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '1'}),+ 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Schedule']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.set': {+ 'Meta': {'ordering': "['order']", 'object_name': 'Set'},+ 'exerciseday': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Day']"}),+ 'exercises': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Exercise']", 'symmetrical': 'False'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),+ 'sets': ('wger.utils.fields.Html5IntegerField', [], {'default': '4'})+ },+ u'manager.setting': {+ 'Meta': {'ordering': "['order', 'id']", 'object_name': 'Setting'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'blank': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'set': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Set']"})+ },+ u'manager.workout': {+ 'Meta': {'ordering': "['-creation_date']", 'object_name': 'Workout'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.workoutlog': {+ 'Meta': {'ordering': "['date', 'reps']", 'object_name': 'WorkoutLog'},+ 'date': ('wger.utils.fields.Html5DateField', [], {}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'weight': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.workoutsession': {+ 'Meta': {'ordering': "['date']", 'unique_together': "(('date', 'user'),)", 'object_name': 'WorkoutSession'},+ 'date': ('wger.utils.fields.Html5DateField', [], {}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'impression': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '2'}),+ 'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),+ 'time_end': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),+ 'time_start': ('django.db.models.fields.TimeField', [], {'null': 'True', 'blank': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ }+ }++ complete_apps = ['manager']\ No newline at end of filediff --git a/wger/manager/models.py b/wger/manager/models.pyindex 620d72881..1a66d0b1b 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -17,10 +17,8 @@import datetimeimport logging-import decimalfrom django.db import models-from django.db.models.signals import post_savefrom django.utils.translation import ugettext_lazy as _from django.contrib.auth.models import Userfrom django.core.validators import MaxValueValidator@@ -31,16 +29,12 @@ from django.core.cache import cachefrom django.core.validators import MinValueValidatorfrom wger.exercises.models import Exercise-from wger.exercises.models import Language--from wger.utils.helpers import disable_for_loaddatafrom wger.utils.cache import cache_mapper, reset_workout_canonical_form-from wger.utils.constants import TWOPLACES-from wger.weight.models import WeightEntryfrom wger.utils.fields import Html5DateFieldfrom wger.utils.fields import Html5DecimalFieldfrom wger.utils.fields import Html5IntegerField+logger = logging.getLogger('wger.custom')@@ -764,328 +758,6 @@ class WorkoutSession(models.Model):return self-class UserProfile(models.Model):- GENDER_MALE = '1'- GENDER_FEMALE = '2'- GENDER = (- (GENDER_MALE, _('Male')),- (GENDER_FEMALE, _('Female')),- )-- INTENSITY_LOW = '1'- INTENSITY_MEDIUM = '2'- INTENSITY_HIGH = '3'- INTENSITY = (- (INTENSITY_LOW, _('Low')),- (INTENSITY_MEDIUM, _('Medium')),- (INTENSITY_HIGH, _('High')),- )-- # This field is required.- user = models.OneToOneField(User,- editable=False)-- # Flag to mark a temporary user (demo account)- is_temporary = models.BooleanField(default=False,- editable=False)-- #- # User preferences- #-- # Show exercise comments on workout view- show_comments = models.BooleanField(verbose_name=_('Show exercise comments'),- help_text=_('Check to show exercise comments on the '- 'workout view'),- default=True)-- # Also show ingredients in english while composing a nutritional plan- # (obviously this is only meaningful if the user has a language other than english)- show_english_ingredients = models.BooleanField(- verbose_name=_('Also use ingredients in English'),- help_text=_('''Check to also show ingredients in English while creating-a nutritional plan. These ingredients are extracted from a list provided-by the US Department of Agriculture. It is extremely complete, with around-7000 entries, but can be somewhat overwhelming and make the search difficult.'''),- default=True)-- workout_reminder_active = models.BooleanField(verbose_name=_('Activate workout reminders'),- help_text=_('Check to activate automatic '- 'reminders for workouts. You need '- 'to provide a valid email for this '- 'to work.'),- default=False)-- 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,- 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,- validators=[MinValueValidator(1), MaxValueValidator(30)])- last_workout_notification = models.DateField(editable=False,- blank=False,- null=True)- '''- The last time the user got a workout reminder email-- This is needed e.g. to check daily per cron for old workouts but only- send users an email once per week- '''-- notification_language = models.ForeignKey(Language,- verbose_name=_('Notification language'),- help_text=_('Language to use when sending you email '- 'notifications, e.g. email reminders for '- 'workouts. This does not affect the '- 'language used on the website.'),- default=2)-- timer_active = models.BooleanField(verbose_name=_('Use pauses in workout timer'),- help_text=_('Check to activate timer pauses between '- 'exercises.'),- default=True)- '''- Switch to activate pauses in the gym view- '''-- timer_pause = Html5IntegerField(verbose_name=_('Default duration of workout pauses'),- help_text=_('Default duration in seconds of pauses used by '- 'the timer in the gym mode.'),- default=90,- validators=[MinValueValidator(10), MaxValueValidator(400)])- '''- Default duration of workout pauses in the gym view- '''-- #- # User statistics- #- age = Html5IntegerField(max_length=2,- verbose_name=_('Age'),- blank=False,- null=True,- validators=[MinValueValidator(10), MaxValueValidator(100)])- '''The user's age'''-- height = Html5IntegerField(max_length=2,- verbose_name=_('Height (cm)'),- blank=False,- validators=[MinValueValidator(140), MaxValueValidator(230)],- null=True)- '''The user's height'''-- gender = models.CharField(max_length=1,- choices=GENDER,- default=GENDER_MALE,- blank=False,- null=True)- '''Gender'''-- sleep_hours = Html5IntegerField(verbose_name=_('Hours of sleep'),- help_text=_('The average hours of sleep per day'),- default=7,- blank=False,- 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,- validators=[MinValueValidator(1), MaxValueValidator(15)])- '''The average hours at work per day'''-- work_intensity = models.CharField(verbose_name=_('Physical intensity'),- help_text=_('Approximately'),- max_length=1,- choices=INTENSITY,- default=INTENSITY_LOW,- blank=False,- null=True)- '''Physical intensity of work'''-- sport_hours = Html5IntegerField(verbose_name=_('Sport'),- help_text=_('Average hours per week'),- default=3,- blank=False,- null=True,- validators=[MinValueValidator(1), MaxValueValidator(30)])- '''The average hours performing sports per week'''-- sport_intensity = models.CharField(verbose_name=_('Physical intensity'),- help_text=_('Approximately'),- max_length=1,- choices=INTENSITY,- default=INTENSITY_MEDIUM,- blank=False,- null=True)- '''Physical intensity of sport activities'''-- freetime_hours = Html5IntegerField(verbose_name=_('Free time'),- help_text=_('Average hours per day'),- default=8,- blank=False,- null=True,- validators=[MinValueValidator(1), MaxValueValidator(15)])- '''The average hours of free time per day'''-- freetime_intensity = models.CharField(verbose_name=_('Physical intensity'),- help_text=_('Approximately'),- max_length=1,- choices=INTENSITY,- default=INTENSITY_LOW,- blank=False,- null=True)- '''Physical intensity during free time'''-- calories = Html5IntegerField(verbose_name=_('Total daily calories'),- help_text=_('Total caloric intake, including e.g. any surplus'),- default=2500,- blank=False,- null=True,- validators=[MinValueValidator(1500), MaxValueValidator(5000)])- '''Basic caloric intake based on physical activity'''-- @property- def weight(self):- '''- Returns the last weight entry, done here to make the behaviour- more consistent with the other settings (age, height, etc.)- '''- try:- weight = WeightEntry.objects.filter(user=self.user).latest().weight- except WeightEntry.DoesNotExist:- weight = 0- return weight-- def clean(self):- '''- Make sure the total amount of hours is 24- '''- if ((self.sleep_hours and self.freetime_hours and self.work_hours)- and (self.sleep_hours + self.freetime_hours + self.work_hours) > 24):- raise ValidationError(_('The sum of all hours has to be 24'))-- def __unicode__(self):- '''- Return a more human-readable representation- '''- return u"Profile for user {0}".format(self.user)-- def calculate_bmi(self):- '''- Calculates the user's BMI-- Formula: weight/height^2- - weight in kg- - height in m- '''- return self.weight / (self.height / 100.0 * self.height / 100.0)-- def calculate_basal_metabolic_rate(self, formula=1):- '''- Calculates the basal metabolic rate.-- Currently only the Mifflin-St.Jeor formula is supported- '''-- if self.gender == self.GENDER_MALE:- factor = 5- else:- factor = -161-- try:- rate = ((10 * self.weight) # in kg- + (6.25 * self.height) # in cm- - (5 * self.age) # in years- + factor)- except TypeError:- # Any of the entries is missing- rate = 0-- return decimal.Decimal(str(rate)).quantize(TWOPLACES)-- def calculate_activities(self):- '''- Calculates the calories needed by additional physical activities-- Factors taken from- * https://en.wikipedia.org/wiki/Physical_activity_level- * http://www.fao.org/docrep/007/y5686e/y5686e07.htm- '''- # Sleep- sleep = self.sleep_hours * 0.95-- # Work- if self.work_intensity == self.INTENSITY_LOW:- work_factor = 1.5- elif self.work_intensity == self.INTENSITY_MEDIUM:- work_factor = 1.8- else:- work_factor = 2.2- work = self.work_hours * work_factor-- # Sport (entered in hours/week, so we must divide)- if self.sport_intensity == self.INTENSITY_LOW:- sport_factor = 4- elif self.sport_intensity == self.INTENSITY_MEDIUM:- sport_factor = 6- else:- sport_factor = 10- sport = (self.sport_hours / 7.0) * sport_factor-- # Free time- if self.freetime_intensity == self.INTENSITY_LOW:- freetime_factor = 1.3- elif self.freetime_intensity == self.INTENSITY_MEDIUM:- freetime_factor = 1.9- else:- freetime_factor = 2.4- freetime = self.freetime_hours * freetime_factor-- # Total- total = (sleep + work + sport + freetime) / 24.0- return decimal.Decimal(str(total)).quantize(TWOPLACES)-- def user_bodyweight(self, weight):- '''- Create a new weight entry as needed- '''- if (not WeightEntry.objects.filter(user=self.user).exists()- or (datetime.date.today()- - WeightEntry.objects.filter(user=self.user).latest().creation_date- > datetime.timedelta(days=3))):- entry = WeightEntry()- entry.weight = weight- entry.user = self.user- entry.creation_date = datetime.date.today()- entry.save()-- # Update the last entry- else:- entry = WeightEntry.objects.filter(user=self.user).latest()- entry.weight = weight- entry.save()- return entry---# Every new user gets a profile-@disable_for_loaddata-def create_user_profile(sender, instance, created, **kwargs):- if created:- UserProfile.objects.create(user=instance)---post_save.connect(create_user_profile, sender=User)--## Helpers#diff --git a/wger/manager/tests/test_email_reminder.py b/wger/manager/tests/test_email_reminder.pyindex 52fa8e894..a0fc2b70a 100644--- a/wger/manager/tests/test_email_reminder.py+++ b/wger/manager/tests/test_email_reminder.py@@ -17,9 +17,10 @@ import datetimefrom django.core.management import call_commandfrom django.core import mailfrom django.contrib.auth.models import User+from wger.core.models import UserProfilefrom wger.manager.tests.testcase import WorkoutManagerTestCase-from wger.manager.models import Schedule, UserProfile+from wger.manager.models import Schedulefrom wger.manager.models import Workoutdiff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 498ae33d6..13c75ec19 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -18,9 +18,9 @@ import loggingfrom django import formsfrom django.utils.translation import ugettext as _+from wger.core.models import UserProfilefrom wger.nutrition.models import IngredientWeightUnit-from wger.manager.models import UserProfilefrom wger.utils.widgets import Html5NumberInput