Skip to content

Commit

Permalink
Merge pull request #153 from CityOfNewYork/hotfix/OP-1168
Browse files Browse the repository at this point in the history 
Hotfix/OP-1168: Incorrect Due Date
  • Loading branch information
@joelbcastillo
joelbcastillo authored May 4, 2017
2 parents 47a5310 + ca10ca5 commit a842798
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 42 deletions.
32 changes: 16 additions & 16 deletions app/search/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -159,7 +159,7 @@ def search_requests(query,
overdue,
size,
start,
sort_date_submitted,
sort_date_created,
sort_date_due,
sort_title,
tz_name,
Expand All @@ -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
Expand All @@ -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")
Expand Down Expand Up @@ -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")]

Expand Down Expand Up @@ -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']}})

Expand Down
6 changes: 3 additions & 3 deletions app/search/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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')
Expand Down
14 changes: 7 additions & 7 deletions app/static/js/request/search.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
30 changes: 15 additions & 15 deletions app/templates/request/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,21 @@ <h4><label for="query">Search By</label>
<div class="col-sm-4">
{% if current_user.is_agency %}
<div class="row">
<h4><label>Date Received*</label>
<small data-toggle="popover" data-placement="top" data-trigger="hover" title="Date Received"
<h4><label>Date Submitted*</label>
<small data-toggle="popover" data-placement="top" data-trigger="hover" title="Date Submitted"
data-content="This field allows you to search for requests that were received between two specific dates.">
<span class="glyphicon glyphicon-question-sign"></span>
</small>
</h4>
<div class="col-sm-6 no-pad-left">
<label for="date-rec-from">From:</label>
<label for="date-sub-from">From:</label>
<input data-toggle="popover" data-placement="top" data-trigger="manual" data-animation="false"
type="text" id="date-rec-from" name="date_rec_from">
type="text" id="date-sub-from" name="date_sub_from">
</div>
<div class="col-sm-6 no-pad-right">
<label for="date-rec-to">To:</label>
<label for="date-sub-to">To:</label>
<input data-toggle="popover" data-placement="top" data-trigger="manual" data-animation="false"
type="text" id="date-rec-to" name="date_rec_to">
type="text" id="date-sub-to" name="date_sub_to">
</div>
</div>
<br>
Expand All @@ -130,19 +130,19 @@ <h4><label>Date Due*</label>
<strong>*From</strong> must be before <strong>To</strong>.
</div>
{% else %}
<h4><label>Date Received*</label>
<small data-toggle="popover" data-placement="top" data-trigger="hover" title="Date Received"
<h4><label>Date Submitted*</label>
<small data-toggle="popover" data-placement="top" data-trigger="hover" title="Date Submitted"
data-content="This field allows you to search for requests that were received between two specific dates.">
<span class="glyphicon glyphicon-question-sign"></span>
</small>
</h4>
<label for="date-rec-from">From:</label>
<label for="date-sub-from">From:</label>
<input data-toggle="popover" data-placement="top" data-trigger="manual" data-animation="false"
type="text" id="date-rec-from" name="date_rec_from">
type="text" id="date-sub-from" name="date_sub_from">
<br>
<label for="date-rec-to">To:</label>
<label for="date-sub-to">To:</label>
<input data-toggle="popover" data-placement="top" data-trigger="manual" data-animation="false"
type="text" id="date-rec-to" name="date_rec_to">
type="text" id="date-sub-to" name="date_sub_to">
<br>
<div id="date-req">
<strong>*From</strong> must be before <strong>To</strong>.
Expand Down Expand Up @@ -199,7 +199,7 @@ <h4><label>Status</label>
<!-- hidden inputs with out-of-form counterparts must have identical values -->
<input type="hidden" name="tz_name">
<input type="hidden" name="start">
<input type="hidden" name="sort_date_submitted">
<input type="hidden" name="sort_date_created">
<input type="hidden" name="sort_date_due">
<input type="hidden" name="sort_title">
<div class="text-right">
Expand All @@ -224,8 +224,8 @@ <h4><label>Status</label>
<div class="col-sm-2">
ID
</div>
<div class="col-sm-2 sort-field" data-sort-order="none" id="sort_date_submitted">
Date Received <span class="glyphicon" aria-hidden="true"></span>
<div class="col-sm-2 sort-field" data-sort-order="none" id="sort_date_created">
Date Submitted <span class="glyphicon" aria-hidden="true"></span>
</div>
<div class="col-sm-{% if current_user.is_agency %}2{% else %}3{% endif %} sort-field"
data-sort-order="none" id="sort_title">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/request/result_row.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{ request._id }}
</div>
<div class="col-sm-2">
{{ moment(request._source.date_submitted).format('MMM DD, YYYY') }}
{{ moment(request._source.date_created).format('MMM DD, YYYY') }}
</div>
<div class="col-sm-{% if current_user.is_agency %}2{% else %}3{% endif %}">
{% if current_user.is_agency %}
Expand Down

0 comments on commit a842798

Please sign in to comment.