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

ingredient linking fixed + tests fixed

Browse Source
This commit is contained in:
vabene1111
2021-01-19 21:26:20 +01:00
parent 523a2b41d1
commit b563447674
5 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,35 +1,39 @@
<template>
<tr @click="$emit('checked-state-changed', ingredient)">
<td>
<i class="far fa-check-circle text-success" v-if="ingredient.checked"></i>
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td>
<td>
<span v-if="ingredient.amount !== 0">{{ calculateAmount(ingredient.amount) }}</span>
</td>
<td>
<span v-if="ingredient.unit !== null">{{ ingredient.unit.name }}</span>
</td>
<td>
<span v-if="ingredient.food !== null">{{ ingredient.food.name }}</span>
</td>
<td>
<div v-if="ingredient.note">
<tr @click="$emit('checked-state-changed', ingredient)">
<td>
<i class="far fa-check-circle text-success" v-if="ingredient.checked"></i>
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td>
<td>
<span v-if="ingredient.amount !== 0">{{ calculateAmount(ingredient.amount) }}</span>
</td>
<td>
<span v-if="ingredient.unit !== null">{{ ingredient.unit.name }}</span>
</td>
<td>
<template v-if="ingredient.food !== null">
<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"
class="d-print-none"> <i class="far fa-comment"></i>
class="d-print-none"> <i class="far fa-comment"></i>
</span>
<div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> {{ ingredient.note }}
</div>
<div class="d-none d-print-block">
<i class="far fa-comment-alt"></i> {{ ingredient.note }}
</div>
</td>
</tr>
</div>
</td>
</tr>
</template>
<script>
import {calculateAmount} from "@/utils/utils";
import {calculateAmount, ResolveUrlMixin} from "@/utils/utils";
export default {
name: 'Ingredient',
@ -40,6 +44,9 @@ export default {
default: 1,
}
},
mixins: [
ResolveUrlMixin
],
data() {
return {
checked: false