Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Split overview and detail views for diary entries

Roland Geider272d84d7b6fc
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 400838b7c..97a0d1d01 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -200,6 +200,15 @@ class NutritionPlan(models.Model):
else:
return 4
+ def get_log_overview(self):
+ '''
+ Returns an overview for all logs available for this plan
+ '''
+ result = {}
+ for date in self.logitem_set.datetimes('datetime', 'day', order='DESC'):
+ result[date] = self.get_logged_values(date=date)
+ return result
+
def get_logged_values(self, date=None):
'''
Sums the nutritional info of the items logged for the given date
diff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.html
new file mode 100644
index 000000000..d661bc576
--- /dev/null
+++ b/wger/nutrition/templates/log/detail.html
@@ -0,0 +1,91 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}
+
+{# #}
+{# Title #}
+{# #}
+{% block title %}{% trans "Nutrition diary" %} - {{ date }}{% endblock %}
+
+
+
+{# #}
+{# Breadcrumbs #}
+{# #}
+{% block breadcrumbs %}
+ {{ block.super }}
+
+ {% breadcrumb "Nutrition plans" "nutrition:plan:overview" %}
+ {% breadcrumb plan plan.get_absolute_url %}
+ {% breadcrumb "Nutrition diary" "nutrition:log:overview" plan.pk %}
+ {% breadcrumb date|date "nutrition:log:detail" plan.pk date.year date.month date.day %}
+{% endblock %}
+
+
+{# #}
+{# Content #}
+{# #}
+{% block content %}
+ <table class="table table-condensed">
+ <thead>
+ <tr>
+ <th>{% trans "Macronutrients" %}</th>
+ <th class="align-right">{% trans "Planned" %}</th>
+ <th class="align-right">{% trans "Logged" %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{% trans "Energy" %}</td>
+ <td class="align-right">{{ nutritional_data.total.energy|floatformat }} {% trans "kcal" %}</td>
+ <td class="align-right">{{ log_values.energy|floatformat }} {% trans "kcal" %}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Protein" %}</td>
+ <td class="align-right">{{ nutritional_data.total.protein|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.protein|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Carbohydrates" %}</td>
+ <td class="align-right">{{ nutritional_data.total.carbohydrates|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.carbohydrates|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ <tr>
+ <td style="padding-left: 2em;">{% trans "Sugar content in carbohydrates" %}</td>
+ <td class="align-right">{{ nutritional_data.total.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Fat" %}</td>
+ <td class="align-right">{{ nutritional_data.total.fat|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.fat|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ <tr>
+ <td style="padding-left: 2em;">{% trans "Saturated fat content in fats" %}</td>
+ <td class="align-right">{{ nutritional_data.total.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+
+
+ <tr>
+ <th colspan="3">{% trans "Others" %}</th>
+ </tr>
+ <tr>
+ <td>{% trans "Fibres" %}</td>
+ <td class="align-right">{{ nutritional_data.total.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Sodium" %}</td>
+ <td class="align-right">{{ nutritional_data.total.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ <td class="align-right">{{ log_values.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
+ </tr>
+ </tbody>
+</table>
+{% endblock %}
+
+
+{# #}
+{# Side bar #}
+{# #}
+{% block sidebar%}
+{% endblock %}
diff --git a/wger/nutrition/templates/log/overview.html b/wger/nutrition/templates/log/overview.html
index a7ac187aa..84af74eb8 100644
--- a/wger/nutrition/templates/log/overview.html
+++ b/wger/nutrition/templates/log/overview.html
@@ -4,7 +4,7 @@
{# #}
{# Title #}
{# #}
-{% block title %}{% trans "Nutrition diary" %} - {{ date }}{% endblock %}
+{% block title %}{% trans "Nutrition diary" %}{% endblock %}
@@ -27,62 +27,29 @@
<table class="table table-condensed">
<thead>
<tr>
- <th>{% trans "Macronutrients" %}</th>
+ <th>{% trans "Date" %}</th>
<th class="align-right">{% trans "Planned" %}</th>
<th class="align-right">{% trans "Logged" %}</th>
</tr>
</thead>
<tbody>
- <tr>
- <td>{% trans "Energy" %}</td>
- <td class="align-right">{{ nutritional_data.total.energy|floatformat }} {% trans "kcal" %}</td>
- <td class="align-right">{{ log_values.energy|floatformat }} {% trans "kcal" %}</td>
- </tr>
- <tr>
- <td>{% trans "Protein" %}</td>
- <td class="align-right">{{ nutritional_data.total.protein|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.protein|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
- <tr>
- <td>{% trans "Carbohydrates" %}</td>
- <td class="align-right">{{ nutritional_data.total.carbohydrates|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.carbohydrates|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
- <tr>
- <td style="padding-left: 2em;">{% trans "Sugar content in carbohydrates" %}</td>
- <td class="align-right">{{ nutritional_data.total.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.carbohydrates_sugar|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
- <tr>
- <td>{% trans "Fat" %}</td>
- <td class="align-right">{{ nutritional_data.total.fat|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.fat|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
- <tr>
- <td style="padding-left: 2em;">{% trans "Saturated fat content in fats" %}</td>
- <td class="align-right">{{ nutritional_data.total.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
-
-
- <tr>
- <th colspan="3">{% trans "Others" %}</th>
- </tr>
- <tr>
- <td>{% trans "Fibres" %}</td>
- <td class="align-right">{{ nutritional_data.total.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.fibres|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
- <tr>
- <td>{% trans "Sodium" %}</td>
- <td class="align-right">{{ nutritional_data.total.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- <td class="align-right">{{ log_values.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
- </tr>
+ {% for date, items in logs.items %}
+ <tr>
+ <td>
+ <a href="{% url 'nutrition:log:detail' plan.pk date.year date.month date.day %}">
+ {{ date|date }}
+ </a>
+ </td>
+ <td class="align-right">
+ {{ nutritional_data.total.energy|floatformat }} {% trans "kcal" %}
+ </td>
+ <td class="align-right">
+ {{ items.energy }} {% trans "kcal" %}
+ </td>
+ </tr>
+ {% endfor %}
</tbody>
</table>
- {% for log in logs %}
- {{ log }}
- {% endfor %}
{% endblock %}
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index a61ab7b6a..dbc8f449a 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -183,12 +183,12 @@ patterns_calories = [
# sub patterns for calories dairy
patterns_diary = [
- url(r'^overview/(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
- log.overview,
- name='overview'),
url(r'^overview/(?P<pk>\d+)$',
log.overview,
name='overview'),
+ url(r'^detail/(?P<pk>\d+)/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
+ log.detail,
+ name='detail'),
]
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index df462da78..d3f0f317e 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -17,22 +17,45 @@
import datetime
import logging
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect
from django.shortcuts import render, get_object_or_404
from django.contrib.auth.decorators import login_required
-from wger.nutrition.models import LogItem, NutritionPlan
+from wger.nutrition.models import NutritionPlan
logger = logging.getLogger(__name__)
@login_required
-def overview(request, pk, date=None):
+def overview(request, pk):
+ '''
+ Shows an overview of diary entries for the given plan
+ '''
+ context = {}
+ plan = get_object_or_404(NutritionPlan, pk=pk)
+ context['plan'] = plan
+ context['logs'] = plan.get_log_overview()
+ context['nutritional_data'] = plan.get_nutritional_values()
+
+ return render(request, 'log/overview.html', context)
+
+
+@login_required
+def detail(request, pk, year, month, day):
'''
Shows an overview of the log for the given date
'''
context = {}
- if not date:
+ try:
+ date = datetime.date(year=int(year), month=int(month), day=int(day))
+ except ValueError:
date = datetime.date.today()
+ return HttpResponseRedirect(reverse('nutrition:log:detail',
+ kwargs={'pk': pk,
+ 'year': date.year,
+ 'month': date.month,
+ 'day': date.day}))
plan = get_object_or_404(NutritionPlan, pk=pk)
context['plan'] = plan
@@ -40,4 +63,4 @@ def overview(request, pk, date=None):
context['log_values'] = plan.get_logged_values(date)
context['nutritional_data'] = plan.get_nutritional_values()
- return render(request, 'log/overview.html', context)
+ return render(request, 'log/detail.html', context)