Self hosted FLOSS fitness/workout, nutrition and weight tracker
Crispify BMI form
Roland Geider436dde0f5fe0
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 992ef004c..785617f1b 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -19,6 +19,7 @@ import logging# Djangofrom django import forms+from django.urls import reversefrom django.utils.translation import (ugettext as _,ugettext_lazy@@ -27,10 +28,12 @@ from django.utils.translation import (# Third Partyfrom crispy_forms.helper import FormHelperfrom crispy_forms.layout import (- Column,HTML,+ ButtonHolder,+ Column,Layout,- Row+ Row,+ Submit)# wger@@ -96,6 +99,22 @@ class BmiForm(forms.ModelForm):model = UserProfilefields = ('height', )+ def __init__(self, *args, **kwargs):+ super(BmiForm, self).__init__(*args, **kwargs)++ self.helper = FormHelper()+ self.helper.form_action = reverse('nutrition:bmi:calculate')+ self.helper.form_class = 'wger-form'+ self.helper.form_id = 'bmi-form'+ self.helper.layout = Layout(+ Row(+ Column('height', css_class='form-group col-6 mb-0'),+ Column('weight', css_class='form-group col-6 mb-0'),+ css_class='form-row'+ ),+ ButtonHolder(Submit('submit', _("Calculate"), css_class='btn-success'))+ )+class BmrForm(forms.ModelForm):"""diff --git a/wger/nutrition/templates/bmi/form.html b/wger/nutrition/templates/bmi/form.htmlindex 32a40f2cd..9dfe9e3a9 100644--- a/wger/nutrition/templates/bmi/form.html+++ b/wger/nutrition/templates/bmi/form.html@@ -1,7 +1,7 @@{% extends "base.html" %}{% load i18n %}{% load static %}-{% load wger_extras %}+{% load crispy_forms_tags %}{% block header %}<style>@@ -31,9 +31,9 @@ $(document).ready(function () {/** Process the form*/- $("#bmi-form").click(function(e){+ $("#submit-id-submit").click(function(e){e.preventDefault();- wgerRenderBodyMassIndex({% if request.user_agent.is_mobile %}$('#content').width() * 0.95{% endif %});+ wgerRenderBodyMassIndex();});});@@ -55,13 +55,8 @@ $(document).ready(function () {-->{% block content %}-<form action="{% url 'nutrition:bmi:calculate' %}"- method="post"- class="wger-form"- id="bmi-form">- {% trans 'Calculate' as submit_text %}- {% render_form_fields form submit_text %}-</form>+{% crispy form %}+<div id="bmi-result-container" style="display:none;"><h3>{% trans 'Results' %}</h3>