diff options
Diffstat (limited to 'archaeological_warehouse/forms.py')
| -rw-r--r-- | archaeological_warehouse/forms.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index b950a5d3c..a7b6c575e 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -27,7 +27,7 @@ from django.forms.formsets import formset_factory from ishtar_common.utils import ugettext_lazy as _ from ishtar_common.models import Person, valid_id, Town, \ - SpatialReferenceSystem, Organization, valid_ids + SpatialReferenceSystem, Organization, valid_ids, person_type_pks_lazy from archaeological_operations.models import ArchaeologicalSite from archaeological_context_records.models import ContextRecord from archaeological_finds.models import TreatmentType, FindBasket, \ @@ -42,7 +42,7 @@ from bootstrap_datepicker.widgets import DatePicker from ishtar_common.forms import name_validator, reverse_lazy, \ get_form_selection, ManageOldType, FinalForm, FormSet, \ - CustomForm, FieldType, HistorySelect, FormHeader, TableSelect, \ + CustomForm, FieldType, DocumentItemSelect, FormHeader, TableSelect, \ CustomFormSearch, MultiSearchForm, LockForm from ishtar_common.forms_common import get_town_field from archaeological_finds.forms import FindMultipleFormSelection, \ @@ -99,8 +99,9 @@ class WarehouseSelect(CustomForm, TableSelect): label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-warehouse', 'warehouse' )) - name = forms.CharField(label=_(u"Name")) - warehouse_type = forms.ChoiceField(label=_(u"Warehouse type"), choices=[]) + name = forms.CharField(label=_("Name")) + warehouse_type = forms.ChoiceField(label=_("Warehouse type"), choices=[]) + town = get_town_field(label=_("Town")) def __init__(self, *args, **kwargs): super(WarehouseSelect, self).__init__(*args, **kwargs) @@ -353,7 +354,7 @@ class ContainerModifyForm(ContainerForm): return cleaned_data -class ContainerSelect(HistorySelect): +class ContainerSelect(DocumentItemSelect): _model = models.Container form_admin_name = _(u"Container - 001 - Search") form_slug = "container-001-search" @@ -390,14 +391,22 @@ class ContainerSelect(HistorySelect): archaeological_sites_context_record_name = forms.CharField( label=_(u"Archaeological site name (attached to the context record)") ) - code_patriarche = forms.IntegerField(label=_(u"Code PATRIARCHE"), + code_patriarche = forms.IntegerField(label=_("Operation - Code PATRIARCHE"), widget=OAWidget) + operation_town = get_town_field(label=_("Operation - town")) + operation_scientist = forms.IntegerField( + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person-permissive'), + associated_model=Person), + label=_("Operation - Scientist")) context_record = forms.IntegerField( label=_("Context record"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-contextrecord'), associated_model=ContextRecord), validators=[valid_id(ContextRecord)]) + find_label = forms.CharField(label=_("Find - Label")) + find_denomination = forms.CharField(label=_("Find - Denomination")) description = forms.CharField(label=_(u"Find - Description")) material_types = forms.IntegerField( label=_(u"Material type"), |