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

fixed typo that broke fractions

Browse Source
This commit is contained in:
vabene1111 2021-02-18 09:17:42 +01:00
parent 894d2d2e6b
commit e727cae020
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -12,7 +12,7 @@
<i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i> <i class="far fa-check-circle text-primary" v-if="!ingredient.checked"></i>
</td> </td>
<td> <td>
<span v-if="ingredient.amount !== 0">{{ calculateAmount(ingredient.amount) }}</span> <span v-if="ingredient.amount !== 0" v-html="calculateAmount(ingredient.amount)"></span>
</td> </td>
<td> <td>
<span v-if="ingredient.unit !== null && !ingredient.no_amount">{{ ingredient.unit.name }}</span> <span v-if="ingredient.unit !== null && !ingredient.no_amount">{{ ingredient.unit.name }}</span>

4
vue/src/utils/utils.js
View File

@ -78,9 +78,9 @@ export function getUserPreference(pref) {
import {frac} from "@/utils/fractions"; import {frac} from "@/utils/fractions";
export function calculateAmount(amount, factor) { export function calculateAmount(amount, factor) {
if (getUserPreference('user_fractions')) { if (getUserPreference('use_fractions')) {
let return_string = '' let return_string = ''
let fraction = frac.cont((amount * factor), 9, true) let fraction = frac((amount * factor), 9, true)
if (fraction[0] > 0) { if (fraction[0] > 0) {
return_string += fraction[0] return_string += fraction[0]