diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 1 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 40be1b7de..fe6534ea8 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -62,6 +62,7 @@ from archaeological_operations.forms import ( RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase, ) +from ishtar_common.models import Person from archaeological_operations.models import ( Period, Parcel, @@ -301,6 +302,7 @@ class RecordFormGeneral(CustomForm, ManageOldType): "texture": models.TextureType, "color": models.ColorType, "inclusion": models.InclusionType, + "excavator": Person, } pk = forms.IntegerField(required=False, widget=forms.HiddenInput) operation_id = forms.IntegerField(widget=forms.HiddenInput) @@ -319,6 +321,13 @@ class RecordFormGeneral(CustomForm, ManageOldType): comment = forms.CharField( label=_("General comment"), widget=forms.Textarea, required=False ) + excavator = forms.IntegerField( + label=_("Excavator"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person'), + associated_model=Person, + new=True), + validators=[valid_id(Person)], required=False) HEADERS["excavation_technic"] = FormHeader(_("Description")) excavation_technic = forms.MultipleChoiceField( label=_("Excavation techniques"), diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index c1a03e79e..a832e2476 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -751,6 +751,7 @@ class ContextRecord( SearchVectorConfig("datings_comment", "local"), SearchVectorConfig("unit__label"), SearchVectorConfig("activity__label"), + SearchVectorConfig("excavator__raw_name", "raw"), ] M2M_SEARCH_VECTORS = [ SearchVectorConfig("datings__period__label", "local"), diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 7bf5f8a18..4fa06e7bf 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -242,6 +242,7 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_original_repro": models.OriginalReproduction, "museum_donor": BiographicalNote, "museum_former_collection": BiographicalNote, + "discovery_method": models.DiscoveryMethod, #'collection': Warehouse, } field_order = [ @@ -278,6 +279,7 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_purchase_price", "description", "public_description", + "discovery_method", "is_complete", "material_type", "material_type_quality", @@ -434,6 +436,7 @@ class BasicFindForm(CustomForm, ManageOldType): label=_("Public description"), widget=forms.Textarea, required=False ) is_complete = forms.NullBooleanField(label=_("Is complete?"), required=False) + discovery_method = forms.ChoiceField(label=_("Discovery method"), required=False, choices=[]) material_type = widgets.Select2MultipleField( label=_("Material types"), required=False ) @@ -556,6 +559,7 @@ class BasicFindForm(CustomForm, ManageOldType): is_multiple=True, extra_args={"full_hierarchy": True}, ), + FieldType("discovery_method", models.DiscoveryMethod), FieldType("object_type_quality", models.ObjectTypeQualityType), FieldType("functional_area", models.FunctionalArea, is_multiple=True), FieldType("technical_area", models.TechnicalAreaType, is_multiple=True), @@ -649,6 +653,7 @@ class FindForm(BasicFindForm): "museum_inventory_transcript", "description", "public_description", + "discovery_method", "get_first_base_find__comment", "get_first_base_find__discovery_date", "get_first_base_find__discovery_date_taq", |