Finds - fields: add clutter dimensions and material, object type quality types

1 files changed, 42 insertions, 0 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index ecb4d049b..31ec20785 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -58,6 +58,19 @@ post_save.connect(post_save_cache, sender=MaterialType)
 post_delete.connect(post_save_cache, sender=MaterialType)
 
 
+class MaterialTypeQualityType(GeneralType):
+    order = models.IntegerField(_(u"Order"), default=10)
+
+    class Meta:
+        verbose_name = _(u"Material type quality type")
+        verbose_name_plural = _(u"Material type quality types")
+        ordering = ('order',)
+
+
+post_save.connect(post_save_cache, sender=MaterialTypeQualityType)
+post_delete.connect(post_save_cache, sender=MaterialTypeQualityType)
+
+
 class ConservatoryState(HierarchicalType):
     class Meta:
         verbose_name = _(u"Conservatory state")
@@ -140,6 +153,19 @@ post_save.connect(post_save_cache, sender=ObjectType)
 post_delete.connect(post_save_cache, sender=ObjectType)
 
 
+class ObjectTypeQualityType(GeneralType):
+    order = models.IntegerField(_(u"Order"), default=10)
+
+    class Meta:
+        verbose_name = _(u"Object type quality type")
+        verbose_name_plural = _(u"Object type quality types")
+        ordering = ('order',)
+
+
+post_save.connect(post_save_cache, sender=ObjectTypeQualityType)
+post_delete.connect(post_save_cache, sender=ObjectTypeQualityType)
+
+
 class AlterationType(HierarchicalType):
     class Meta:
         verbose_name = _(u"Alteration type")
@@ -701,6 +727,11 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
         MaterialType, verbose_name=_(u"Material types"), related_name='finds',
         blank=True
     )
+    material_type_quality = models.ForeignKey(
+        MaterialTypeQualityType,
+        verbose_name=_(u"Material type quality"), related_name='finds',
+        blank=True, null=True
+    )
     volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True)
     weight = models.FloatField(_(u"Weight"), blank=True, null=True)
     weight_unit = models.CharField(_(u"Weight unit"), max_length=4,
@@ -725,6 +756,11 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
         ObjectType, verbose_name=_(u"Object types"), related_name='find',
         blank=True
     )
+    object_type_quality = models.ForeignKey(
+        ObjectTypeQualityType,
+        verbose_name=_(u"Object type quality"), related_name='finds',
+        blank=True, null=True
+    )
     integrities = models.ManyToManyField(
         IntegrityType, verbose_name=_(u"Integrity / interest"),
         related_name='find', blank=True)
@@ -741,6 +777,12 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
     height = models.FloatField(_(u"Height (cm)"), blank=True, null=True)
     diameter = models.FloatField(_(u"Diameter (cm)"), blank=True, null=True)
     thickness = models.FloatField(_(u"Thickness (cm)"), blank=True, null=True)
+    clutter_long_side = models.FloatField(
+        _(u"Clutter - long side (cm)"), blank=True, null=True)
+    clutter_short_side = models.FloatField(
+        _(u"Clutter - short side (cm)"), blank=True, null=True)
+    clutter_height = models.FloatField(
+        _(u"Clutter - height (cm)"), blank=True, null=True)
     dimensions_comment = models.TextField(_(u"Dimensions comment"),
                                           blank=True, null=True)
     mark = models.TextField(_(u"Mark"), blank=True, null=True)