diff --git a/src/templates/recipe-nutrition-facts.twig b/src/templates/recipe-nutrition-facts.twig index 66269bc..5e20373 100644 --- a/src/templates/recipe-nutrition-facts.twig +++ b/src/templates/recipe-nutrition-facts.twig @@ -108,8 +108,11 @@ } -{% macro percentage(numerator, denomoninator) %} - {% set result = (numerator * 100) / denomoninator %} +{% macro percentage(numerator, denomoninator, serves = 1) %} + {% if serves is empty %} + {% set serves = 1 %} + {% endif %} + {% set result = ((numerator / serves) * 100) / denomoninator %} {{ result | number_format(0) ~ '%' }} {% endmacro %} {% from _self import percentage %} @@ -151,7 +154,7 @@ {% if value.fatContent | length %} Total Fat: {{ servesValue(value.fatContent, value.serves) ~ 'g' }} - {{ percentage(value.fatContent, rda.fatContent) }} + {{ percentage(value.fatContent, rda.fatContent, value.serves) }} {% endif %} {% if value.saturatedFatContent | length %} @@ -174,40 +177,41 @@ Cholesterol: {{ servesValue(value.cholesterolContent, value.serves) ~ 'mg' }} - {{ percentage(value.cholesterolContent, rda.cholesterolContent) }} + {{ percentage(value.cholesterolContent, rda.cholesterolContent, value.serves) }} {% endif %} {% if value.sodiumContent | length %} Sodium: {{ servesValue(value.sodiumContent, value.serves) ~ 'mg' }} - {{ percentage(value.sodiumContent, rda.sodiumContent) }} + {{ percentage(value.sodiumContent, rda.sodiumContent, value.serves) }} {% endif %} {% if value.carbohydrateContent | length %} Total Carbohydrate: {{ servesValue(value.carbohydrateContent, value.serves) ~ 'g' }} - {{ percentage(value.carbohydrateContent, rda.carbohydrateContent) }} + {{ percentage(value.carbohydrateContent, rda.carbohydrateContent, value.serves) }} + {% endif %} {% if value.fiberContent | length %} Dietary Fiber: {{ servesValue(value.fiberContent, value.serves) ~ 'g' }} - {{ percentage(value.fiberContent, rda.fiberContent) }} + {{ percentage(value.fiberContent, rda.fiberContent, value.serves) }} {% endif %} {% if value.sugarContent | length %} Sugars: {{ servesValue(value.sugarContent, value.serves) ~ 'g' }} - {{ percentage(value.sugarContent, rda.sugarContent) }} + {{ percentage(value.sugarContent, rda.sugarContent, value.serves) }} {% endif %} {% if value.proteinContent | length %} Protein: {{ servesValue(value.proteinContent, value.serves) ~ 'g' }} - {{ percentage(value.proteinContent, rda.proteinContent) }} + {{ percentage(value.proteinContent, rda.proteinContent, value.serves) }} {% endif %}