Self hosted FLOSS fitness/workout, nutrition and weight tracker
Draw current charts for nutrition and weight
Roland Geidera9cf1dae819b
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.htmlindex 3f6cd352b..e27b6015d 100644--- a/wger/core/templates/index.html+++ b/wger/core/templates/index.html@@ -7,6 +7,12 @@{# Header #}{# #}{% block header %}+<script src="{% static 'js/weight.js' %}"></script>+<script>+$(document).ready(function () {+ draw_nutrition_diary_chart({{ plan.pk }});+});+</script>{% endblock %}@@ -78,17 +84,6 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str{% endfor %}</table>- {% if current_workout.day_set.all %}- <p><a href="#" id="logging-popup-link" data-toggle="modal" data-target="#calendar-day-select-popup">{% trans "Add new log" %}</a></p>- {% endif %}-- {% if schedule %}- <p>- → {% trans "This workout is part of a schedule:" %}- <a href="{{schedule.get_absolute_url}}">{{schedule.name}}</a>- </p>- {% endif %}-{% else %} {# no workout #}<a href="{% url 'manager:workout:add' %}" class="btn btn-block btn-default">{% trans "No workouts found." %} {% trans "Add one now." %}@@ -181,18 +176,46 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str<div class="row"><div class="col-sm-4">- <p>- <a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">{% trans "Add workout" %}</a>- </p>+ {% if schedule %}+ <p>+ → {% trans "This workout is part of a schedule:" %}+ <a href="{{schedule.get_absolute_url}}">{{schedule.name}}</a>+ </p>+ {% endif %}+ <p><em>{% blocktrans %}The current workout is selected from your active schedule+or, if you don't have one, simply by date.{% endblocktrans %}</em></p>+ </div>+ <div class="col-sm-4">+ <div id="nutrition_diary_chart"></div>+ </div>+ <div class="col-sm-4">+ <div id="current-username" data-current-username="{{ owner_user.username }}"></div>+ <div id="weight_diagram"></div>+ </div>+</div>++<div class="row">+ <div class="col-sm-4">+ {% if current_workout.day_set.all %}+ <p>+ <a href="#" id="logging-popup-link" data-toggle="modal" data-target="#calendar-day-select-popup" class="btn btn-success btn-sm">+ {% trans "Add new log" %}+ </a>+ </p>+ {% endif %}</div><div class="col-sm-4"><p>- <a href="{% url 'nutrition:plan:add' %}" class="btn btn-success btn-sm">{% trans "Add nutrition plan" %}</a>+ <a href="{% url 'nutrition:plan:add' %}" class="btn btn-success btn-sm">+ {% trans "Add nutrition plan" %}+ </a></p></div><div class="col-sm-4"><p>- <a href="{% url 'weight:add' %}" class="btn btn-success btn-sm">{% trans "Add weight entry" %}</a>+ <a href="{% url 'weight:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ {% trans "Add weight entry" %}+ </a></p></div></div>diff --git a/wger/nutrition/static/js/nutrition.js b/wger/nutrition/static/js/nutrition.jsindex a56d09f39..e79e899b6 100644--- a/wger/nutrition/static/js/nutrition.js+++ b/wger/nutrition/static/js/nutrition.js@@ -121,7 +121,6 @@ function draw_nutrition_diary_chart(plan_pk) {top: 10,left: 30,right: 10,- height: 200,baselines: [{value: nutritional_values.total.energy,label: 'Planned calories (' + nutritional_values.total.energy + 'kcal)'}],target: '#nutrition_diary_chart',diff --git a/wger/weight/static/js/weight.js b/wger/weight/static/js/weight.jsindex 9dc580a44..95e0c772a 100644--- a/wger/weight/static/js/weight.js+++ b/wger/weight/static/js/weight.js@@ -25,7 +25,6 @@ $(document).ready(function () {top: 10,left: 30,right: 10,- height: 300,show_secondary_x_label: true,xax_count: 10,target: '#weight_diagram',