food editor and property view improvements

cookbook/models.py

@@ -82,10 +82,13 @@ class TreeManager(MP_NodeManager):
     # model.Manager get_or_create() is not compatible with MP_Tree
     def get_or_create(self, *args, **kwargs):
         kwargs['name'] = kwargs['name'].strip()
-
+        if hasattr(self, 'space'):
             if obj := self.filter(name__iexact=kwargs['name'], space=kwargs['space']).first():
                 return obj, False
         else:
+            if obj := self.filter(name__iexact=kwargs['name']).first():
+                return obj, False
+
         with scopes_disabled():
             try:
                 defaults = kwargs.pop('defaults', None)

cookbook/views/api.py

@@ -250,6 +250,9 @@ class MergeMixin(ViewSetMixin):
                 isTree = False
 
             try:
+                if isinstance(source, Food):
+                    FoodProperty.objects.filter(food=source).delete()
+
                 for link in [field for field in source._meta.get_fields() if issubclass(type(field), ForeignObjectRel)]:
                     linkManager = getattr(source, link.get_accessor_name())
                     related = linkManager.all()
@@ -279,6 +282,7 @@ class MergeMixin(ViewSetMixin):
                 source.delete()
                 return Response(content, status=status.HTTP_200_OK)
             except Exception:
+                traceback.print_exc()
                 content = {'error': True,
                            'msg': _(f'An error occurred attempting to merge {source.name} with {target.name}')}
                 return Response(content, status=status.HTTP_400_BAD_REQUEST)

