diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 70592bc73..808003712 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -43,18 +43,22 @@ from ishtar_common.forms_common import get_town_field, SourceSelect class FindForm(forms.Form): file_upload = True form_label = _("Find") - base_models = ['base_finds', 'object_type', 'material_type'] + base_models = ['get_first_base_find', 'object_type', 'material_type', + 'preservation_to_consider', 'integritie'] associated_models = {'material_type': models.MaterialType, 'conservatory_state': models.ConservatoryState, - 'object_type': models.ObjectType} + 'object_type': models.ObjectType, + 'preservation_to_consider': models.PreservationType, + 'integritie': models.IntegrityType} label = forms.CharField( label=_(u"Free-ID"), validators=[validators.MaxLengthValidator(60)]) previous_id = forms.CharField(label=_("Previous ID"), required=False) description = forms.CharField(label=_("Description"), widget=forms.Textarea, required=False) - base_finds__is_isolated = forms.NullBooleanField( - label=_(u"Is isolated?"), required=False) + get_first_base_find__batch = forms.ChoiceField( + label=_(u"Batch/object"), choices=models.IS_ISOLATED_CHOICES, + required=False) is_complete = forms.NullBooleanField(label=_(u"Is complete?"), required=False) material_type = widgets.MultipleAutocompleteField( @@ -63,6 +67,11 @@ class FindForm(forms.Form): choices=[], required=False) object_type = widgets.MultipleAutocompleteField( model=models.ObjectType, label=_(u"Object types"), required=False) + preservation_to_consider = widgets.MultipleAutocompleteField( + model=models.PreservationType, label=_(u"Preservation type"), + required=False) + integritie = widgets.MultipleAutocompleteField( + model=models.IntegrityType, label=_(u"Integrity"), required=False) length = FloatField(label=_(u"Length (cm)"), required=False) width = FloatField(label=_(u"Width (cm)"), required=False) height = FloatField(label=_(u"Height (cm)"), required=False) @@ -142,7 +151,8 @@ class FindSelect(TableSelect): conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"), choices=[]) base_finds__find__description = forms.CharField(label=_(u"Description")) - base_finds__is_isolated = forms.NullBooleanField(label=_(u"Is isolated?")) + base_finds__batch = forms.ChoiceField(label=_(u"Batch/object"), + choices=models.IS_ISOLATED_CHOICES) checked = forms.ChoiceField(label=_("Check")) image = forms.NullBooleanField(label=_(u"Has an image?")) |