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

catch empty lines in paste_ingredients

Browse Source
This commit is contained in:
smilerz
2022-02-16 14:07:56 -06:00
parent 8b94bf1333
commit d68a89a32c
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vue/src/apps/RecipeEditView/RecipeEditView.vue
View File

@ -969,23 +969,24 @@ export default {
appendIngredients: function () { appendIngredients: function () {
let ing_list = this.paste_ingredients.split(/\r?\n/) let ing_list = this.paste_ingredients.split(/\r?\n/)
let step = this.recipe.steps.findIndex((x) => x.id == this.paste_step) let step = this.recipe.steps.findIndex((x) => x.id == this.paste_step)
let order = 0 let order = Math.max(...this.recipe.steps[step].ingredients.map((x) => x.order)) + 1
this.recipe.steps[step].ingredients_visible = true this.recipe.steps[step].ingredients_visible = true
ing_list.forEach((ing) => { ing_list.forEach((ing) => {
this.genericPostAPI("api_ingredient_from_string", { text: ing }).then((result) => { if (ing.trim() !== "") {
let unit = null this.genericPostAPI("api_ingredient_from_string", { text: ing }).then((result) => {
if (result.data.unit !== "") { let unit = null
unit = { name: result.data.unit } if (result.data.unit !== "") {
} unit = { name: result.data.unit }
this.recipe.steps[step].ingredients.push({ }
amount: result.data.amount, this.recipe.steps[step].ingredients.splice(order, 0, {
unit: unit, amount: result.data.amount,
food: { name: result.data.food }, unit: unit,
note: result.data.note, food: { name: result.data.food },
order: order, note: result.data.note,
})
}) })
}) order++
order++ }
}) })
}, },
}, },