Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use a list in get_log_overview
Roland Geiderd792e5c43a2b
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex e4d751d00..8dc51f685 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -206,9 +206,13 @@ class NutritionPlan(models.Model):'''Returns an overview for all logs available for this plan'''- result = OrderedDict()+ result = []for date in self.logitem_set.datetimes('datetime', 'day', order='DESC'):- result[date] = self.get_log_summary(date=date)+ # TODO: in python 3.5 this can be simplified as z = {**x, **y}+ tmp = self.get_log_summary(date=date).copy()+ tmp.update({'date': date})+ result.append(tmp)+return resultdef get_log_entries(self, date=None):diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex 5ecc8be3e..4f243bcab 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -56,11 +56,11 @@ def overview(request, pk):log_data = []planned_calories = plan.get_nutritional_values()['total']['energy']- for date, items in plan.get_log_overview().items():- log_data.append({'date': date,+ for item in plan.get_log_overview():+ log_data.append({'date': item['date'],'planned_calories': planned_calories,- 'logged_calories': items['energy'],- 'difference': items['energy'] - planned_calories})+ 'logged_calories': item['energy'],+ 'difference': item['energy'] - planned_calories})context = {'plan': plan,'show_shariff': is_owner,diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex 6e10c93ba..91e0e52c5 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -139,13 +139,13 @@ def view(request, id):# Process and show the last 5 diary entrieslog_data = []planned_calories = plan.get_nutritional_values()['total']['energy']- for date, items in plan.get_log_overview().items():+ for item in plan.get_log_overview():if len(log_data) == 5:break- log_data.append({'date': date,+ log_data.append({'date': item['date'],'planned_calories': planned_calories,- 'logged_calories': items['energy'],- 'difference': items['energy'] - planned_calories})+ 'logged_calories': item['energy'],+ 'difference': item['energy'] - planned_calories})# Load the language and pass it to the templatelanguage = load_language()