mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add nutritions output

Browse Source
This commit is contained in:
Sebastian Markgraf
2020-10-18 17:31:56 +02:00
parent 7a89015ac5
commit 31dabd4757
1 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
cookbook/templates/recipe_view.html
View File

@@ -96,7 +96,8 @@
{% endif %} {% endif %}
<div class="row"> <div class="row">
<div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2" v-if="recipe && has_ingredients"> <!-- TODO duplicate code remove --> <div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2" v-if="recipe && has_ingredients">
<!-- TODO duplicate code remove -->
<div class="card border-primary"> <div class="card border-primary">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
@@ -171,7 +172,9 @@
</td> </td>
<td style="vertical-align: middle!important;"> <td style="vertical-align: middle!important;">
<template v-if="i.note"> <template v-if="i.note">
<b-button v-b-popover.hover="i.note" class="btn btn-sm d-print-none"><i class="fas fa-info"></i></b-button> <b-button v-b-popover.hover="i.note"
class="btn btn-sm d-print-none"><i
class="fas fa-info"></i></b-button>
<div class="d-none d-print-block"> <div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> [[i.note]] <i class="far fa-comment-alt"></i> [[i.note]]
@@ -206,14 +209,32 @@
</div> </div>
{% if recipe.nutrition %} {% if recipe.nutrition %}
<div> <div class="row mt-5">
<hr> <div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2">
<h3>{% trans 'Nutrition' %}</h3> <div class="card border-primary">
{% for n in recipe.nutrition.nutritions.all %} <div class="card-body">
<div>{{ n.type.type }}: {{ n.value|floatformat:2 }} {{ n.type.unit.short }}</div> <h4 class="card-title">{% trans 'Nutrition' %}</h4>
{% endfor %} <table class="table table-sm">
</div> {% for n in recipe.nutrition.nutritions.all %}
{% endif %} <tr>
<td style="padding-top: 8px!important; ">
<b>{{ n.type.type }}</b>
</td>
<td style="text-align: right">{{ n.value|floatformat:2 }}</td>
<td>{{ n.type.unit.short }}</td>
</tr>
{% endfor %}
<tr>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
</div>
</div>
</div>
{% endif %}
<div v-if="recipe !== undefined && recipe.steps.length > 0"> <div v-if="recipe !== undefined && recipe.steps.length > 0">
@@ -254,7 +275,8 @@
style="margin-top: 1vh"> style="margin-top: 1vh">
<div class="col-md-6"> <div class="col-md-6">
<table class="table table-sm"> <table class="table table-sm">
<template v-for="i in recipe.steps[{{ forloop.counter0 }}].ingredients"> <!-- TODO duplicate code remove --> <template v-for="i in recipe.steps[{{ forloop.counter0 }}].ingredients">
<!-- TODO duplicate code remove -->
<template v-if="i.is_header"> <template v-if="i.is_header">
<tr> <tr>
@@ -300,7 +322,9 @@
</td> </td>
<td style="vertical-align: middle!important;"> <td style="vertical-align: middle!important;">
<template v-if="i.note"> <template v-if="i.note">
<b-button v-b-popover.hover="i.note" class="btn btn-sm d-print-none"><i class="fas fa-info"></i></b-button> <b-button v-b-popover.hover="i.note"
class="btn btn-sm d-print-none"><i
class="fas fa-info"></i></b-button>
<div class="d-none d-print-block"> <div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> [[i.note]] <i class="far fa-comment-alt"></i> [[i.note]]
</div> </div>
@@ -492,25 +516,25 @@
if (step.time !== 0) { if (step.time !== 0) {
this.has_times = true this.has_times = true
} }
this.$set(step, 'time_finished', undefined) this.$set(step, 'time_finished', undefined);
for (let i of step.ingredients) { for (let i of step.ingredients) {
this.$set(i, 'checked', false) this.$set(i, 'checked', false)
} }
} }
}).catch((err) => { }).catch((err) => {
this.error = err.data this.error = err.data;
this.loading = false this.loading = false;
console.log(err) console.log(err)
}) })
}, },
roundDecimals: function (num) { roundDecimals: function (num) {
let decimals = {% if request.user.userpreference.ingredient_decimals %} let decimals = {% if request.user.userpreference.ingredient_decimals %}
{{ request.user.userpreference.ingredient_decimals }} {% else %} 2 {% endif %} {{ request.user.userpreference.ingredient_decimals }} {% else %} 2; {% endif %}
return +(Math.round(num + `e+${decimals}`) + `e-${decimals}`); return +(Math.round(num + `e+${decimals}`) + `e-${decimals}`);
}, },
updateTimes: function (step) { updateTimes: function (step) {
let time_diff_first = 0 let time_diff_first = 0;
for (let s of this.recipe.steps) { for (let s of this.recipe.steps) {
if (this.recipe.steps.indexOf(s) < this.recipe.steps.indexOf(step)) { if (this.recipe.steps.indexOf(s) < this.recipe.steps.indexOf(step)) {
time_diff_first += s.time time_diff_first += s.time
@@ -519,7 +543,7 @@
this.recipe.steps[0].time_finished = moment(step.time_finished).subtract(time_diff_first, 'minutes').format(moment.HTML5_FMT.DATETIME_LOCAL); this.recipe.steps[0].time_finished = moment(step.time_finished).subtract(time_diff_first, 'minutes').format(moment.HTML5_FMT.DATETIME_LOCAL);
let time_diff = 0 let time_diff = 0;
for (let s of this.recipe.steps) { for (let s of this.recipe.steps) {
s.time_finished = moment(this.recipe.steps[0].time_finished).add(time_diff, 'minutes').format(moment.HTML5_FMT.DATETIME_LOCAL); s.time_finished = moment(this.recipe.steps[0].time_finished).add(time_diff, 'minutes').format(moment.HTML5_FMT.DATETIME_LOCAL);
time_diff += s.time time_diff += s.time