Merge pull request #1633 from smilerz/recipe_as_food

allow marking recipe as food

cookbook/serializer.py

@@ -370,16 +370,23 @@ class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer):
         fields = ('id', 'name', 'description', 'category_to_supermarket')
 
 
-class RecipeSimpleSerializer(serializers.ModelSerializer):
+class RecipeSimpleSerializer(WritableNestedModelSerializer):
     url = serializers.SerializerMethodField('get_url')
 
     def get_url(self, obj):
         return reverse('view_recipe', args=[obj.id])
 
+    def create(self, validated_data):
+        # don't allow writing to Recipe via this API
+        return Recipe.objects.get(**validated_data)
+
+    def update(self, instance, validated_data):
+        # don't allow writing to Recipe via this API
+        return Recipe.objects.get(**validated_data)
+
     class Meta:
         model = Recipe
         fields = ('id', 'name', 'url')
-        read_only_fields = ['id', 'name', 'url']
 
 
 class FoodSimpleSerializer(serializers.ModelSerializer):
@@ -433,6 +440,8 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
                 name=sc_name,
                 space=space, defaults=sm_category)
         onhand = validated_data.pop('food_onhand', None)
+        if recipe := validated_data.get('recipe', None):
+            validated_data['recipe'] = Recipe.objects.get(**recipe)
 
         # assuming if on hand for user also onhand for shopping_share users
         if not onhand is None:

vue/src/apps/RecipeEditView/RecipeEditView.vue

@@ -140,6 +140,24 @@
                             </div>
                         </b-collapse>
                     </div>
+                    <b-card-header header-tag="header" class="p-1" role="tab">
+                        <b-button squared block v-b-toggle.additional_collapse class="text-left" variant="outline-primary">{{ $t("additional_options") }}</b-button>
+                    </b-card-header>
+                    <b-collapse id="additional_collapse" class="mt-2" v-model="additional_visible">
+                        <b-form-group>
+                            <b-input-group-append>
+                                <b-input-group-text squared> {{ $t("Create Food") }}</b-input-group-text>
+                                <b-input-group-text squared>
+                                    <b-form-checkbox v-model="recipe.create_food"></b-form-checkbox>
+                                </b-input-group-text>
+                                <b-input-group-text squared v-if="recipe.create_food"> {{ $t("Name") }}</b-input-group-text>
+                                <b-form-input squared v-if="recipe.create_food" v-model="recipe.food_name" id="food_name"></b-form-input>
+                            </b-input-group-append>
+                            <em class="small text-muted">
+                                {{ $t("create_food_desc") }}
+                            </em>
+                        </b-form-group>
+                    </b-collapse>
                 </div>
             </div>
 
@@ -617,6 +635,8 @@ export default {
             paste_step: undefined,
             show_file_create: false,
             step_for_file_create: undefined,
+            additional_visible: false,
+            create_food: undefined,
         }
     },
     computed: {
@@ -648,6 +668,12 @@ export default {
                 this.recipe_changed = this.recipe_changed !== undefined
             },
         },
+        "recipe.name": function () {
+            this.recipe.food_name = this.recipe.name.toLowerCase()
+        },
+        "recipe.create_food": function () {
+            this.create_food = this.recipe.create_food
+        },
     },
     methods: {
         keyboardListener: function (e) {
@@ -734,6 +760,9 @@ export default {
                 .then((response) => {
                     StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
                     this.recipe_changed = false
+                    if (this.create_food) {
+                        apiFactory.createFood({ name: this.recipe.food_name, recipe: { id: this.recipe.id, name: this.recipe.name } })
+                    }
                     if (view_after) {
                         location.href = resolveDjangoUrl("view_recipe", this.recipe_id)
                     }

vue/src/locales/en.json

@@ -376,5 +376,8 @@
     "Keyword": "Keyword",
     "Advanced": "Advanced",
     "Page": "Page",
-    "Reset": "Reset"
+    "Reset": "Reset",
+    "Create Food": "Create Food",
+    "create_food_desc": "Create a food and link it to this recipe.",
+    "additional_options": "Additional Options"
 }