diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 3 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 2 |
6 files changed, 28 insertions, 4 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 59f683620..98da5ce10 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -29,7 +29,8 @@ from django.forms.formsets import formset_factory from django.utils.translation import ugettext_lazy as _ from ishtar_common.models import valid_id -from archaeological_operations.models import Period, Parcel, Operation +from archaeological_operations.models import Period, Parcel, Operation, \ + ArchaeologicalSite import models from ishtar_common import widgets @@ -49,6 +50,12 @@ class RecordSelect(TableSelect): operation__year = forms.IntegerField(label=_(u"Operation's year")) operation__operation_code = forms.IntegerField( label=_(u"Operation's number (index by year)")) + archaeological_sites = forms.IntegerField( + label=_("Archaelogical site"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-archaeologicalsite'), + associated_model=ArchaeologicalSite), + validators=[valid_id(ArchaeologicalSite)]) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) parcel = ParcelField(label=_(u"Parcel (section/number)")) diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index dc26fc507..883b2c85e 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -39,7 +39,8 @@ contextrecord_extra_keys = { 'datings__period': 'datings__period__pk', 'parcel_0': 'operation__parcels__section', 'parcel_1': 'operation__parcels__parcel_number', - 'label': 'label__icontains' + 'label': 'label__icontains', + 'archaeological_sites': 'operation__archaeological_sites__pk', } get_contextrecord = get_item( diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index d61704259..1498d4028 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -29,7 +29,7 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from ishtar_common.models import Person, valid_id, valid_ids -from archaeological_operations.models import Period +from archaeological_operations.models import Period, ArchaeologicalSite from archaeological_context_records.models import DatingType, DatingQuality from archaeological_warehouse.models import Warehouse import models @@ -153,6 +153,12 @@ class FindSelect(TableSelect): label=_(u"Year")) base_finds__context_record__operation__code_patriarche = \ forms.IntegerField(label=_(u"Code PATRIARCHE")) + archaeological_sites = forms.IntegerField( + label=_("Archaelogical site"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-archaeologicalsite'), + associated_model=ArchaeologicalSite), + validators=[valid_id(ArchaeologicalSite)]) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) # TODO search by warehouse material_types = forms.ChoiceField(label=_(u"Material type"), choices=[]) diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 134a17943..5306e84a5 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -43,6 +43,8 @@ find_extra_keys = { 'base_finds__context_record__operation__year__contains', 'base_finds__context_record__operation': 'base_finds__context_record__operation__pk', + 'archaeological_sites': + 'base_finds__context_record__operation__archaeological_sites__pk', 'base_finds__context_record__operation__code_patriarche': 'base_finds__context_record__operation__code_patriarche', 'datings__period': 'datings__period__pk', diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index d696f44dc..fc7b732a3 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -417,6 +417,12 @@ class OperationSelect(TableSelect): max_length=30) if settings.COUNTRY == 'fr': code_patriarche = forms.IntegerField(label="Code PATRIARCHE") + archaeological_sites = forms.IntegerField( + label=_("Archaelogical site"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-archaeologicalsite'), + associated_model=models.ArchaeologicalSite), + validators=[valid_id(models.ArchaeologicalSite)]) towns = get_town_field() if settings.ISHTAR_DPTS: towns__numero_insee__startswith = forms.ChoiceField( diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index e37a615eb..716151f9f 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -148,6 +148,8 @@ get_operation = get_item( 'associated_file__parcels__parcel_number'), 'history_creator': 'history_creator__ishtaruser__person__pk', + 'archaeological_sites': + 'archaeological_sites__pk', }, ) show_operation = show_item(models.Operation, 'operation') |