Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Crispify calories calculator forms

Roland Geider4dc75ae10bce
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 785617f1b..87ef3f253 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -126,6 +126,17 @@ class BmrForm(forms.ModelForm):
model = UserProfile
fields = ('age', 'height', 'gender')
+ def __init__(self, *args, **kwargs):
+ super(BmrForm, self).__init__(*args, **kwargs)
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ "age",
+ "height",
+ "gender",
+ "weight"
+ )
+ self.helper.form_tag = False
+
class PhysicalActivitiesForm(forms.ModelForm):
"""
@@ -141,6 +152,29 @@ class PhysicalActivitiesForm(forms.ModelForm):
'freetime_hours',
'freetime_intensity')
+ def __init__(self, *args, **kwargs):
+ super(PhysicalActivitiesForm, self).__init__(*args, **kwargs)
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ "sleep_hours",
+ Row(
+ Column('work_hours', css_class='form-group col-6 mb-0'),
+ Column('work_intensity', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ Row(
+ Column('sport_hours', css_class='form-group col-6 mb-0'),
+ Column('sport_intensity', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ Row(
+ Column('freetime_hours', css_class='form-group col-6 mb-0'),
+ Column('freetime_intensity', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ )
+ )
+ self.helper.form_tag = False
+
class DailyCaloriesForm(forms.ModelForm):
"""
@@ -164,6 +198,12 @@ class DailyCaloriesForm(forms.ModelForm):
model = UserProfile
fields = ('calories',)
+ def __init__(self, *args, **kwargs):
+ super(DailyCaloriesForm, self).__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.form_tag = False
+
class MealItemForm(forms.ModelForm):
weight_unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),
diff --git a/wger/nutrition/templates/rate/form.html b/wger/nutrition/templates/rate/form.html
index 0aa147b05..5221e3032 100644
--- a/wger/nutrition/templates/rate/form.html
+++ b/wger/nutrition/templates/rate/form.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load i18n %}
{% load static %}
-{% load wger_extras %}
+{% load crispy_forms_tags %}
{% block header %}
<script>
@@ -30,12 +30,7 @@ additional physical activity.{% endblocktrans %}</p>
method="post"
class="calories-autoform wger-form"
id="bmr-form">
- {% csrf_token %}
- {% render_form_errors form %}
-
- {% for current_field in form %}
- {% render_form_field current_field %}
- {% endfor %}
+ {% crispy form %}
</form>
<div id="bmr-result-container" style="display:none;">
@@ -57,22 +52,7 @@ required per day.{% endblocktrans %}</p>
method="post"
class="wger-form calories-autoform"
id="activities-form">
- {% csrf_token %}
- {% render_form_errors form_activities %}
- {% render_form_field form_activities.sleep_hours %}
-
- <div class="row">
- <div class="col-md-6 col-xs-6">
- {% render_form_field form_activities.work_hours %}
- {% render_form_field form_activities.sport_hours %}
- {% render_form_field form_activities.freetime_hours %}
- </div>
- <div class="col-md-6 col-xs-6">
- {% render_form_field form_activities.work_intensity %}
- {% render_form_field form_activities.sport_intensity %}
- {% render_form_field form_activities.freetime_intensity %}
- </div>
- </div>
+ {% crispy form_activities %}
</form>
<div id="activities-result-container" style="display:none;">
@@ -114,10 +94,9 @@ you might just enter yourself the amount of calories if you know the value.{% en
method="post"
class="wger-form"
id="total-calories-form">
- {% csrf_token %}
- {% render_form_field form_calories.additional_calories %}
- {% render_form_field form_calories.calories %}
+ {{ form_calories.additional_calories|as_crispy_field }}
+ {{ form_calories.calories|as_crispy_field }}
<p>
<input type="submit" class="btn btn-default btn-block" value="{% trans 'Transfer basic intake to total daily calories' %}" id="form-transfer-calories">
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 89050bcda..2b5c6f835 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -50,10 +50,9 @@ def view(request):
'gender': request.user.userprofile.gender,
'weight': request.user.userprofile.weight}
- context = {}
- context['form'] = BmrForm(initial=form_data)
- context['form_activities'] = PhysicalActivitiesForm(instance=request.user.userprofile)
- context['form_calories'] = DailyCaloriesForm(instance=request.user.userprofile)
+ context = {'form': BmrForm(initial=form_data),
+ 'form_activities': PhysicalActivitiesForm(instance=request.user.userprofile),
+ 'form_calories': DailyCaloriesForm(instance=request.user.userprofile)}
return render(request, 'rate/form.html', context)