Self hosted FLOSS fitness/workout, nutrition and weight tracker
more style fixes
Noah Pinterec296f9dc4fb
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 114c9b622..fa8b15f3e 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -513,6 +513,9 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):return Falsedef _get_energy_kilojoule(self):+ """+ returns kilojoules for current ingredient, 0 if energy is uninitialized+ """if self.energy:return self.energy * 4184else:diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex d9be41baf..b73779f60 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -264,6 +264,9 @@ class IngredientValuesTestCase(WgerTestCase):'carbohydrates': '0.14'})def verify_kilojoules(self):+ """+ Verify kilojoules as propety of ingredient --> (ingredient.energy * 4184)+ """ingredient1 = Ingredient.objects.get(pk=1)self.assertEqual(ingredient1.energy_kilojoule, (ingredient1.energy * 4184))self.assertEqual(ingredient1.energy_kilojoule, 736384)