Improve administrative act (files) search (refs #1533)

1 files changed, 11 insertions, 1 deletions

diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 8fcde9ea0..9a866c311 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -25,11 +25,15 @@ from django.shortcuts import render_to_response
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.views import get_item, show_item, revert_item
+
+from ishtar_common.models import Person
 from archaeological_operations.models import AdministrativeAct
 import models
+
 from ishtar_common.wizards import SearchWizard
 from archaeological_operations.wizards import is_preventive
 from wizards import *
+
 from ishtar_common.forms_common import TownFormset
 from archaeological_operations.forms import ParcelFormSet
 from forms import *
@@ -74,9 +78,15 @@ revert_file = revert_item(models.File)
 
 get_administrativeactfile = get_item(AdministrativeAct,
         'get_administrativeactfile', 'administrativeactfile',
+      associated_models = [(models.File, 'associated_file'),
+                           (Person, 'associated_file__general_contractor')],
+      dated_fields = ['signature_date__lte', 'signature_date__gte'],
       extra_request_keys={'associated_file__towns':'associated_file__towns__pk',
                           'operation__towns':'operation__towns__pk',
-                          'act_type__intented_to':'act_type__intented_to'})
+                          'act_type__intented_to':'act_type__intented_to',
+                          'signature_date_before':'signature_date__lte',
+                          'signature_date_after':'signature_date__gte',
+                          })
 
 def dashboard_file(request, *args, **kwargs):
     """