added ability to order property types

cookbook/helper/property_helper.py

@@ -34,7 +34,7 @@ class FoodPropertyHelper:
             caches['default'].set(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, property_types, 60 * 60)  # cache is cleared on property type save signal so long duration is fine
 
         for fpt in property_types:
-            computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'icon': fpt.icon, 'description': fpt.description, 'unit': fpt.unit, 'food_values': {}, 'total_value': 0, 'missing_value': False}
+            computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'icon': fpt.icon, 'description': fpt.description, 'unit': fpt.unit, 'order': fpt.order, 'food_values': {}, 'total_value': 0, 'missing_value': False}
 
         uch = UnitConversionHelper(self.space)
 

cookbook/migrations/0198_propertytype_order.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.10 on 2023-08-24 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0197_step_show_ingredients_table_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='propertytype',
+            name='order',
+            field=models.IntegerField(default=0),
+        ),
+    ]

cookbook/models.py

@@ -768,6 +768,7 @@ class PropertyType(models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128)
     unit = models.CharField(max_length=64, blank=True, null=True)
     icon = models.CharField(max_length=16, blank=True, null=True)
+    order = models.IntegerField(default=0)
     description = models.CharField(max_length=512, blank=True, null=True)
     category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')), (PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
     open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
@@ -786,6 +787,7 @@ class PropertyType(models.Model, PermissionModelMixin):
             models.UniqueConstraint(fields=['space', 'name'], name='property_type_unique_name_per_space'),
             models.UniqueConstraint(fields=['space', 'open_data_slug'], name='property_type_unique_open_data_slug_per_space')
         ]
+        ordering = ('order',)
 
 
 class Property(models.Model, PermissionModelMixin):

cookbook/serializer.py

@@ -528,7 +528,7 @@ class PropertyTypeSerializer(OpenDataModelMixin, WritableNestedModelSerializer,
 
     class Meta:
         model = PropertyType
-        fields = ('id', 'name', 'icon', 'unit', 'description', 'open_data_slug')
+        fields = ('id', 'name', 'icon', 'unit', 'description', 'order', 'open_data_slug')
 
 
 class PropertySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
@@ -771,7 +771,7 @@ class StepSerializer(WritableNestedModelSerializer, ExtendedRecipeMixin):
         model = Step
         fields = (
             'id', 'name', 'instruction', 'ingredients', 'ingredients_markdown',
-            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe', 
+            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe',
             'step_recipe_data', 'numrecipe', 'show_ingredients_table'
         )
 
@@ -1002,7 +1002,6 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
 
 
 class AutoMealPlanSerializer(serializers.Serializer):
-
     start_date = serializers.DateField()
     end_date = serializers.DateField()
     meal_type_id = serializers.IntegerField()