Self hosted FLOSS fitness/workout, nutrition and weight tracker
Adds latest weight details to overview
Yuyu Aung05f2792cf476
diff --git a/wger/weight/templates/weight_overview.html b/wger/weight/templates/weight_overview.htmlindex d5ad6e0fc..eb5c42e9c 100644--- a/wger/weight/templates/weight_overview.html+++ b/wger/weight/templates/weight_overview.html@@ -38,6 +38,24 @@ $(document).ready(function () {<div id="weight_diagram"></div>{% if is_owner %}+{% if last_five_weight_entries_details %}+<table border="1" style="width:100%">+ <tr>+ <th>Date</th>+ <th>Weight</th>+ <th>Change</th>+ <th>Days</th>+ </tr>+ {% for entry_detail in last_five_weight_entries_details %}+ <tr><td>{{ entry_detail.0.date }}</td>+ <td>{{ entry_detail.0.weight }}</td>+ <td>{{ entry_detail.1 }}</td>+ <td>{{ entry_detail.2 }}</td>+ </tr>+ {% endfor %}+</table>+{% endif %}+<br/><p><a href="{% url 'weight:add' %}"{% auto_link_css flavour "wger-modal-dialog" %}diff --git a/wger/weight/views.py b/wger/weight/views.pyindex 8348f2311..8ca31d685 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -150,9 +150,29 @@ def overview(request, username=None):'month': max_date.month,'day': max_date.day}+ last_five_weight_entries = WeightEntry.objects.filter(user=user).order_by('-date')[:5]+ last_five_weight_entries_details = []++ if last_five_weight_entries:+ i = 0++ while (i != len(last_five_weight_entries)-1):+ curr_entry = last_five_weight_entries[i]+ prev_entry = last_five_weight_entries[i+1]+ weight_diff = curr_entry.weight - prev_entry.weight+ if weight_diff > 0:+ weight_diff = '+'+str(weight_diff)+ day_diff = (curr_entry.date - prev_entry.date).days+ last_five_weight_entries_details.append((curr_entry, weight_diff, day_diff))+ i += 1++ curr_entry = last_five_weight_entries[i]+ last_five_weight_entries_details.append((curr_entry,'-/-', '-/-'))+template_data['is_owner'] = is_ownertemplate_data['owner_user'] = usertemplate_data['show_shariff'] = is_owner+ template_data['last_five_weight_entries_details'] = last_five_weight_entries_detailsreturn render(request, 'weight_overview.html', template_data)