Search fields for containers and warehouse

Containers:
- find: ID, label
- operation: town, scientist
Warehouse:
- town

1 files changed, 13 insertions, 4 deletions

diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index b950a5d3c..867761047 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, \
@@ -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)
@@ -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"),