diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index a99d6fed4..da394c1ef 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -62,7 +62,7 @@ from ishtar_common.forms_common import get_town_field from archaeological_context_records.forms import PeriodSelect from ishtar_common.models import valid_id, valid_ids, get_current_profile, \ - SpatialReferenceSystem, Area, OperationType, IshtarUser + SpatialReferenceSystem, Area, OperationType, IshtarUser, Person, person_type_pks_lazy from ishtar_common.utils import convert_coordinates_to_point __all__ = [ @@ -1016,23 +1016,6 @@ class FindSelect(DocumentItemSelect, PeriodSelect): label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'find' )) - base_finds__context_record__operation__address = forms.CharField(label=_("Address")) - base_finds__context_record__operation__person_in_charge = forms.IntegerField( - label=_("Person in charge"), - widget=widgets.JQueryAutoComplete( - reverse_lazy("autocomplete-person") - ) - ) - base_finds__context_record__operation__operator = forms.IntegerField( - label=_("Operator"), - widget=widgets.JQueryAutoComplete( - reverse_lazy("autocomplete-organization") - ) - ) - base_finds__context_record__operation__common_name = forms.CharField( - label=_("Operation name"), - max_length=30 - ) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination")) previous_id = forms.CharField(label=_("Previous ID")) @@ -1059,6 +1042,29 @@ class FindSelect(DocumentItemSelect, PeriodSelect): base_finds__context_record__operation__operation_type = forms.ChoiceField( label=_("Operation type"), choices=[] ) + base_finds__context_record__operation__address = forms.CharField(label=_("Operation - Address / Locality")) + base_finds__context_record__operation__in_charge = forms.IntegerField( + label=_("Operation - In charge"), + widget=widgets.JQueryAutoComplete( + reverse_lazy("autocomplete-person") + ) + ) + base_finds__context_record__operation__scientist = forms.IntegerField( + widget=widgets.JQueryAutoComplete( + reverse_lazy( + 'autocomplete-person-permissive', + args=[person_type_pks_lazy(['sra_agent', 'head_scientist'])]), + associated_model=Person), + label=_("Operation - Scientist in charge")) + base_finds__context_record__operation__operator = forms.IntegerField( + label=_("Operation - Operator"), + widget=widgets.JQueryAutoComplete( + reverse_lazy("autocomplete-organization") + ) + ) + base_finds__context_record__operation__common_name = forms.CharField( + label=_("Operation - Name"), + ) base_finds__context_record__town__areas = forms.ChoiceField( label=_("Areas"), choices=[] ) |