Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Now uses first() instead of [0]. Updated template to better reflect values.

purplebirdae8c3314e77d
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index e154391ba..d16329a3b 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -103,7 +103,7 @@ class NutritionPlan(models.Model):
'''
return reverse('nutrition:plan:view', kwargs={'id': self.id})
- def get_nutritional_values(self):
+ def get_nutritional_values(self, closest_weight_entry = None):
'''
Sums the nutritional info of all items in the plan
'''
@@ -122,7 +122,7 @@ class NutritionPlan(models.Model):
'fat': 0},
'per_kg': {'protein': 0,
'carbohydrates': 0,
- 'fat': 0}
+ 'fat': 0},
}
# Energy
@@ -140,19 +140,9 @@ class NutritionPlan(models.Model):
result['total'][key] * ENERGY_FACTOR[key][unit] / energy * 100
# Per body weight
- if self.user.userprofile.weight:
- # Determine closest entry by date
- target = self.creation_date
- closest_entry_gte = WeightEntry.objects.filter(user = self.user) \
- .filter(date__gte = target).order_by('date')[0]
- closest_entry_lte = WeightEntry.objects.filter(user = self.user) \
- .filter(date__lte = target).order_by('-date')[0]
- if abs(closest_entry_gte.date - target) < abs(closest_entry_lte.date - target):
- weight = Decimal(closest_entry_gte.weight)
- else:
- weight = Decimal(closest_entry_lte.weight)
+ if closest_weight_entry != None:
for key in result['per_kg'].keys():
- result['per_kg'][key] = result['total'][key] / weight
+ result['per_kg'][key] = result['total'][key] / Decimal(closest_weight_entry.weight)
# Only 2 decimal places, anything else doesn't make sense
for key in result.keys():
@@ -160,6 +150,25 @@ class NutritionPlan(models.Model):
result[key][i] = Decimal(result[key][i]).quantize(TWOPLACES)
return result
+
+ def get_closest_weight_entry(self):
+ '''
+ Returns the closest weight entry for the nutrition plan.
+ Returns None if there are no entries.
+ '''
+ entry = None
+ if self.user.userprofile.weight:
+ target = self.creation_date
+ closest_entry_gte = WeightEntry.objects.filter(user = self.user) \
+ .filter(date__gte = target).order_by('date').first()
+ closest_entry_lte = WeightEntry.objects.filter(user = self.user) \
+ .filter(date__lte = target).order_by('-date').first()
+ if abs(closest_entry_gte.date - target) < abs(closest_entry_lte.date - target):
+ entry = closest_entry_gte
+ else:
+ entry = closest_entry_lte
+ return entry
+
def get_owner_object(self):
'''
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index e6384c518..5ee1fe18e 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -186,6 +186,7 @@ function custom_modal_init()
<h4>{% trans "Nutritional data" %}</h4>
+<h5>{% trans "Based on the weight entry dated" %} {{closest_weight_entry.date}} ({{closest_weight_entry.weight}})</h5>
<table class="table table-condensed">
<thead>
<tr>
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index e4c194e01..335fa2f48 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -144,7 +144,9 @@ def view(request, id):
# Get the nutritional info
template_data['plan'] = plan
- template_data['nutritional_data'] = plan.get_nutritional_values()
+ closest_weight_entry = plan.get_closest_weight_entry()
+ template_data['closest_weight_entry'] = closest_weight_entry
+ template_data['nutritional_data'] = plan.get_nutritional_values(closest_weight_entry)
# Tokens for the links
template_data['uid'] = uid