diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-11 18:26:01 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-11 18:26:01 +0100 |
| commit | 5c2c0b08b7dc92a65514e12f03edb4eabb2aa1ba (patch) | |
| tree | c59aeeac0301d24ac88f4456707a03a8cb19c5ae | |
| parent | 550ef4020c6e4115dc9ae80cd0162c0b0d89948c (diff) | |
| download | Ishtar-5c2c0b08b7dc92a65514e12f03edb4eabb2aa1ba.tar.bz2 Ishtar-5c2c0b08b7dc92a65514e12f03edb4eabb2aa1ba.zip | |
Modify search criteria for operation and files (refs #1619)
| -rw-r--r-- | archaeological_files/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 31badf4cb..18e7bcc82 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -45,6 +45,10 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \ from ishtar_common import widgets class FileSelect(TableSelect): + year = forms.IntegerField(label=_("Year")) + numeric_reference = forms.IntegerField(label=_("Numeric reference")) + internal_reference = forms.CharField(max_length=200, + label=_("Other reference")) towns = get_town_field() name = forms.CharField(label=_(u"File name"), max_length=200) file_type = forms.ChoiceField(label=_("File type"), choices=[]) @@ -66,11 +70,6 @@ class FileSelect(TableSelect): txt_idx='general_contractor').pk]), associated_model=Organization), validators=[valid_id(Organization)]) - numeric_reference = forms.IntegerField( - label=_("Numeric reference")) - year = forms.IntegerField(label=_("Year")) - internal_reference = forms.CharField(max_length=200, - label=_("Other reference")) in_charge = forms.IntegerField( label=_(u"In charge"), widget=widgets.JQueryAutoComplete( diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index bcdd44cf6..2754f2d1a 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -186,6 +186,8 @@ ParcelFormSet = formset_factory(ParcelForm, can_delete=True, ParcelFormSet.form_label = _(u"Parcels") class OperationSelect(TableSelect): + year = forms.IntegerField(label=_("Year")) + operation_code = forms.IntegerField(label=_(u"Numeric reference")) common_name = forms.CharField(label=_(u"Name (full text search)"), max_length=30) if settings.COUNTRY == 'fr': @@ -201,7 +203,6 @@ class OperationSelect(TableSelect): associated_model=Person), label=_(u"In charge")) remains = forms.ChoiceField(label=_(u"Remains"), choices=[]) periods = forms.ChoiceField(label=_(u"Periods"), choices=[]) - year = forms.IntegerField(label=_("Year")) start_before = forms.DateField(label=_(u"Started before"), widget=widgets.JQueryDate) start_after = forms.DateField(label=_(u"Started after"), |