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

shopping list recipes

Browse Source
This commit is contained in:
vabene1111
2024-11-30 11:34:35 +01:00
parent 3f395e816f
commit 38b72c8c72
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
vue3/src/components/display/ShoppingListView.vue
View File

@@ -26,8 +26,9 @@
<v-select hide-details :items="groupingOptionsItems" v-model="useUserPreferenceStore().deviceSettings.shopping_selected_grouping" :label="$t('GroupBy')"> <v-select hide-details :items="groupingOptionsItems" v-model="useUserPreferenceStore().deviceSettings.shopping_selected_grouping" :label="$t('GroupBy')">
</v-select> </v-select>
</v-list-item> </v-list-item>
<v-list-item v-if="useUserPreferenceStore().deviceSettings.shopping_selected_grouping == ShoppingGroupingOptions.CATEGORY"> <v-list-item v-if="useUserPreferenceStore().deviceSettings.shopping_selected_grouping == ShoppingGroupingOptions.CATEGORY">
<v-switch color="primary" hide-details :label="$t('SupermarketCategoriesOnly')" v-model="useUserPreferenceStore().deviceSettings.shopping_show_selected_supermarket_only"></v-switch> <v-switch color="primary" hide-details :label="$t('SupermarketCategoriesOnly')"
v-model="useUserPreferenceStore().deviceSettings.shopping_show_selected_supermarket_only"></v-switch>
</v-list-item> </v-list-item>
<v-list-item> <v-list-item>
<model-select model="Supermarket" v-model="useUserPreferenceStore().deviceSettings.shopping_selected_supermarket"></model-select> <model-select model="Supermarket" v-model="useUserPreferenceStore().deviceSettings.shopping_selected_supermarket"></model-select>
@@ -122,21 +123,32 @@
</v-container> </v-container>
</v-window-item> </v-window-item>
<v-window-item value="recipes"> <v-window-item value="recipes">
<v-card> <v-container>
<v-card-title>{{ $t('Recipes') }}</v-card-title> <v-row>
<v-card-text> <v-col>
<v-card>
<v-card-title>{{ $t('Recipes') }}</v-card-title>
<v-card-text>
<v-label>{{ $t('Add_to_Shopping') }}</v-label> <v-label>{{ $t('Add_to_Shopping') }}</v-label>
<ModelSelect model="Recipe"></ModelSelect> <ModelSelect model="Recipe"></ModelSelect>
<v-label>{{ $t('Recipes') }}</v-label>
<v-list>
<v-list-item v-for="r in useShoppingStore().getAssociatedRecipes()">
{{ r.recipeName }}
<template #append>
<v-btn icon="$delete" color="delete"></v-btn>
<number-scaler-dialog ></number-scaler-dialog>
</template>
</v-list-item>
</v-list>
</v-card-text>
</v-card>
</v-col>
</v-row>
</v-container>
<v-label>{{ $t('Recipes') }}</v-label>
<v-list>
<v-list-item v-for="r in useShoppingStore().getAssociatedRecipes()">
{{ r }}
</v-list-item>
</v-list>
</v-card-text>
</v-card>
</v-window-item> </v-window-item>
</v-window> </v-window>
@@ -156,6 +168,7 @@ import ModelSelect from "@/components/inputs/ModelSelect.vue";
import ShoppingLineItemDialog from "@/components/dialogs/ShoppingLineItemDialog.vue"; import ShoppingLineItemDialog from "@/components/dialogs/ShoppingLineItemDialog.vue";
import {IShoppingListFood, ShoppingGroupingOptions} from "@/types/Shopping"; import {IShoppingListFood, ShoppingGroupingOptions} from "@/types/Shopping";
import {useI18n} from "vue-i18n"; import {useI18n} from "vue-i18n";
import NumberScalerDialog from "@/components/inputs/NumberScalerDialog.vue";
const {t} = useI18n() const {t} = useI18n()

21
vue3/src/stores/ShoppingStore.ts
View File

@@ -1,5 +1,5 @@
import {acceptHMRUpdate, defineStore} from "pinia" import {acceptHMRUpdate, defineStore} from "pinia"
import {ApiApi, Food, ShoppingListEntry, ShoppingListEntryBulk, Supermarket, SupermarketCategory} from "@/openapi"; import {ApiApi, Food, Recipe, ShoppingListEntry, ShoppingListEntryBulk, ShoppingListRecipe, Supermarket, SupermarketCategory} from "@/openapi";
import {computed, ref} from "vue"; import {computed, ref} from "vue";
import { import {
IShoppingExportEntry, IShoppingExportEntry,
@@ -261,26 +261,17 @@ export const useShoppingStore = defineStore(_STORE_ID, () => {
}) })
} }
//TODO fix/verify for typescript
/** /**
* returns a distinct list of recipes associated with unchecked shopping list entries * returns a distinct list of recipes associated with unchecked shopping list entries
*/ */
function getAssociatedRecipes() { function getAssociatedRecipes() {
let recipes = {} // TODO this needs a type let recipes = [] as ShoppingListRecipe[]
for (let i in this.entries) { entries.value.forEach(e => {
let e = this.entries[i] if(e.recipeMealplan != null && recipes.findIndex(x => x.id == e.recipeMealplan.id) == -1){
if (e.recipe_mealplan !== null) { recipes.push(e.recipeMealplan)
recipes[e.recipe_mealplan.recipe] = {
'shopping_list_recipe_id': e.list_recipe,
'recipe_id': e.recipe_mealplan.recipe,
'recipe_name': e.recipe_mealplan.recipe_name,
'servings': e.recipe_mealplan.servings,
'mealplan_from_date': e.recipe_mealplan.mealplan_from_date,
'mealplan_type': e.recipe_mealplan.mealplan_type,
}
} }
} })
return recipes return recipes
} }