recipes/settings.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
 """
 import ast
 import json
+import mimetypes
 import os
 import re
 import sys
@@ -519,3 +520,5 @@ EMAIL_USE_SSL = bool(int(os.getenv('EMAIL_USE_SSL', False)))
 DEFAULT_FROM_EMAIL = os.getenv('DEFAULT_FROM_EMAIL', 'webmaster@localhost')
 ACCOUNT_EMAIL_SUBJECT_PREFIX = os.getenv(
     'ACCOUNT_EMAIL_SUBJECT_PREFIX', '[Tandoor Recipes] ')  # allauth sender prefix
+
+mimetypes.add_type("text/javascript", ".js", True)

vue/src/apps/RecipeView/RecipeView.vue

@@ -137,9 +137,7 @@
 
             <div class="row" style="margin-top: 2vh; ">
                 <div class="col-lg-6 offset-lg-3 col-12">
-<!--                    <Nutrition-component :recipe="recipe" id="nutrition_container"-->
+                    <food-property-view-component :recipe="recipe" :servings="servings" @foodUpdated="loadRecipe(recipe.id)"></food-property-view-component>
-<!--                                         :ingredient_factor="ingredient_factor"></Nutrition-component>-->
-                    <food-property-view-component :recipe="recipe" :servings="servings"></food-property-view-component>
                 </div>
             </div>
         </div>

vue/src/components/FoodEditor.vue

@@ -174,15 +174,16 @@ export default {
     props: {
         id: {type: String, default: 'id_food_edit_modal_modal'},
         show: {required: true, type: Boolean, default: false},
+        item1: {
+            type: Object,
+            default: undefined
+        },
     },
     watch: {
         show: function () {
-            console.log('trigger')
             if (this.show) {
-                console.log('show modal')
                 this.$bvModal.show(this.id)
             } else {
-                console.log('show modal false')
                 this.$bvModal.hide(this.id)
             }
         },
@@ -197,9 +198,35 @@ export default {
         this.$bvModal.show(this.id)
         this.$i18n.locale = window.CUSTOM_LOCALE
         let apiClient = new ApiApiFactory()
-        apiClient.retrieveFood('1').then((r) => {
+        let pf
+        if (this.item1.id !== undefined) {
+            pf = apiClient.retrieveFood(this.item1.id).then((r) => {
                 this.food = r.data
+            }).catch(err => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
+            })
+        } else {
+            this.food = {
+                name: "",
+                plural_name: "",
+                description: "",
+                shopping: false,
+                recipe: null,
+                food_onhand: false,
+                supermarket_category: null,
+                parent: null,
+                numchild: 0,
+                inherit_fields: [],
+                ignore_shopping: false,
+                substitute: [],
+                substitute_siblings: false,
+                substitute_children: false,
+                substitute_onhand: false,
+                child_inherit_fields: [],
+            }
+        }
 
+        Promise.allSettled([pf]).then(r => {
             let property_types = []
             let property_values = []
 
@@ -207,15 +234,18 @@ export default {
                 property_types = r.data
             })
 
-            let p2 = apiClient.listFoodPropertys(this.food.id).then((r) => {
+            let p2
+            if (this.food.id !== undefined) {
+                p2 = apiClient.listFoodPropertys(this.food.id).then((r) => {
                     property_values = r.data
                 })
+            }
 
             Promise.allSettled([p1, p2]).then(r => {
                 property_types.forEach(fpt => {
                     let food_property = {
-                        'food_amount': 0,
+                        'food_amount': 100,
-                        'food_unit': null,
+                        'food_unit': {'name': 'g'},
                         'food': this.food,
                         'property_amount': 0,
                         'property_type': fpt,
@@ -234,20 +264,30 @@ export default {
                 })
             })
         })
-
-
     },
     methods: {
         updateFood: function () {
             let apiClient = new ApiApiFactory()
-            apiClient.updateFood(this.food.id, this.food).then((r) => {
+            let p
+            if (this.food.id !== undefined) {
+                p = apiClient.updateFood(this.food.id, this.food).then((r) => {
                     this.food = r.data
                     StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
                 }).catch(err => {
                     StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
                 })
+            } else {
+                p = apiClient.createFood(this.food).then((r) => {
+                    this.food = r.data
+                    StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_CREATE)
+                }).catch(err => {
+                    StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
+                })
+            }
 
+            Promise.allSettled([p]).then(r => {
                 this.food_properties.forEach(fp => {
+                    fp.food = this.food
                     if (fp.id === undefined) {
                         apiClient.createFoodProperty(fp).then((r) => {
                             fp = r.data
@@ -261,8 +301,9 @@ export default {
                             StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)
                         })
                     }
-
                 })
+            })
+
         },
         cancelAction: function () {
             this.$emit("hidden", "")

vue/src/components/FoodPropertyViewComponent.vue

@@ -49,24 +49,34 @@
                 <table class="table table-bordered">
                     <tr v-for="f in selected_property.food_values"
                         v-bind:key="`id_${selected_property.id}_food_${f.id}`">
-                        <td>{{ f.food }}</td>
+                        <td><a href="#" @click="openFoodEditModal(f)">{{ f.food }}</a></td>
                         <td>{{ f.value }} {{ selected_property.unit }}</td>
                     </tr>
                 </table>
             </template>
 
-
         </b-modal>
+
+        <generic-modal-form
+            :model="Models.FOOD"
+            :action="Actions.UPDATE"
+            :item1="selected_food"
+            :show="show_food_edit_modal"
+            @hidden="foodEditorHidden"
+        >
+        </generic-modal-form>
     </div>
 </template>
 
 <script>
-import {ApiMixin} from "@/utils/utils";
+import {ApiMixin, StandardToasts} from "@/utils/utils";
+import GenericModalForm from "@/components/Modals/GenericModalForm.vue";
+import {ApiApiFactory} from "@/utils/openapi/api";
 
 export default {
     name: "FoodPropertyViewComponent",
     mixins: [ApiMixin],
-    components: {},
+    components: {GenericModalForm},
     props: {
         recipe: Object,
         servings: Number,
@@ -74,6 +84,8 @@ export default {
     data() {
         return {
             selected_property: undefined,
+            selected_food: undefined,
+            show_food_edit_modal: false,
             show_total: false,
         }
     },
@@ -98,6 +110,20 @@ export default {
                     'minimumFractionDigits': 2
                 })
             }
+        },
+        openFoodEditModal: function (food) {
+            console.log(food)
+            let apiClient = ApiApiFactory()
+            apiClient.retrieveFood(food.id).then(r => {
+                this.selected_food = r.data;
+                this.show_food_edit_modal = true
+            }).catch(err => {
+                StandardToasts.makeStandardToast(this, StandardToasts.FAIL_FETCH, err)
+            })
+        },
+        foodEditorHidden: function (){
+            this.show_food_edit_modal = false;
+            this.$emit("foodUpdated", "")
         }
     },
 }

vue/src/components/Modals/GenericModalForm.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <template v-if="form_component !== undefined">
-            <component :is="form_component" :id="'modal_' + id" :show="show" @hidden="cancelAction"></component>
+            <component :is="form_component" :id="'modal_' + id" :show="show" @hidden="cancelAction" :item1="item1"></component>
         </template>
         <template v-else>
             <b-modal :id="'modal_' + id" @hidden="cancelAction" size="lg">