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

default properties food unit

Browse Source
This commit is contained in:
vabene1111 2023-05-29 17:37:09 +02:00
parent 326549568f
commit a53f17c1b9
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/serializer.py
View File

@ -633,7 +633,10 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
else: else:
validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users)) validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, if properties_food_unit := validated_data.pop('properties_food_unit', None):
properties_food_unit = Unit.objects.filter(name=properties_food_unit['name']).first()
obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, properties_food_unit=properties_food_unit,
defaults=validated_data) defaults=validated_data)
return obj return obj

12
vue/src/components/FoodEditor.vue
View File

@ -110,11 +110,11 @@
<b-col> <b-col>
<span v-if="uc.id"> <span v-if="uc.id">
<b-btn class="btn btn-sm" variant="danger" @click="deleteUnitConversion(uc)"><i class="fas fa-trash-alt"></i></b-btn> <b-btn class="btn btn-sm" variant="danger" @click="deleteUnitConversion(uc)"><i class="fas fa-trash-alt"></i></b-btn>
{{uc.base_amount}} {{ uc.base_amount }}
{{uc.base_unit.name}} {{ uc.base_unit.name }}
= =
{{uc.converted_amount}} {{ uc.converted_amount }}
{{uc.converted_unit.name}} {{ uc.converted_unit.name }}
</span> </span>
<b-form class="mt-1"> <b-form class="mt-1">
<b-input-group> <b-input-group>
@ -305,7 +305,7 @@ export default {
recipe: null, recipe: null,
properties: [], properties: [],
properties_food_amount: 100, properties_food_amount: 100,
properties_food_unit: null, properties_food_unit: {name: 'g'},
food_onhand: false, food_onhand: false,
supermarket_category: null, supermarket_category: null,
parent: null, parent: null,
@ -393,7 +393,7 @@ export default {
} }
) )
}, },
deleteUnitConversion: function (uc){ deleteUnitConversion: function (uc) {
this.unit_conversions = this.unit_conversions.filter(u => u !== uc) this.unit_conversions = this.unit_conversions.filter(u => u !== uc)
let apiClient = new ApiApiFactory() let apiClient = new ApiApiFactory()
apiClient.destroyUnitConversion(uc.id).then(r => { apiClient.destroyUnitConversion(uc.id).then(r => {