Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into nutrition-diary

Roland Geiderc270e1d667f9
diff --cc wger/nutrition/models.py
index 00ca54d2b,f472fd38c..268c31818
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@@ -202,55 -199,9 +202,55 @@@ 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'):
+ # 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.date()})
+ result.append(tmp)
+
+ return result
+
+ def get_log_entries(self, date=None):
+ '''
+ 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,
+ 'carbohydrates': 0,
+ 'carbohydrates_sugar': 0,
+ 'fat': 0,
+ 'fat_saturated': 0,
+ 'fibres': 0,
+ 'sodium': 0}
+
+ # Perform the sums
+ 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]
+ return result
+
@python_2_unicode_compatible
- class Ingredient(AbstractLicenseModel, models.Model):
+ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''
An ingredient, with some approximate nutrition values
'''