Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add birthdate field to userprofile -user can change from preferences -gym admins can enter birthdate when creating user

Daniel Topaldf2e3ef17032
diff --git a/wger/core/forms.py b/wger/core/forms.py
index ff116b31c..778f4d3fb 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -52,7 +52,9 @@ class UserPreferencesForm(forms.ModelForm):
'timer_active',
'timer_pause',
'ro_access',
- 'num_days_weight_reminder')
+ 'num_days_weight_reminder',
+ 'birthdate'
+ )
class UserEmailForm(forms.ModelForm):
diff --git a/wger/core/models.py b/wger/core/models.py
index 6b7cc92af..5e26f9039 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -77,6 +77,19 @@ class Language(models.Model):
'''
return False
+def birthdate_validator(birthdate):
+ '''
+ Checks to see if entered birthdate (datetime.date object) is
+ between 10 and 100 years of age.
+ '''
+ max_year = birthdate.replace(year=(birthdate.year + 100))
+ min_year = birthdate.replace(year=(birthdate.year + 10))
+ today = datetime.date.today()
+ if today > max_year or today < min_year:
+ raise ValidationError(
+ _('%(birthdate)s is not a valid birthdate'),
+ params={'birthdate': birthdate},
+ )
@python_2_unicode_compatible
class UserProfile(models.Model):
@@ -207,6 +220,13 @@ by the US Department of Agriculture. It is extremely complete, with around
validators=[MinValueValidator(10), MaxValueValidator(100)])
'''The user's age'''
+ birthdate = models.DateField(verbose_name=('Date of Birth'),
+ help_text=_('Please use the format: mm/dd/yyyy'),
+ blank=False,
+ null=True,
+ validators=[birthdate_validator])
+ '''The user's date of birth'''
+
height = IntegerField(verbose_name=_('Height (cm)'),
blank=False,
validators=[MinValueValidator(140), MaxValueValidator(230)],
diff --git a/wger/core/signals.py b/wger/core/signals.py
index bd6d3239f..302a8f551 100644
--- a/wger/core/signals.py
+++ b/wger/core/signals.py
@@ -16,7 +16,10 @@
from django.contrib.auth.models import User
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, pre_save
+from django.dispatch import receiver
+
+import datetime
from wger.core.models import UserProfile, UserCache
from wger.utils.helpers import disable_for_loaddata
@@ -39,6 +42,17 @@ def create_user_cache(sender, instance, created, **kwargs):
if created:
UserCache.objects.create(user=instance)
+@receiver(pre_save, sender=UserProfile)
+def set_user_age(sender, instance, **kwargs):
+ '''
+ Inputting or changing a user's birthdate will auto-update the
+ user's age as well if user's age has not been set
+ '''
+ if instance.age == None and instance.birthdate != None:
+ today = datetime.date.today()
+ birthday = instance.birthdate
+ instance.age = (today.year - birthday.year
+ - ((today.month, today.day) < (birthday.month, birthday.year)))
post_save.connect(create_user_profile, sender=User)
post_save.connect(create_user_cache, sender=User)
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index 5ba594e5b..b750e8432 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -92,6 +92,7 @@ $(function() {
{% render_form_field form.show_comments %}
{% render_form_field form.show_english_ingredients %}
{% render_form_field form.num_days_weight_reminder %}
+ {% render_form_field form.birthdate %}
</div>
</div>
</div>
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index f44e545a2..6999afa7d 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -57,7 +57,8 @@ class PreferencesTestCase(WorkoutManagerTestCase):
'timer_active': False,
'timer_pause': 100,
'num_days_weight_reminder': 10,
- 'weight_unit': 'kg'})
+ 'weight_unit': 'kg',
+ 'birthdate': '02/25/1987'})
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('core:user:preferences'))
@@ -80,7 +81,8 @@ class PreferencesTestCase(WorkoutManagerTestCase):
'timer_active': True,
'timer_pause': 40,
'num_days_weight_reminder': 10,
- 'weight_unit': 'lb'})
+ 'weight_unit': 'lb',
+ 'birthdate': '02/25/1987'})
self.assertEqual(response.status_code, 302)
response = self.client.get(reverse('core:user:preferences'))
diff --git a/wger/gym/forms.py b/wger/gym/forms.py
index 0c0ebcb70..f012a73fb 100644
--- a/wger/gym/forms.py
+++ b/wger/gym/forms.py
@@ -65,6 +65,9 @@ class GymUserAddForm(GymUserPermisssionForm, UserPersonalInformationForm):
Form used when adding a user to a gym
'''
+ birthdate = forms.DateField(required=False,
+ help_text=_("yyyy/mm/dd"))
+
class Meta:
model = User
widgets = {'role': BootstrapSelectMultiple()}
diff --git a/wger/gym/templates/gym/new_user.html b/wger/gym/templates/gym/new_user.html
index 0e8630064..92fe23102 100644
--- a/wger/gym/templates/gym/new_user.html
+++ b/wger/gym/templates/gym/new_user.html
@@ -34,6 +34,10 @@
<th>{% trans "Gym" %}</th>
<td>{{new_user.userprofile.gym}}</td>
</tr>
+ <tr>
+ <th>{% trans "Birthdate" %}</th>
+ <td>{{new_user.userprofile.birthdate}}</td>
+ </tr>
</table>
{% endblock %}
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 9d75d8b0f..02875c0ac 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -360,6 +360,7 @@ class GymAddUserView(WgerFormMixin,
# Update profile
user.userprofile.gym = gym
+ user.userprofile.birthdate = form.cleaned_data['birthdate']
user.userprofile.save()
# Set appropriate permission groups