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

shopping fixes

Browse Source
This commit is contained in:
vabene1111
2025-01-02 09:39:47 +01:00
parent 2841e086df
commit 9e99edf6f6
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vue3/src/components/dialogs/ShoppingLineItemDialog.vue
View File

@@ -58,6 +58,9 @@
</b> </b>
{{ e.food.name }} {{ e.food.name }}
</v-list-item-title> </v-list-item-title>
<v-list-item-subtitle v-if="e.completedAt">
<v-icon icon="fa-solid fa-check" size="small" color="success"></v-icon> {{$t('Completed')}} {{DateTime.fromJSDate(e.completedAt).toLocaleString(DateTime.DATETIME_SHORT)}}
</v-list-item-subtitle>
<v-list-item-subtitle v-if="e.recipeMealplan && e.recipeMealplan.recipeName !== ''"> <v-list-item-subtitle v-if="e.recipeMealplan && e.recipeMealplan.recipeName !== ''">
{{ e.recipeMealplan.servings }} x {{ e.recipeMealplan.servings }} x
<router-link :to="{name: 'view_recipe', params: {id: e.recipeMealplan.id}}" target="_blank" class="text-decoration-none"><b> <router-link :to="{name: 'view_recipe', params: {id: e.recipeMealplan.id}}" target="_blank" class="text-decoration-none"><b>

34
vue3/src/components/display/ShoppingLineItem.vue
View File

@@ -167,24 +167,30 @@ const infoRow = computed(() => {
for (let i in entries.value) { for (let i in entries.value) {
let e = entries.value[i] let e = entries.value[i]
if (authors.indexOf(e.createdBy.displayName) === -1) { if (!e.checked && !isDelayed(e)
authors.push(e.createdBy.displayName) || (e.checked && useUserPreferenceStore().deviceSettings.shopping_show_checked_entries)
} || (isDelayed(e) && useUserPreferenceStore().deviceSettings.shopping_show_delayed_entries)) {
if (e.listRecipe != null) { if (authors.indexOf(e.createdBy.displayName) === -1) {
if (e.listRecipeData.recipe != null) { authors.push(e.createdBy.displayName)
let recipe_name = e.listRecipeData.recipeData.name }
if (recipes.indexOf(recipe_name) === -1) {
recipes.push(recipe_name.substring(0, 14) + (recipe_name.length > 14 ? '..' : '')) if (e.listRecipe != null) {
if (e.listRecipeData.recipe != null) {
let recipe_name = e.listRecipeData.recipeData.name
if (recipes.indexOf(recipe_name) === -1) {
recipes.push(recipe_name.substring(0, 14) + (recipe_name.length > 14 ? '..' : ''))
}
}
if (e.listRecipeData.mealplan != null) {
let meal_plan_entry = (e.listRecipeData.mealPlanData.mealType.name.substring(0, 8) || '') + ' (' + DateTime.fromJSDate(e.listRecipeData.mealPlanData.fromDate).toLocaleString(DateTime.DATE_SHORT) + ')'
if (meal_pans.indexOf(meal_plan_entry) === -1) {
meal_pans.push(meal_plan_entry)
}
} }
} }
if (e.listRecipeData.mealplan != null) {
let meal_plan_entry = (e.listRecipeData.mealPlanData.mealType.name.substring(0, 8) || '') + ' (' + DateTime.fromJSDate(e.listRecipeData.mealPlanData.fromDate).toLocaleString(DateTime.DATE_SHORT) + ')'
if (meal_pans.indexOf(meal_plan_entry) === -1) {
meal_pans.push(meal_plan_entry)
}
}
} }
} }