mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2026-01-04 13:48:32 -05:00
method for asynchronous generation of meals. start of menu for auto planner. delete method deletes all records for testing the auto planner.
This commit is contained in:
@@ -208,6 +208,13 @@
|
|||||||
@delete-entry="deleteEntry"
|
@delete-entry="deleteEntry"
|
||||||
@reload-meal-types="refreshMealTypes"
|
@reload-meal-types="refreshMealTypes"
|
||||||
></meal-plan-edit-modal>
|
></meal-plan-edit-modal>
|
||||||
|
<auto-meal-plan-modal
|
||||||
|
:entry="entryEditing"
|
||||||
|
:modal_title="'Auto create meal plan'"
|
||||||
|
:auto_plan_show="auto_plan_show"
|
||||||
|
@create-plan="autoPlan"
|
||||||
|
|
||||||
|
></auto-meal-plan-modal>
|
||||||
|
|
||||||
<transition name="slide-fade">
|
<transition name="slide-fade">
|
||||||
<div class="row fixed-bottom p-2 b-1 border-top text-center" style="background: rgba(255, 255, 255, 0.6)"
|
<div class="row fixed-bottom p-2 b-1 border-top text-center" style="background: rgba(255, 255, 255, 0.6)"
|
||||||
@@ -224,8 +231,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3 col-6 mb-1 mb-md-0">
|
<div class="col-md-3 col-6 mb-1 mb-md-0">
|
||||||
<button class="btn btn-block btn-primary shadow-none disabled" v-b-tooltip.focus.top
|
<button class="btn btn-block btn-primary shadow-none" @click="createAutoPlan(new Date())">
|
||||||
:title="$t('Coming_Soon')">
|
|
||||||
{{ $t("Auto_Planner") }}
|
{{ $t("Auto_Planner") }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -272,6 +278,8 @@ import VueCookies from "vue-cookies"
|
|||||||
import {ApiMixin, StandardToasts, ResolveUrlMixin} from "@/utils/utils"
|
import {ApiMixin, StandardToasts, ResolveUrlMixin} from "@/utils/utils"
|
||||||
import {CalendarView, CalendarMathMixin} from "vue-simple-calendar/src/components/bundle"
|
import {CalendarView, CalendarMathMixin} from "vue-simple-calendar/src/components/bundle"
|
||||||
import {ApiApiFactory} from "@/utils/openapi/api"
|
import {ApiApiFactory} from "@/utils/openapi/api"
|
||||||
|
import axios from "axios";
|
||||||
|
import AutoMealPlanModal from "@/components/AutoMealPlanModal";
|
||||||
|
|
||||||
const {makeToast} = require("@/utils/utils")
|
const {makeToast} = require("@/utils/utils")
|
||||||
|
|
||||||
@@ -284,6 +292,7 @@ let SETTINGS_COOKIE_NAME = "mealplan_settings"
|
|||||||
export default {
|
export default {
|
||||||
name: "MealPlanView",
|
name: "MealPlanView",
|
||||||
components: {
|
components: {
|
||||||
|
AutoMealPlanModal,
|
||||||
MealPlanEditModal,
|
MealPlanEditModal,
|
||||||
MealPlanCard,
|
MealPlanCard,
|
||||||
CalendarView,
|
CalendarView,
|
||||||
@@ -546,7 +555,7 @@ export default {
|
|||||||
},
|
},
|
||||||
deleteEntry(data) {
|
deleteEntry(data) {
|
||||||
this.plan_entries.forEach((entry, index, list) => {
|
this.plan_entries.forEach((entry, index, list) => {
|
||||||
if (entry.id === data.id) {
|
//if (entry.id === data.id) {//todo:remove block!
|
||||||
let apiClient = new ApiApiFactory()
|
let apiClient = new ApiApiFactory()
|
||||||
|
|
||||||
apiClient
|
apiClient
|
||||||
@@ -557,7 +566,7 @@ export default {
|
|||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
|
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
|
||||||
})
|
})
|
||||||
}
|
//}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
entryClick(data) {
|
entryClick(data) {
|
||||||
@@ -634,6 +643,49 @@ export default {
|
|||||||
entry: plan_entry,
|
entry: plan_entry,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
createAutoPlan(date) {
|
||||||
|
this.$bvModal.show(`autoplan-modal`)
|
||||||
|
},
|
||||||
|
async autoPlanThread(date,dateOffset,i,servings){
|
||||||
|
|
||||||
|
let apiClient = new ApiApiFactory()
|
||||||
|
let currentEntry = Object.assign({}, this.options.entryEditing)
|
||||||
|
currentEntry.date = moment(date).add(dateOffset,"d").format("YYYY-MM-DD")
|
||||||
|
currentEntry.servings = servings
|
||||||
|
await Promise.all([
|
||||||
|
currentEntry.recipe = await this.randomRecipe(i+3).then((result)=>{return result}),
|
||||||
|
currentEntry.shared = await apiClient.listUserPreferences().then((result) => {return result.data[0].plan_share}),
|
||||||
|
currentEntry.meal_type = await this.getMealType(i+2).then((result)=>{return result})
|
||||||
|
])
|
||||||
|
currentEntry.title = currentEntry.recipe.name
|
||||||
|
this.createEntry(currentEntry)
|
||||||
|
},
|
||||||
|
autoPlan(data, servings){
|
||||||
|
// ["breakfast","lunch","dinner"]
|
||||||
|
// meal types: 4,3,2
|
||||||
|
//meal keywords: 5,4,3
|
||||||
|
for (let i = 0; i < 3; i++) {
|
||||||
|
for (let dateOffset = 0; dateOffset < 7; dateOffset++) {
|
||||||
|
this.autoPlanThread(data,dateOffset,i,servings)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
randomRecipe(keyword) {
|
||||||
|
let url = `/api/recipe/?query=&keywords_or=${keyword}`
|
||||||
|
return axios.get(url).then((response) => {
|
||||||
|
let result = response.data
|
||||||
|
let count = result.count
|
||||||
|
return result.results[Math.floor(Math.random() * count)]
|
||||||
|
}).catch((err) => {
|
||||||
|
|
||||||
|
})
|
||||||
|
},
|
||||||
|
getMealType(id) {
|
||||||
|
let url = `/api/meal-type/${id}`
|
||||||
|
return axios.get(url).then((response) => {
|
||||||
|
return response.data
|
||||||
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
directives: {
|
directives: {
|
||||||
hover: {
|
hover: {
|
||||||
|
|||||||
246
vue/src/components/AutoMealPlanModal.vue
Normal file
246
vue/src/components/AutoMealPlanModal.vue
Normal file
@@ -0,0 +1,246 @@
|
|||||||
|
<template>
|
||||||
|
<b-modal :id="modal_id" size="lg" :title="modal_title" hide-footer aria-label="" @show="showModal">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col col-md-12">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col col-md-12">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-6 col-lg-9">
|
||||||
|
<b-input-group>
|
||||||
|
<b-form-input id="TitleInput" v-model="entryEditing.title" :placeholder="entryEditing.title_placeholder" @change="missing_recipe = false"></b-form-input>
|
||||||
|
<b-input-group-append class="d-none d-lg-block">
|
||||||
|
<b-button variant="primary" @click="entryEditing.title = ''"><i class="fa fa-eraser"></i></b-button>
|
||||||
|
</b-input-group-append>
|
||||||
|
</b-input-group>
|
||||||
|
<span class="text-danger" v-if="missing_recipe">{{ $t("Title_or_Recipe_Required") }}</span>
|
||||||
|
<small tabindex="-1" class="form-text text-muted" v-if="!missing_recipe">{{ $t("Title") }}</small>
|
||||||
|
</div>
|
||||||
|
<div class="col-6 col-lg-3">
|
||||||
|
<input type="date" id="DateInput" class="form-control" v-model="entryEditing.date" />
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("Date") }}</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mt-3">
|
||||||
|
<div class="col-12 col-lg-6 col-xl-6">
|
||||||
|
<b-form-group>
|
||||||
|
<generic-multiselect
|
||||||
|
@change="selectRecipe"
|
||||||
|
:initial_single_selection="entryEditing.recipe"
|
||||||
|
:label="'name'"
|
||||||
|
:model="Models.RECIPE"
|
||||||
|
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
|
||||||
|
v-bind:placeholder="$t('Recipe')"
|
||||||
|
:limit="10"
|
||||||
|
:multiple="false"
|
||||||
|
></generic-multiselect>
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("Recipe") }}</small>
|
||||||
|
</b-form-group>
|
||||||
|
<b-form-group class="mt-3">
|
||||||
|
<generic-multiselect
|
||||||
|
required
|
||||||
|
@change="selectMealType"
|
||||||
|
:label="'name'"
|
||||||
|
:model="Models.MEAL_TYPE"
|
||||||
|
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
|
||||||
|
v-bind:placeholder="$t('Meal_Type')"
|
||||||
|
:limit="10"
|
||||||
|
:multiple="false"
|
||||||
|
:initial_single_selection="entryEditing.meal_type"
|
||||||
|
:allow_create="true"
|
||||||
|
:create_placeholder="$t('Create_New_Meal_Type')"
|
||||||
|
></generic-multiselect>
|
||||||
|
<span class="text-danger" v-if="missing_meal_type">{{ $t("Meal_Type_Required") }}</span>
|
||||||
|
<small tabindex="-1" class="form-text text-muted" v-if="!missing_meal_type">{{ $t("Meal_Type") }}</small>
|
||||||
|
</b-form-group>
|
||||||
|
<b-form-group label-for="NoteInput" :description="$t('Note')" class="mt-3">
|
||||||
|
<textarea class="form-control" id="NoteInput" v-model="entryEditing.note" :placeholder="$t('Note')"></textarea>
|
||||||
|
</b-form-group>
|
||||||
|
<b-input-group>
|
||||||
|
<b-form-input id="ServingsInput" v-model="entryEditing.servings" :placeholder="$t('Servings')"></b-form-input>
|
||||||
|
</b-input-group>
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("Servings") }}</small>
|
||||||
|
<b-form-group class="mt-3">
|
||||||
|
<generic-multiselect
|
||||||
|
required
|
||||||
|
@change="entryEditing.shared = $event.val"
|
||||||
|
parent_variable="entryEditing.shared"
|
||||||
|
:label="'display_name'"
|
||||||
|
:model="Models.USER_NAME"
|
||||||
|
style="flex-grow: 1; flex-shrink: 1; flex-basis: 0"
|
||||||
|
v-bind:placeholder="$t('Share')"
|
||||||
|
:limit="10"
|
||||||
|
:multiple="true"
|
||||||
|
:initial_selection="entryEditing.shared"
|
||||||
|
></generic-multiselect>
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
|
||||||
|
</b-form-group>
|
||||||
|
<b-input-group v-if="!autoMealPlan">
|
||||||
|
<b-form-checkbox id="AddToShopping" v-model="mealplan_settings.addshopping" />
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("AddToShopping") }}</small>
|
||||||
|
</b-input-group>
|
||||||
|
<b-input-group v-if="mealplan_settings.addshopping">
|
||||||
|
<b-form-checkbox id="reviewShopping" v-model="mealplan_settings.reviewshopping" />
|
||||||
|
<small tabindex="-1" class="form-text text-muted">{{ $t("review_shopping") }}</small>
|
||||||
|
</b-input-group>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-6 d-none d-lg-block d-xl-block">
|
||||||
|
<recipe-card v-if="entryEditing.recipe" :recipe="entryEditing.recipe" :detailed="false"></recipe-card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mt-3 mb-3">
|
||||||
|
<div class="col-12">
|
||||||
|
<b-button variant="danger" @click="deleteEntry" v-if="allow_delete">{{ $t("Delete") }} </b-button>
|
||||||
|
<b-button class="float-right" variant="primary" @click="editEntry">{{ $t("Save") }}</b-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</b-modal>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import Vue from "vue"
|
||||||
|
import VueCookies from "vue-cookies"
|
||||||
|
import { BootstrapVue } from "bootstrap-vue"
|
||||||
|
import GenericMultiselect from "@/components/GenericMultiselect"
|
||||||
|
import { ApiMixin, getUserPreference } from "@/utils/utils"
|
||||||
|
|
||||||
|
const { ApiApiFactory } = require("@/utils/openapi/api")
|
||||||
|
const { StandardToasts } = require("@/utils/utils")
|
||||||
|
|
||||||
|
Vue.use(BootstrapVue)
|
||||||
|
Vue.use(VueCookies)
|
||||||
|
let MEALPLAN_COOKIE_NAME = "mealplan_settings"
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: "AutoMealPlanModal",
|
||||||
|
props: {
|
||||||
|
entry: Object,
|
||||||
|
entryEditing_inital_servings: Number,
|
||||||
|
modal_title: String,
|
||||||
|
modal_id: {
|
||||||
|
type: String,
|
||||||
|
default: "autoplan-modal",
|
||||||
|
},
|
||||||
|
allow_delete: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mixins: [ApiMixin],
|
||||||
|
components: {
|
||||||
|
GenericMultiselect,
|
||||||
|
RecipeCard: () => import("@/components/RecipeCard.vue"),
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
entryEditing: {},
|
||||||
|
missing_recipe: false,
|
||||||
|
missing_meal_type: false,
|
||||||
|
default_plan_share: [],
|
||||||
|
mealplan_settings: {
|
||||||
|
addshopping: false,
|
||||||
|
reviewshopping: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
entry: {
|
||||||
|
handler() {
|
||||||
|
this.entryEditing = Object.assign({}, this.entry)
|
||||||
|
|
||||||
|
if (this.entryEditing_inital_servings) {
|
||||||
|
this.entryEditing.servings = this.entryEditing_inital_servings
|
||||||
|
}
|
||||||
|
},
|
||||||
|
deep: true,
|
||||||
|
},
|
||||||
|
entryEditing: {
|
||||||
|
handler(newVal) {},
|
||||||
|
deep: true,
|
||||||
|
},
|
||||||
|
mealplan_settings: {
|
||||||
|
handler(newVal) {
|
||||||
|
this.$cookies.set(MEALPLAN_COOKIE_NAME, this.mealplan_settings)
|
||||||
|
},
|
||||||
|
deep: true,
|
||||||
|
},
|
||||||
|
entryEditing_inital_servings: function (newVal) {
|
||||||
|
this.entryEditing.servings = newVal
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mounted: function () {},
|
||||||
|
computed: {
|
||||||
|
autoMealPlan: function () {
|
||||||
|
return getUserPreference("mealplan_autoadd_shopping")
|
||||||
|
},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
showModal() {
|
||||||
|
if (this.$cookies.isKey(MEALPLAN_COOKIE_NAME)) {
|
||||||
|
this.mealplan_settings = Object.assign({}, this.mealplan_settings, this.$cookies.get(MEALPLAN_COOKIE_NAME))
|
||||||
|
}
|
||||||
|
let apiClient = new ApiApiFactory()
|
||||||
|
|
||||||
|
apiClient.listUserPreferences().then((result) => {
|
||||||
|
if (this.entry.id === -1) {
|
||||||
|
this.entryEditing.shared = result.data[0].plan_share
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
editEntry() {
|
||||||
|
this.missing_meal_type = false
|
||||||
|
this.missing_recipe = false
|
||||||
|
let cancel = false
|
||||||
|
if (this.entryEditing.meal_type == null) {
|
||||||
|
this.missing_meal_type = true
|
||||||
|
cancel = true
|
||||||
|
}
|
||||||
|
if (this.entryEditing.recipe == null && this.entryEditing.title === "") {
|
||||||
|
this.missing_recipe = true
|
||||||
|
cancel = true
|
||||||
|
}
|
||||||
|
if (!cancel) {
|
||||||
|
this.$bvModal.hide(`edit-modal`)
|
||||||
|
this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.mealplan_settings.addshopping && !this.autoMealPlan } })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
deleteEntry() {
|
||||||
|
this.$bvModal.hide(`edit-modal`)
|
||||||
|
this.$emit("delete-entry", this.entryEditing)
|
||||||
|
},
|
||||||
|
selectMealType(event) {
|
||||||
|
this.missing_meal_type = false
|
||||||
|
if (event.val != null) {
|
||||||
|
this.entryEditing.meal_type = event.val
|
||||||
|
} else {
|
||||||
|
this.entryEditing.meal_type = null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
selectShared(event) {
|
||||||
|
if (event.val != null) {
|
||||||
|
this.entryEditing.shared = event.val
|
||||||
|
} else {
|
||||||
|
this.entryEditing.meal_type = null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
selectRecipe(event) {
|
||||||
|
this.missing_recipe = false
|
||||||
|
if (event.val != null) {
|
||||||
|
this.entryEditing.recipe = event.val
|
||||||
|
this.entryEditing.title_placeholder = this.entryEditing.recipe.name
|
||||||
|
this.entryEditing.servings = this.entryEditing.recipe.servings
|
||||||
|
} else {
|
||||||
|
this.entryEditing.recipe = null
|
||||||
|
this.entryEditing.title_placeholder = ""
|
||||||
|
this.entryEditing.servings = 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped></style>
|
||||||
Reference in New Issue
Block a user