cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ingredient headers again

Browse Source
This commit is contained in:
vabene1111
2021-01-26 21:55:36 +01:00
parent 37008ef290
commit 5e53c66eaa
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/static/vue/js/recipe_view.js
View File

File diff suppressed because one or more lines are too long

59
vue/src/components/Ingredient.vue
View File

@ -1,34 +1,43 @@
<template> <template>
<tr @click="$emit('checked-state-changed', ingredient)"> <tr @click="$emit('checked-state-changed', ingredient)">
<td> <template v-if="ingredient.is_header">
<i class="far fa-check-circle text-success" v-if="ingredient.checked"></i> <td colspan="5">
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i> <b>{{ ingredient.note }}</b>
</td> </td>
<td> </template>
<span v-if="ingredient.amount !== 0">{{ calculateAmount(ingredient.amount) }}</span> <template v-else>
</td> <td>
<td> <i class="far fa-check-circle text-success" v-if="ingredient.checked"></i>
<span v-if="ingredient.unit !== null">{{ ingredient.unit.name }}</span> <i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td> </td>
<td> <td>
<template v-if="ingredient.food !== null"> <span v-if="ingredient.amount !== 0">{{ calculateAmount(ingredient.amount) }}</span>
<a :href="resolveDjangoUrl('view_recipe', ingredient.food.recipe)" v-if="ingredient.food.recipe !== null" </td>
target="_blank" rel="noopener noreferrer">{{ ingredient.food.name }}</a> <td>
<span v-if="ingredient.food.recipe === null">{{ ingredient.food.name }}</span> <span v-if="ingredient.unit !== null">{{ ingredient.unit.name }}</span>
</template> </td>
</td> <td>
<td> <template v-if="ingredient.food !== null">
<div v-if="ingredient.note"> <a :href="resolveDjangoUrl('view_recipe', ingredient.food.recipe)" v-if="ingredient.food.recipe !== null"
target="_blank" rel="noopener noreferrer">{{ ingredient.food.name }}</a>
<span v-if="ingredient.food.recipe === null">{{ ingredient.food.name }}</span>
</template>
</td>
<td>
<div v-if="ingredient.note">
<span v-b-popover.hover="ingredient.note" <span v-b-popover.hover="ingredient.note"
class="d-print-none"> <i class="far fa-comment"></i> class="d-print-none"> <i class="far fa-comment"></i>
</span> </span>
<div class="d-none d-print-block"> <div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> {{ ingredient.note }} <i class="far fa-comment-alt"></i> {{ ingredient.note }}
</div> </div>
</div> </div>
</td> </td>
</tr> </template>
</tr>
</template> </template>
<script> <script>