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

auto meal plan tweaks and improvements

Browse Source
This commit is contained in:
vabene1111 2023-08-16 07:10:24 +02:00
parent 716976453a
commit 8ff5142149
4 changed files with 184 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

13
cookbook/views/api.py
View File

@ -678,7 +678,6 @@ class AutoPlanViewSet(viewsets.ViewSet):
keywords = serializer.validated_data['keywords']
start_date = serializer.validated_data['start_date']
end_date = serializer.validated_data['end_date']
meal_type = MealType.objects.get(pk=serializer.validated_data['meal_type_id'])
servings = serializer.validated_data['servings']
shared = serializer.get_initial().get('shared', None)
shared_pks = list()
@ -686,8 +685,9 @@ class AutoPlanViewSet(viewsets.ViewSet):
for i in range(len(shared)):
shared_pks.append(shared[i]['id'])
days = (end_date - start_date).days + 1
recipes = Recipe.objects.all()
days = min((end_date - start_date).days + 1, 14)
recipes = Recipe.objects.values('id', 'name')
meal_plans = list()
for keyword in keywords:
@ -695,15 +695,14 @@ class AutoPlanViewSet(viewsets.ViewSet):
if len(recipes) == 0:
return Response(serializer.data)
recipes = recipes.order_by('?')[:days]
recipes = list(recipes)
recipes = list(recipes.order_by('?')[:days])
for i in range(0, days):
day = start_date + datetime.timedelta(i)
recipe = recipes[i % len(recipes)]
args = {'recipe': recipe, 'servings': servings, 'title': recipe.name,
args = {'recipe_id': recipe['id'], 'servings': servings,
'created_by': request.user,
'meal_type': meal_type,
'meal_type_id': serializer.validated_data['meal_type_id'],
'note': '', 'date': day, 'space': request.space}
m = MealPlan(**args)

40
vue/src/apps/MealPlanView/MealPlanView.vue
View File

@ -83,7 +83,7 @@
</div>
</b-list-group-item>
<b-list-group-item v-for="plan in day.plan_entries" v-bind:key="plan.entry.id" >
<b-list-group-item v-for="plan in day.plan_entries" v-bind:key="plan.entry.id">
<div class="d-flex flex-row align-items-center">
<div>
<b-img style="height: 50px; width: 50px; object-fit: cover"
@ -282,7 +282,6 @@
<auto-meal-plan-modal
:modal_title="'Auto create meal plan'"
:current_period="current_period"
@create-plan="doAutoPlan"
></auto-meal-plan-modal>
<div class="row d-none d-lg-block">
@ -293,12 +292,6 @@
<button class="btn btn-primary shadow-none" @click="createAutoPlan(new Date())"><i
class="fas fa-calendar-plus"></i> {{ $t("Auto_Planner") }}
</button>
<button class="btn btn-primary shadow-none" @click="deleteAll()"><i
class="fas fa-calendar-plus"></i> {{ "DEBUG:deleteAll" }}
</button>
<button class="btn btn-primary shadow-none" @click="refreshEntries()"><i
class="fas fa-calendar-plus"></i> {{ "DEBUG:RefreshMeals" }}
</button>
<a class="btn btn-primary shadow-none" :href="iCalUrl"><i class="fas fa-download"></i>
{{ $t("Export_To_ICal") }}
</a>
@ -307,7 +300,7 @@
<bottom-navigation-bar :create_links="[{label:$t('Export_To_ICal'), url: iCalUrl, icon:'fas fa-download'}]">
<template #custom_create_functions>
<h6 class="dropdown-header">{{ $t('Meal_Plan')}}</h6>
<h6 class="dropdown-header">{{ $t('Meal_Plan') }}</h6>
<a class="dropdown-item" @click="createEntryClick(new Date())"><i
class="fas fa-calendar-plus fa-fw"></i> {{ $t("Create") }}</a>
</template>
@ -688,37 +681,8 @@ export default {
createAutoPlan() {
this.$bvModal.show(`autoplan-modal`)
},
async autoPlanThread(autoPlan, mealTypeIndex) {
let apiClient = new ApiApiFactory()
let data = {
"start_date" : moment(autoPlan.startDay).format("YYYY-MM-DD"),
"end_date" : moment(autoPlan.endDay).format("YYYY-MM-DD"),
"meal_type_id" : autoPlan.meal_types[mealTypeIndex].id,
"keywords" : autoPlan.keywords[mealTypeIndex],
"servings" : autoPlan.servings,
"shared" : autoPlan.shared,
"addshopping": autoPlan.addshopping
}
await apiClient.createAutoPlanViewSet(data)
},
async doAutoPlan(autoPlan) {
for (let i = 0; i < autoPlan.meal_types.length; i++) {
if (autoPlan.keywords[i].length === 0) continue
await this.autoPlanThread(autoPlan, i)
}
this.refreshEntries()
},
refreshEntries(){//todo Remove method
let date = this.current_period
useMealPlanStore().refreshFromAPI(moment(date.periodStart).format("YYYY-MM-DD"), moment(date.periodEnd).format("YYYY-MM-DD"))
},
deleteAll(){//todo Remove method, only used in debugging
for (let i = 0; i < useMealPlanStore().plan_list.length; i++) {
useMealPlanStore().deleteObject(useMealPlanStore().plan_list[i])
}
}
},
directives: {
hover: {
inserted: function (el) {

72
vue/src/components/AutoMealPlanModal.vue
View File

@ -29,7 +29,7 @@
</b-card>
</div>
<div class="row-cols-1 m-3">
<b-form-input class="w-25 m-2 mb-0" :value = "AutoPlan.servings" :type="'number'" @input="updateServings"></b-form-input>
<b-form-input class="w-25 m-2 mb-0" :type="'number'" v-model="AutoPlan.servings"></b-form-input>
<small tabindex="-1" class="m-2 mt-0 form-text text-muted">{{ $t("Servings") }}</small>
</div>
<b-form-group class="mt-3">
@ -56,9 +56,9 @@
<div class="">
<div class="row m-3 mb-0">
<b-form-datepicker class="col" :value-as-date="true" :value="AutoPlan.startDay" @input="updateStartDay"></b-form-datepicker>
<b-form-datepicker class="col" :value-as-date="true" v-model="AutoPlan.startDay"></b-form-datepicker>
<div class="col"></div>
<b-form-datepicker class="col" :value-as-date="true" :value="AutoPlan.endDay" @input="updateEndDay"></b-form-datepicker>
<b-form-datepicker class="col" :value-as-date="true" v-model="AutoPlan.endDay"></b-form-datepicker>
</div>
<div class="row align-top m-3 mt-0">
<small tabindex="-1" class="col align-text-top text-muted">{{ $t("Start Day") }}</small>
@ -70,7 +70,10 @@
<div class="row mt-3 mb-3">
<div class="col-12">
<b-button class="float-right" variant="primary" @click="createPlan">{{ $t("Create Meal Plan") }}</b-button>
<b-button class="float-right" variant="primary" @click="createPlan" :disabled="loading">
<b-spinner small v-if="loading"></b-spinner>
{{ $t("Create Meal Plan") }}
</b-button>
<b-button class="" variant="danger" @click="exitPlan">{{ $t("Exit") }}</b-button>
</div>
</div>
@ -84,9 +87,11 @@ import GenericMultiselect from "@/components/GenericMultiselect"
import {ApiMixin} from "@/utils/utils"
import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
import VueCookies from "vue-cookies";
import moment from "moment/moment";
import {useMealPlanStore} from "@/stores/MealPlanStore";
const { ApiApiFactory } = require("@/utils/openapi/api")
const { StandardToasts } = require("@/utils/utils")
const {ApiApiFactory} = require("@/utils/openapi/api")
const {StandardToasts} = require("@/utils/utils")
Vue.use(BootstrapVue)
Vue.use(VueCookies)
@ -120,7 +125,8 @@ export default {
},
mealplan_settings: {
addshopping: false,
}
},
loading: false,
}
},
watch: {
@ -155,6 +161,9 @@ export default {
useUserPreferenceStore().getData().then(userPreference => {
this.AutoPlan.shared = userPreference.plan_share
})
this.AutoPlan.addshopping = this.mealplan_settings.addshopping
this.loading = false
},
sortMealTypes() {
this.meal_types.forEach(function (element, index) {
@ -186,26 +195,53 @@ export default {
meal_type.editing = false
})
this.AutoPlan.meal_types = result.data
})).then( () => {
})).then(() => {
let mealArray = this.AutoPlan.meal_types
for (let i = 0; i < mealArray.length; i++) {
this.AutoPlan.keywords[i] = [];
}}
}
}
)
},
createPlan() {
if (!this.loading) {
this.loading = true
let requests = []
for (let i = 0; i < this.AutoPlan.meal_types.length; i++) {
if (this.AutoPlan.keywords[i].length === 0) continue
requests.push(this.autoPlanThread(this.AutoPlan, i))
}
Promise.allSettled(requests).then(r => {
this.refreshEntries()
this.loading = false
this.$bvModal.hide(`autoplan-modal`)
this.AutoPlan.addshopping = this.mealplan_settings.addshopping
this.$emit("create-plan", this.AutoPlan)
}).catch(err => {
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_CREATE, err)
this.loading = false
})
}
},
updateStartDay(date){
this.AutoPlan.startDay = date
async autoPlanThread(autoPlan, mealTypeIndex) {
let apiClient = new ApiApiFactory()
let data = {
"start_date": moment(autoPlan.startDay).format("YYYY-MM-DD"),
"end_date": moment(autoPlan.endDay).format("YYYY-MM-DD"),
"meal_type_id": autoPlan.meal_types[mealTypeIndex].id,
"keywords": autoPlan.keywords[mealTypeIndex],
"servings": autoPlan.servings,
"shared": autoPlan.shared,
"addshopping": autoPlan.addshopping
}
return apiClient.createAutoPlanViewSet(data)
},
updateEndDay(date){
this.AutoPlan.endDay = date
},
updateServings(numberOfServings) {
this.AutoPlan.servings = numberOfServings
refreshEntries() { //TODO move properly to MealPLanStore (save period for default refresh)
let date = this.current_period
useMealPlanStore().refreshFromAPI(moment(date.periodStart).format("YYYY-MM-DD"), moment(date.periodEnd).format("YYYY-MM-DD"))
},
exitPlan() {
this.$bvModal.hide(`autoplan-modal`)