Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Refactor some nutrition diary for plans

Roland Geiderf2bf7a5829c4
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 97a0d1d01..a7b9be776 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -206,16 +206,25 @@ class NutritionPlan(models.Model):
'''
result = {}
for date in self.logitem_set.datetimes('datetime', 'day', order='DESC'):
- result[date] = self.get_logged_values(date=date)
+ result[date] = self.get_log_summary(date=date)
return result
- def get_logged_values(self, date=None):
+ def get_log_entries(self, date=None):
'''
- Sums the nutritional info of the items logged for the given date
+ Convenience function that returns the log entries for a given date
'''
if not date:
date = datetime.date.today()
+ # TODO: in django 1.9 use __date=date here
+ return self.logitem_set.filter(datetime__year=date.year,
+ datetime__month=date.month,
+ datetime__day=date.day).select_related()
+
+ def get_log_summary(self, date=None):
+ '''
+ Sums the nutritional info of the items logged for the given date
+ '''
use_metric = self.user.userprofile.use_metric
result = {'energy': 0,
'protein': 0,
@@ -227,10 +236,7 @@ class NutritionPlan(models.Model):
'sodium': 0}
# Perform the sums
- # TODO: in django 1.9 use __date=date here
- for item in self.logitem_set.filter(datetime__year=date.year,
- datetime__month=date.month,
- datetime__day=date.day).select_related():
+ for item in self.get_log_entries(date):
values = item.get_nutritional_values(use_metric=use_metric)
for key in result.keys():
result[key] += values[key]
diff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.html
index d661bc576..e024de9dc 100644
--- a/wger/nutrition/templates/log/detail.html
+++ b/wger/nutrition/templates/log/detail.html
@@ -37,32 +37,32 @@
<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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.fat_saturated|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
@@ -72,15 +72,44 @@
<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>
+ <td class="align-right">{{ log_summary.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>
+ <td class="align-right">{{ log_summary.sodium|floatformat }} {% trans_weight_unit 'g' owner_user %}</td>
</tr>
</tbody>
</table>
+
+<h3>{% trans "Entries" %}</h3>
+<table class="table table-condensed">
+ <thead>
+ <tr>
+ <th>{% trans "Ingredient" %}</th>
+ <th class="align-right">{% trans "Amount" %}</th>
+ <th class="align-right">{% trans "Energy" %}</th>
+ </tr>
+ </thead>
+ <tbody>
+{% for entry in log_entries %}
+ <tr>
+ <td>{{ entry.ingredient }}</td>
+ <td class="align-right">
+ {{ entry.amount }}
+ {% if entry.weight_unit %}
+ {{ entry.weight_unit }}
+ {% else %}
+ {% trans "g" %}
+ {% endif %}
+ </td>
+ <td class="align-right">
+ {{ entry.get_nutritional_values.energy }} {% trans "kcal" %}
+ </td>
+ </tr>
+{% endfor %}
+ </tbody>
+</table>
{% endblock %}
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index c75125aaf..73b1f7c5e 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -115,7 +115,7 @@ class NutritionDiaryTestCase(WorkoutManagerTestCase):
plan = NutritionPlan.objects.get(pk=1)
# No entries for date
- self.assertEqual(plan.get_logged_values(datetime.date(2016, 1, 12)),
+ self.assertEqual(plan.get_log_summary(datetime.date(2016, 1, 12)),
{'energy': 0,
'protein': 0,
'carbohydrates': 0,
@@ -126,7 +126,7 @@ class NutritionDiaryTestCase(WorkoutManagerTestCase):
'sodium': 0})
# Entries found
- self.assertEqual(plan.get_logged_values(datetime.date(2016, 5, 15)),
+ self.assertEqual(plan.get_log_summary(datetime.date(2016, 5, 15)),
{'energy': Decimal('653.80'),
'protein': Decimal('19.22'),
'carbohydrates': Decimal('109.99'),
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index 5402803d3..dce9317f9 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -46,10 +46,9 @@ def overview(request, pk):
if not is_owner and not user.userprofile.ro_access:
return HttpResponseForbidden()
- context = {}
- context['plan'] = plan
- context['logs'] = plan.get_log_overview()
- context['nutritional_data'] = plan.get_nutritional_values()
+ context = {'plan': plan,
+ 'logs': plan.get_log_overview(),
+ 'nutritional_data': plan.get_nutritional_values()}
return render(request, 'log/overview.html', context)
@@ -77,10 +76,10 @@ def detail(request, pk, year, month, day):
'month': date.month,
'day': date.day}))
- context = {}
- context['plan'] = plan
- context['date'] = date
- context['log_values'] = plan.get_logged_values(date)
- context['nutritional_data'] = plan.get_nutritional_values()
+ context = {'plan': plan,
+ 'date': date,
+ 'log_summary': plan.get_log_summary(date),
+ 'log_entries': plan.get_log_entries(date),
+ 'nutritional_data': plan.get_nutritional_values()}
return render(request, 'log/detail.html', context)