Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add the unit field to log form

Roland Geidere3f8f6806852
diff --git a/wger/core/static/css/workout-manager.css b/wger/core/static/css/workout-manager.css
index 18a3e7b14..699e3c8fd 100644
--- a/wger/core/static/css/workout-manager.css
+++ b/wger/core/static/css/workout-manager.css
@@ -154,11 +154,7 @@ div.muscle-background
* Workout log entry page needs the horizontal space
*/
.workout-log-table .narrow-input {
- width: 4em;
-}
-
-.workout-log-table .form-control {
- display: inline;
+ width: 9em;
}
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index 872c6bd01..d8f9aeb2c 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -26,7 +26,7 @@ $(document).ready(function () {
{% endfor %}
- <div style="overflow-x: auto;margin-bottom: 1em;">
+ <div style="margin-bottom: 1em;">
{% for set in day.set_set.select_related %}
{% for exercise in set.exercises.select_related %}
{% with value=exercises|get_item:exercise.id %}
@@ -39,23 +39,47 @@ $(document).ready(function () {
<div class="col-md-9">
<table class="table">
<tr>
+ <td>{% trans "Amount" %}</td>
+ <td>{% trans "Unit" %}</td>
+ <td>
+ {% trans "Weight" %}
+ </td>
+ </tr>
{% for form in value.forms %}
+ <tr>
<td>
- {{ form.reps|form_field_add_css:'form-control narrow-input' }}
+ <div {% if form.reps.errors %}class="has-error"{% endif %}>
+ {{ form.reps|form_field_add_css:'form-control narrow-input' }}
+ <span class="help-block">
+ {% for error in form.reps.errors %}
+ <p>{% trans error %}</p>
+ {% endfor %}
+ </span>
+ </div>
</td>
<td>
- {{ form.weight|form_field_add_css:'form-control narrow-input' }}
+ <div {% if form.unit.errors %}class="has-error"{% endif %}>
+ {{ form.unit|form_field_add_css:'form-control narrow-input' }}
+ <span class="help-block">
+ {% for error in form.unit.errors %}
+ <p>{% trans error %}</p>
+ {% endfor %}
+ </span>
+ </div>
</td>
- {% endfor %}
- </tr>
- <tr>
- {% for form in value.forms %}
- <td>{% trans "Reps" %}</td>
<td>
- {% trans_weight_unit 'kg' user %}
+ <div {% if form.weight.errors %}class="has-error"{% endif %}>
+ {{ form.weight|form_field_add_css:'form-control narrow-input' }}
+ <span class="help-block">
+ {% for error in form.weight.errors %}
+ <p>{% trans error %}</p>
+ {% endfor %}
+ </span>
+ </div>
</td>
- {% endfor %}
</tr>
+ {% endfor %}
+
</table>
</div>
</div>