Forms (operations, context records, files): add search by parcel (refs #575)

1 files changed, 13 insertions, 4 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 564d0c6fc..ea12c984c 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -36,13 +36,14 @@ from ishtar_common.models import Person, PersonType, Town, Organization, \
 from archaeological_operations.models import ActType, AdministrativeAct
 import models
 from ishtar_common.forms import FinalForm, FormSet, ClosingDateFormSelection, \
-    formset_factory, get_now, reverse_lazy
+    formset_factory, get_now, reverse_lazy, TableSelect
 from ishtar_common.forms_common import get_town_field, get_person_field
 from archaeological_operations.forms import AdministrativeActOpeForm, \
-    AdministrativeActOpeFormSelection, FinalAdministrativeActDeleteForm
+    AdministrativeActOpeFormSelection, FinalAdministrativeActDeleteForm, \
+    ParcelField
 from ishtar_common import widgets
 
-class FileSelect(forms.Form):
+class FileSelect(TableSelect):
     towns = get_town_field()
     in_charge = get_person_field(label=_(u"Person in charge"),
                                  person_type='sra_agent')
@@ -50,12 +51,20 @@ class FileSelect(forms.Form):
                                   choices=models.FileType.get_types())
     saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
     year = forms.IntegerField(label=_("Year"))
+    parcel = ParcelField(label=_("Parcel (section/number)"))
 
     def __init__(self, *args, **kwargs):
         super(FileSelect, self).__init__(*args, **kwargs)
         self.fields['saisine_type'].choices = models.SaisineType.get_types()
         self.fields['saisine_type'].help_text = models.SaisineType.get_help()
 
+    def get_input_ids(self):
+        ids = super(FileSelect, self).get_input_ids()
+        ids.pop(ids.index('parcel'))
+        ids.append('parcel_0')
+        ids.append('parcel_1')
+        return ids
+
 class FileFormSelection(forms.Form):
     form_label = _("Archaeological file search")
     associated_models = {'pk':models.File}
@@ -170,7 +179,7 @@ class FinalFileDeleteForm(FinalForm):
     confirm_msg = " "
     confirm_end_msg = _(u"Would you like to delete this archaelogical file ?")
 
-class AdministrativeActFileSelect(forms.Form):
+class AdministrativeActFileSelect(TableSelect):
     associated_file__towns = get_town_field()
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])