diff --git a/app/search/utils.py b/app/search/utils.py index 5dd858582..511a5c223 100644 --- a/app/search/utils.py +++ b/app/search/utils.py @@ -147,8 +147,8 @@ def search_requests(query, agency_description, description, requester_name, - date_rec_from, - date_rec_to, + date_sub_from, + date_sub_to, date_due_from, date_due_to, agency_ein, @@ -159,7 +159,7 @@ def search_requests(query, overdue, size, start, - sort_date_submitted, + sort_date_created, sort_date_due, sort_title, tz_name, @@ -178,8 +178,8 @@ def search_requests(query, :param agency_description: search by agency description? :param description: search by description? :param requester_name: search by requester name? - :param date_rec_from: date received/submitted from - :param date_rec_to: date received/submitted to + :param date_sub_from: date submitted/created from + :param date_sub_to: date submitted/created to :param date_due_from: date due from :param date_due_to: date due to :param agency_ein: agency ein to filter by @@ -190,7 +190,7 @@ def search_requests(query, :param overdue: filter by overdue requests? :param size: number of requests per page :param start: starting index of request result set - :param sort_date_submitted: date received/submitted sort direction + :param sort_date_created: date submitted/created sort direction :param sort_date_due: date due sort direction :param sort_title: title sort direction :param tz_name: timezone name (e.g. "America/New_York") @@ -218,7 +218,7 @@ def search_requests(query, # set sort (list of "field:direction" pairs) sort = [ ':'.join((field, direction)) for field, direction in { - 'date_submitted': sort_date_submitted, + 'date_created': sort_date_created, 'date_due': sort_date_due, 'title.keyword': sort_title}.items() if direction in ("desc", "asc")] @@ -255,22 +255,22 @@ def datestr_local_to_utc(datestr): ).strftime(DT_DATE_RANGE_FORMAT) date_ranges = [] - if any((date_rec_from, date_rec_to, date_due_from, date_due_to)): + if any((date_sub_from, date_sub_to, date_due_from, date_due_to)): range_filters = {} - if date_rec_from or date_rec_to: - range_filters['date_submitted'] = {'format': ES_DATE_RANGE_FORMAT} + if date_sub_from or date_sub_to: + range_filters['date_created'] = {'format': ES_DATE_RANGE_FORMAT} if date_due_from or date_due_to: range_filters['date_due'] = {'format': ES_DATE_RANGE_FORMAT} - if date_rec_from: - range_filters['date_submitted']['gte'] = datestr_local_to_utc(date_rec_from) - if date_rec_to: - range_filters['date_submitted']['lt'] = datestr_local_to_utc(date_rec_to) + if date_sub_from: + range_filters['date_created']['gte'] = datestr_local_to_utc(date_sub_from) + if date_sub_to: + range_filters['date_created']['lt'] = datestr_local_to_utc(date_sub_to) if date_due_from: range_filters['date_due']['gte'] = datestr_local_to_utc(date_due_from) if date_due_to: range_filters['date_due']['lt'] = datestr_local_to_utc(date_due_to) - if date_rec_from or date_rec_to: - date_ranges.append({'range': {'date_submitted': range_filters['date_submitted']}}) + if date_sub_from or date_sub_to: + date_ranges.append({'range': {'date_created': range_filters['date_created']}}) if date_due_from or date_due_to: date_ranges.append({'range': {'date_due': range_filters['date_due']}}) diff --git a/app/search/views.py b/app/search/views.py index 655a9b260..b19c1cfa4 100644 --- a/app/search/views.py +++ b/app/search/views.py @@ -77,8 +77,8 @@ def requests(): eval_request_bool(request.args.get('agency_description')), eval_request_bool(request.args.get('description')) if not current_user.is_anonymous else False, eval_request_bool(request.args.get('requester_name')) if current_user.is_agency else False, - request.args.get('date_rec_from'), - request.args.get('date_rec_to'), + request.args.get('date_sub_from'), + request.args.get('date_sub_to'), request.args.get('date_due_from'), request.args.get('date_due_to'), agency_ein, @@ -89,7 +89,7 @@ def requests(): eval_request_bool(request.args.get('overdue')) if current_user.is_agency else False, size, start, - request.args.get('sort_date_submitted'), + request.args.get('sort_date_created'), request.args.get('sort_date_due'), request.args.get('sort_title'), request.args.get('tz_name') diff --git a/app/static/js/request/search.js b/app/static/js/request/search.js index 31e64b423..910ede690 100644 --- a/app/static/js/request/search.js +++ b/app/static/js/request/search.js @@ -131,21 +131,21 @@ $(function() { beforeShowDay: notHolidayOrWeekend, }; - var dateRecFromElem = $("#date-rec-from"); - var dateRecToElem = $("#date-rec-to"); + var dateSubFromElem = $("#date-sub-from"); + var dateSubToElem = $("#date-sub-to"); var dateDueFromElem = $("#date-due-from"); var dateDueToElem = $("#date-due-to"); - var dates = [dateRecFromElem, dateRecToElem, dateDueFromElem, dateDueToElem]; + var dates = [dateSubFromElem, dateSubToElem, dateDueFromElem, dateDueToElem]; for (var i = 0; i < dates.length; i++) { dates[i].datepicker(datepickerOptions); dates[i].mask("00/00/0000", {placeholder: "mm/dd/yyyy"}); } - dateRecFromElem.on("input change", function () { - valiDates(dateRecFromElem, dateRecToElem); + dateSubFromElem.on("input change", function () { + valiDates(dateSubFromElem, dateSubToElem); }); - dateRecToElem.on("input change", function () { - valiDates(dateRecFromElem, dateRecToElem); + dateSubToElem.on("input change", function () { + valiDates(dateSubFromElem, dateSubToElem); }); dateDueFromElem.on("input change", function () { valiDates(dateDueFromElem, dateDueToElem); diff --git a/app/templates/request/all.html b/app/templates/request/all.html index 6e241f5ca..56ef924ed 100644 --- a/app/templates/request/all.html +++ b/app/templates/request/all.html @@ -89,21 +89,21 @@