diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue index bc201dd95..da986b97a 100644 --- a/vue/src/apps/MealPlanView/MealPlanView.vue +++ b/vue/src/apps/MealPlanView/MealPlanView.vue @@ -56,15 +56,13 @@ - - + - @@ -101,7 +99,7 @@ {{ plan.title }} - {{ plan.note}} + {{ plan.note }} {{ plan.meal_type_name }} @@ -432,7 +430,7 @@ export default { grid.push({ date: moment_date, create_default_date: moment_date.format("YYYY-MM-DD"), // improve meal plan edit modal to do formatting itself and accept dates - date_label: moment_date.format('DD.MM'), + date_label: moment_date.format('ddd DD.MM'), plan_entries: useMealPlanStore().plan_list.filter((m) => moment(m.date).isSame(moment_date, 'day')) }) } @@ -448,6 +446,7 @@ export default { }) this.$root.$on("change", this.updateEmoji) this.$i18n.locale = window.CUSTOM_LOCALE + moment.locale(window.CUSTOM_LOCALE) }, watch: { settings: { @@ -545,6 +544,9 @@ export default { } }) }, + datePickerChanged(ctx) { + this.setShowDate(ctx.selectedDate) + }, setShowDate(d) { this.showDate = d }, diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 010c9b02f..6adeb7c4d 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -841,10 +841,10 @@ - {{ day.date_label }} + {{ day.date_label }} - @@ -854,17 +854,19 @@ + :src="plan.recipe.image" rounded="circle" v-if="plan.recipe?.image"> + - {{ - plan.recipe.name - }} + + {{ plan.recipe.name }} + {{ plan.title }} + - + @@ -1087,6 +1089,7 @@ export default { debug: false, mealplan_default_date: null, mealplan_entry_edit: null, + image_placeholder: window.IMAGE_PLACEHOLDER, } }, computed: { @@ -1098,7 +1101,7 @@ export default { grid.push({ date: moment_date, create_default_date: moment_date.format("YYYY-MM-DD"), // improve meal plan edit modal to do formatting itself and accept dates - date_label: moment_date.format('DD.MM'), + date_label: moment_date.format('ddd DD.MM'), plan_entries: this.meal_plan_store.plan_list.filter((m) => moment(m.date).isSame(moment_date, 'day')) }) } @@ -1262,6 +1265,7 @@ export default { this.use_plural = r.data.use_plural }) this.$i18n.locale = window.CUSTOM_LOCALE + moment.locale(window.CUSTOM_LOCALE) this.debug = localStorage.getItem("DEBUG") == "True" || false }, watch: {