added share functionality. changed random recipe selection to prevent repeating duplicate choices.

cookbook/views/api.py

@@ -675,6 +675,11 @@ class AutoPlanViewSet(viewsets.ViewSet):
             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()
+            if shared is not None:
+                for i in range(len(shared)):
+                    shared_pks.append(shared[i]['id'])
 
             days = (end_date - start_date).days + 1
             recipes = Recipe.objects.all()
@@ -688,7 +693,7 @@ class AutoPlanViewSet(viewsets.ViewSet):
 
             for i in range(0, days):
                 day = start_date + datetime.timedelta(i)
-                recipe = random.choice(recipes)
+                recipe = recipes[i % len(recipes)]
                 args = {'recipe': recipe, 'servings': servings, 'title': recipe.name,
                         'created_by': request.user,
                         'meal_type': meal_type,
@@ -698,7 +703,10 @@ class AutoPlanViewSet(viewsets.ViewSet):
                 meal_plans.append(m)
 
             MealPlan.objects.bulk_create(meal_plans)
+
             for m in meal_plans:
+                m.shared.set(shared_pks)
+
                 if request.data.get('addshopping', False) and request.data.get('recipe', None):
                     SLR = RecipeShoppingEditor(user=request.user, space=request.space)
                     SLR.create(mealplan=m, servings=servings)

vue/src/apps/MealPlanView/MealPlanView.vue

@@ -371,7 +371,8 @@ export default {
             servings: 1,
             date: Date.now(),
             startDay: null,
-            endDay: null
+            endDay: null,
+            shared: []
           },
             showDate: new Date(),
             plan_entries: [],

vue/src/components/AutoMealPlanModal.vue

@@ -32,6 +32,21 @@
                             <b-form-input class="w-25 m-2 mb-0" :value = "AutoPlan.servings" :type="'number'" @input="updateServings"></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">
+                            <generic-multiselect
+                                required
+                                @change="AutoPlan.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="AutoPlan.shared"
+                            ></generic-multiselect>
+                            <small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
+                          </b-form-group>
 
                           <div class="">
                             <div class="row m-3 mb-0">
@@ -61,6 +76,7 @@ import Vue from "vue"
 import {BootstrapVue} from "bootstrap-vue"
 import GenericMultiselect from "@/components/GenericMultiselect"
 import {ApiMixin} from "@/utils/utils"
+import {useUserPreferenceStore} from "@/stores/UserPreferenceStore";
 
 const { ApiApiFactory } = require("@/utils/openapi/api")
 const { StandardToasts } = require("@/utils/utils")
@@ -89,7 +105,8 @@ export default {
             servings: 1,
             date: Date.now(),
             startDay: null,
-            endDay: null
+            endDay: null,
+            shared: []
           }
         }
     },
@@ -104,6 +121,9 @@ export default {
           this.AutoPlan.servings = 1
           this.AutoPlan.startDay = new Date()
           this.AutoPlan.endDay = this.current_period.periodEnd
+          useUserPreferenceStore().getData().then(userPreference => {
+                    this.AutoPlan.shared = userPreference.plan_share
+            })
         },
        sortMealTypes() {
             this.meal_types.forEach(function (element, index) {