✨ criteria search: adapt searches for relative search (dates and numbers)

1 files changed, 10 insertions, 29 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index af3c4bb3d..c35cf47af 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -39,10 +39,10 @@ from archaeological_files.models import File
 from archaeological_operations.utils import parse_parcels
 from bootstrap_datepicker.widgets import DateField
 from ishtar_common import widgets
-from ishtar_common.forms import FinalForm, FormSet, get_now, \
-    reverse_lazy, TableSelect, get_data_from_formset, QAForm, CustomFormSearch,\
+from ishtar_common.forms import FinalForm, FormSet, \
+    reverse_lazy, get_data_from_formset, QAForm, CustomFormSearch,\
     ManageOldType, IshtarForm, CustomForm, FieldType, FormHeader, \
-    GeoItemSelect, LockForm, MultiSearchForm
+    GeoItemSelect, LockForm, MultiSearchForm, DocumentItemSelect
 from ishtar_common.forms_common import TownFormSet, get_town_field, TownForm
 from ishtar_common.models import valid_id, valid_ids, Person, Town, \
     DocumentTemplate, Organization, get_current_profile, \
@@ -535,10 +535,8 @@ class OperationSelect(GeoItemSelect):
                                          max_length=200)
     remains = forms.ChoiceField(label=_("Remains"), choices=[])
     periods = forms.ChoiceField(label=_("Periods"), choices=[])
-    start_before = DateField(label=_("Started before"))
-    start_after = DateField(label=_("Started after"))
-    end_before = DateField(label=_("Ended before"))
-    end_after = DateField(label=_("Ended after"))
+    start = DateField(label=_("Start date"))
+    end = DateField(label=_("Excavation end date"))
     relation_types = forms.ChoiceField(
         label=_("Search within relations"), choices=[])
     comment = forms.CharField(label=_("Comment"), max_length=500)
@@ -572,19 +570,14 @@ class OperationSelect(GeoItemSelect):
         label=_("Documentation provided"))
     documentation_deposit_date = DateField(
         label=_("Documentation deposit date"))
-    documentation_deadline_before = DateField(
-        label=_("Documentation deadline before"))
-    documentation_deadline_after = DateField(
-        label=_("Documentation deadline after"))
+    documentation_deadline = DateField(
+        label=_("Documentation deadline"))
     has_finds = forms.NullBooleanField(label=_("Has finds"))
     finds_received = forms.NullBooleanField(
         label=_("Finds provided"))
     finds_deposit_date = DateField(
         label=_("Finds deposit date"))
-    finds_deadline_before = DateField(
-        label=_("Finds deadline before"))
-    finds_deadline_after = DateField(
-        label=_("Finds deadline after"))
+    finds_deadline = DateField(label=_("Finds deadline"))
 
     TYPES = [
         FieldType('operation_type', models.OperationType),
@@ -1440,7 +1433,7 @@ class SiteUnderwaterForm(CustomForm, ManageOldType):
 ################################################
 
 
-class AdministrativeActOpeSelect(TableSelect):
+class AdministrativeActOpeSelect(DocumentItemSelect):
     _model = models.AdministrativeAct
 
     search_vector = forms.CharField(
@@ -1465,19 +1458,7 @@ class AdministrativeActOpeSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
     comment = forms.CharField(label=_("Comment"), max_length=500)
-    history_creator = forms.IntegerField(
-        label=_("Created by"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-person', args=['0', 'user']),
-            associated_model=Person),
-        validators=[valid_id(Person)])
-    history_modifier = forms.IntegerField(
-        label=_("Modified by"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-person',
-                         args=['0', 'user']),
-            associated_model=Person),
-        validators=[valid_id(Person)])
+    signature_date = DateField(label=_("Signature date"))
 
     def __init__(self, *args, **kwargs):
         super(AdministrativeActOpeSelect, self).__init__(*args, **kwargs)