diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 221eb4f82..738b634e9 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -146,10 +146,10 @@ class BaseFindForm(CustomForm, ManageOldType): field_order = [ 'label', 'denomination', 'previous_id', 'museum_id', 'seal_number', 'mark', 'description', 'is_complete', 'material_type', - 'material_type_quality', 'object_type', 'object_type_quality', - 'find_number', 'min_number_of_individuals', 'inscription', - 'decoration', 'manufacturing_place', 'communicabilitie', 'comment', - 'dating_comment', + 'material_type_quality', 'material_comment', 'object_type', + 'object_type_quality', 'find_number', 'min_number_of_individuals', + 'inscription', 'decoration', 'manufacturing_place', 'communicabilitie', + 'comment', 'dating_comment', 'length', 'width', 'height', 'thickness', 'diameter', 'circumference', 'volume', 'weight', 'clutter_long_side', 'clutter_short_side', 'clutter_height', 'dimensions_comment', 'checked_type', 'check_date' @@ -176,6 +176,9 @@ class BaseFindForm(CustomForm, ManageOldType): ) material_type_quality = forms.ChoiceField( label=_(u"Material type quality"), required=False, choices=[]) + material_comment = forms.CharField( + label=_(u"Comment on the material"), required=False, + widget=forms.Textarea) object_type = widgets.Select2MultipleField( label=_(u"Object types"), required=False, ) @@ -280,7 +283,8 @@ class FindForm(BaseFindForm): 'get_first_base_find__excavation_id', 'museum_id', 'seal_number', 'mark', 'description', 'get_first_base_find__discovery_date', 'get_first_base_find__discovery_date_taq', 'get_first_base_find__batch', - 'is_complete', 'material_type', 'material_type_quality', 'object_type', + 'is_complete', 'material_type', 'material_type_quality', + 'material_comment', 'object_type', 'object_type_quality', 'find_number', 'min_number_of_individuals', 'inscription', 'manufacturing_place', 'communicabilitie', 'comment', 'dating_comment', 'length', 'width', 'height', 'thickness', 'diameter', @@ -964,6 +968,7 @@ class FindSelect(HistorySelect): ) material_type_quality = forms.ChoiceField(label=_(u"Material type quality"), choices=[]) + material_comment = forms.CharField(label=_(u"Comment on the material")) object_types = forms.IntegerField( label=_(u"Object type"), widget=widgets.JQueryAutoComplete( @@ -1076,6 +1081,7 @@ class FindSelect(HistorySelect): choices=[], label=_(u"Treatment emergency") ) + estimated_value__higher = FloatField( label=_(u"Estimated value - higher than")) estimated_value__lower = FloatField( |