Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Crispify set forms

Roland Geiderad5d33b0546e
diff --git a/wger/manager/templates/set/add.html b/wger/manager/templates/set/add.html
index 9bdc671e2..b086b573a 100644
--- a/wger/manager/templates/set/add.html
+++ b/wger/manager/templates/set/add.html
@@ -1,7 +1,5 @@
{% extends extend_template %}
-{% load i18n %}
-{% load static %}
-{% load wger_extras %}
+{% load i18n static crispy_forms_tags %}
<!--
@@ -27,52 +25,47 @@ function wgerCustomPageInit()
Main Content
-->
{% block content %}
-
-
-<form action="{{form_action}}"
+<form action="{{request.path}}"
method="post"
class="wger-form">
{% csrf_token %}
- {% render_form_field form.exercises %}
+ {{ form.exercises|as_crispy_field }}
<div class="form-group">
- <label for="id_sets" class="control-label col-md-3">
+
+ <label for="id_sets" class="control-label">
{{form.sets.label}}:
<span id="id_sets_value">{{ form.sets.value }}</span>
</label>
- <div class="col-md-9">
<input name="sets"
id="id_sets"
min="1"
max="10"
value="{{ form.sets.value }}"
type="range"
- class="form-control">
- </div>
+ class="form-control-range">
</div>
<div class="form-group">
- <label class="col-md-3 control-label">
+ <label class="control-label">
{% trans "Repetitions" %}
</label>
- <div class=" col-md-9">
- <span class="help-block">{% blocktrans %}If you do the same repetitions for all sets,
+ <span class="form-text">{% blocktrans %}If you do the same repetitions for all sets,
you can just enter one value: e.g. for 4 sets just enter one "10" for the repetitions, this
automatically becomes "4 x 10".{% endblocktrans %}</span>
- </div>
</div>
<div class="form-group">
- <div class="col-md-12">
- <div id="formsets">
- {% for formset in formsets %}
- {% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset %}
- {% endfor %}
- </div>
+ <div id="formsets">
+ {% for formset in formsets %}
+ {% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset helper=helper %}
+ {% endfor %}
</div>
</div>
- {% render_form_submit %}
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary btn-success btn-block" value="{% trans 'Save' %}">
+ </div>
</form>
{% endblock %}
diff --git a/wger/manager/templates/set/edit.html b/wger/manager/templates/set/edit.html
index 62c80ade6..a7d9e4998 100644
--- a/wger/manager/templates/set/edit.html
+++ b/wger/manager/templates/set/edit.html
@@ -1,7 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
{% load static %}
-{% load wger_extras %}
<!--
@@ -14,22 +13,15 @@
Main Content
-->
{% block content %}
-<form action="{{form_action}}"
+<form action="{{request.path}}"
method="post"
class="wger-form">
{% csrf_token %}
- <div class="form-group">
- <label class="col-md-3 control-label">
- {% trans "Repetitions" %}
- </label>
- <div class="col-md-9">
- {% for formset in formsets %}
- {% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset %}
- {% endfor %}
- </div>
- </div>
+ {% for formset in formsets %}
+ {% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset helper=helper %}
+ {% endfor %}
- {% render_form_submit %}
+ <input type="submit" class="btn btn-primary btn-success btn-block" value="{% trans 'Save' %}">
</form>
{% endblock %}
diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.html
index 2feba58e2..f9cadf7c1 100644
--- a/wger/manager/templates/set/formset.html
+++ b/wger/manager/templates/set/formset.html
@@ -1,73 +1,12 @@
-{% load wger_extras %}
+{% load wger_extras crispy_forms_tags %}
{% load i18n %}
-<div id="formset-exercise-{{exercise.id}}" style="margin-top: 1em;">
-<div class="row">
- <div class="offset-md-2 col-md-10">
- <label class="control-label">
- {{exercise}}
- </label>
- </div>
-</div>
-{{ formset.management_form }}
-
-{% for field in formset %}
-<div style="padding-top: 0.5em;">
-
- {# Header row with field labels, only for first loop #}
- <div class="row">
- {% for i in field %}
- {% if not i.is_hidden %}
- {% if forloop.first %}
- <div class="col-xs-2">
- </div>
- {% endif %}
-
- {% if forloop.parentloop.first %}
- <div class="{% cycle 'col-xs-3' 'col-xs-2' %}">
- {{ i.label }}
- {% if not i.field.required %}
- <br>
- <span style="font-size:90%;">— <em>{% trans "Optional" %}</em></span>
- {% endif %}
- </div>
- {% endif %}
- {% endif %}
- {% endfor %}
- </div>
-
- {# Form field rows #}
- <div class="row">
- {% for i in field %}
- {% if forloop.first %}
- <div class="col-xs-2" style="text-align: right; padding-left: 0px;">
- {% trans "Nr." %} {{ forloop.parentloop.counter }}
- </div>
- {% endif %}
-
- {% if not i.is_hidden %}
- <div class="{% cycle 'col-xs-3' 'col-xs-2' %} {% if i.errors %}has-error{% endif %}" style="padding-left: 0px;">
- {% endif %}
-
- {# Field elements #}
- {% if i|is_checkbox %}
- {{ i|form_field_add_css:'checkbox' }}
- {% else %}
- {{i|form_field_add_css:'form-control'}}
- {% endif %}
-
- {% for error in i.errors %}
- <div {% if i.errors %}class="has-error has-feedback"{% endif %}>
- <span class="help-block">
- <p>{% trans error %}</p>
- </span>
- </div>
- {% endfor %}
-
- {% if not i.is_hidden %}
- </div>
- {% endif %}
- {% endfor %}
- </div>
-</div>
-{% endfor %}
+<div id="formset-exercise-{{exercise.id}}" class="mt-3">
+ <label class="control-label font-weight-bold">
+ {{exercise}}
+ </label>
+ {{ formset.management_form }}
+
+ {% for field in formset %}
+ {% crispy field helper %}
+ {% endfor %}
</div>
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 3321403a6..d7a58586e 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -39,7 +39,8 @@ from django.urls import reverse
from wger.exercises.models import Exercise
from wger.manager.forms import (
SetForm,
- SettingForm
+ SettingForm,
+ WorkoutLogFormHelper
)
from wger.manager.models import (
Day,
@@ -118,6 +119,7 @@ def create(request, day_pk):
context['day'] = day
context['max_sets'] = Set.MAX_SETS
context['formsets'] = formsets
+ context['helper'] = WorkoutLogFormHelper()
context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
return render(request, 'set/add.html', context)
@@ -135,11 +137,13 @@ def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):
fields=SETTING_FORMSET_FIELDS)
formset = SettingFormSet(queryset=Setting.objects.none(),
prefix='exercise{0}'.format(exercise_pk))
+ context = {'formset': formset,
+ 'helper': WorkoutLogFormHelper(),
+ 'exercise': exercise}
return render(request,
"set/formset.html",
- {'formset': formset,
- 'exercise': exercise})
+ context)
@login_required
@@ -215,4 +219,5 @@ def edit(request, pk):
# Other context we need
context = {}
context['formsets'] = formsets
+ context['helper'] = WorkoutLogFormHelper()
return render(request, 'set/edit.html', context)