Self hosted FLOSS fitness/workout, nutrition and weight tracker
Issue #115 - Reminders to enter weight
matheusc0cf479a38dd
diff --git a/wger/core/forms.py b/wger/core/forms.pyindex 0b414f49a..c13f0af59 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -36,7 +36,8 @@ class UserPreferencesForm(forms.ModelForm):'weight_unit','timer_active','timer_pause',- 'ro_access')+ 'ro_access',+ 'num_days_weight_reminder')class UserEmailForm(forms.ModelForm):diff --git a/wger/core/migrations/0003_auto_20150217_1554.py b/wger/core/migrations/0003_auto_20150217_1554.pynew file mode 100644index 000000000..dd7776d68--- /dev/null+++ b/wger/core/migrations/0003_auto_20150217_1554.py@@ -0,0 +1,39 @@+# -*- coding: utf-8 -*-+from __future__ import unicode_literals++from django.db import models, migrations+import django.core.validators+++class Migration(migrations.Migration):++ dependencies = [+ ('core', '0002_auto_20141225_1512'),+ ]++ operations = [+ migrations.AddField(+ model_name='userprofile',+ name='num_days_weight_reminder',+ field=models.IntegerField(verbose_name='Automatic reminders for weight entries', max_length=30, null=True, help_text='Number of days after the last weight entry (enter 0 to deactivate)'),+ preserve_default=True,+ ),+ migrations.AlterField(+ model_name='userprofile',+ name='age',+ field=models.IntegerField(verbose_name='Age', null=True, validators=[django.core.validators.MinValueValidator(10), django.core.validators.MaxValueValidator(100)]),+ preserve_default=True,+ ),+ migrations.AlterField(+ model_name='userprofile',+ name='height',+ field=models.IntegerField(verbose_name='Height (cm)', null=True, validators=[django.core.validators.MinValueValidator(140), django.core.validators.MaxValueValidator(230)]),+ preserve_default=True,+ ),+ migrations.AlterField(+ model_name='userprofile',+ name='ro_access',+ field=models.BooleanField(verbose_name='Allow external access', default=False, help_text='Allow external users to access your workouts and logs in a read-only mode. You need to set this before you can share links e.g. to social media.'),+ preserve_default=True,+ ),+ ]diff --git a/wger/core/models.py b/wger/core/models.pyindex 7073cf6ca..724af07a2 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -303,11 +303,12 @@ by the US Department of Agriculture. It is extremely complete, with arounddefault=False)'''Allow anonymous read-only access'''- ''' Number of Days Reminder Weight '''- num_days_weight_reminder = models.IntegerField(verbose_name=_('Number of days Weight Reminder'),- help_text=_('Num of days after the last entry to reminder the user'),++ num_days_weight_reminder = models.IntegerField(verbose_name=_('Automatic reminders for weight entries'),+ help_text=_('Number of days after the last weight entry (enter 0 to deactivate)'),max_length=30,null=True)+ ''' Number of Days Reminder Weight '''@propertydef weight(self):diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.htmlindex 1d1c88461..74ec18972 100644--- a/wger/core/templates/user/preferences.html+++ b/wger/core/templates/user/preferences.html@@ -93,6 +93,7 @@ $(function() {{% render_form_field form.weight_unit %}{% render_form_field form.show_comments %}{% render_form_field form.show_english_ingredients %}+ {% render_form_field form.num_days_weight_reminder %}</div></div></div>diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.jsonindex c6420ba25..43515bce8 100644--- a/wger/manager/fixtures/test-user-data.json+++ b/wger/manager/fixtures/test-user-data.json@@ -502,7 +502,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": true+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -532,7 +532,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":3}},{@@ -560,7 +560,7 @@"notification_language": 2,"gym": 2,"weight_unit": "kg",- "ro_access": true+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -590,7 +590,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -620,7 +620,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -650,7 +650,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -680,7 +680,7 @@"timer_pause": 90,"gym": 2,"weight_unit": "lb",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -710,7 +710,7 @@"timer_pause": 90,"gym": 2,"weight_unit": "lb",- "ro_access": true+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -740,7 +740,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -770,7 +770,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -800,7 +800,7 @@"timer_pause": 90,"gym": 2,"weight_unit": "lb",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -830,7 +830,7 @@"timer_pause": 90,"gym": 1,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -860,7 +860,7 @@"timer_pause": 90,"gym": 2,"weight_unit": "lb",- "ro_access": true+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -890,7 +890,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -920,7 +920,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -950,7 +950,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -980,7 +980,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1010,7 +1010,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1040,7 +1040,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "lb",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1070,7 +1070,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "lb",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1100,7 +1100,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1130,7 +1130,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1160,7 +1160,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}},{@@ -1190,7 +1190,7 @@"sport_hours": 6,"is_temporary": false,"weight_unit": "kg",- "ro_access": false+ "ro_access": false, "num_days_weight_reminder":0}}]diff --git a/wger/manager/management/commands/email-weight-reminder.py b/wger/manager/management/commands/email-weight-reminder.pyindex fa0f5582f..ed17c8e74 100644--- a/wger/manager/management/commands/email-weight-reminder.py+++ b/wger/manager/management/commands/email-weight-reminder.py@@ -57,7 +57,7 @@ class Command(BaseCommand):if datediff >= profile.num_days_weight_reminder:self.send_email(profile.user, last_entry)except WeightEntry.DoesNotExist:- print("At least one weight entry is required")+ pass@staticmethod@@ -76,7 +76,7 @@ class Command(BaseCommand):context['site'] = Site.objects.get_current()context['day'] = last_entry- subject = _('You have to entry your weight')+ subject = _('You have to enter your weight')message = loader.render_to_string('workout/email_weight_reminder.html', context)mail.send_mail(subject,message,diff --git a/wger/manager/templates/workout/email_weight_reminder.html b/wger/manager/templates/workout/email_weight_reminder.htmlindex 08ea2b3b9..c980f7782 100644--- a/wger/manager/templates/workout/email_weight_reminder.html+++ b/wger/manager/templates/workout/email_weight_reminder.html@@ -11,5 +11,5 @@ reminders, deactivate the option in your settings.{% endblocktrans %}{% trans "the wger.de team" %}-* http://{{site}}{{workout.get_absolute_url}}+* http://{{site}}{% url 'weight:overview' %}* http://{{site}}{% url 'core:user:preferences' %}\ No newline at end of filediff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.htmlindex 9b1c6d2f5..e09eb3749 100644--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@ -25,6 +25,7 @@<a href="https://github.com/rolandgeider/wger/issues/108">#100</a><a href="https://github.com/rolandgeider/wger/issues/108">#108</a><a href="https://github.com/rolandgeider/wger/issues/117">#117</a>+ <a href="https://github.com/rolandgeider/wger/issues/115">#115</a></li></ul>