diff --git a/app/request/forms.py b/app/request/forms.py index a139a70d6..e02af2a34 100644 --- a/app/request/forms.py +++ b/app/request/forms.py @@ -91,7 +91,7 @@ class AgencyUserRequestForm(Form): request_agency = SelectField('Agency (required)', choices=None) request_title = StringField('Request Title (required)') request_description = TextAreaField('Request Description (required)') - request_date = DateTimeField("Date (required)", format="%Y-%m-%d", default=datetime.today) + request_date = DateTimeField("Date (required)", format="%m/%d/%Y", default=datetime.today) # Personal Information # TODO: when refactoring these classes, include length and other validators diff --git a/app/static/js/request/new-request-agency.js b/app/static/js/request/new-request-agency.js index d750517b2..a97bc5b32 100755 --- a/app/static/js/request/new-request-agency.js +++ b/app/static/js/request/new-request-agency.js @@ -56,7 +56,7 @@ $(document).ready(function () { // Datepicker for date request was received when creating a new request $(".dtpick").datepicker({ - dateFormat: "yy-mm-dd", + dateFormat: "mm/dd/yy", maxDate: 0 }).keydown(function (e) { // prevent keyboard input except for tab diff --git a/app/templates/request/events/row.html b/app/templates/request/events/row.html index 5aa0964ad..ba0e24450 100644 --- a/app/templates/request/events/row.html +++ b/app/templates/request/events/row.html @@ -5,7 +5,7 @@ {{ row_num }}
- {{ moment(event.timestamp).format('D/M/YY h:mm A') }} + {{ moment(event.timestamp).format('MM/DD/YYYY h:mm A') }}
diff --git a/app/templates/request/responses/modal_body/determinations.html b/app/templates/request/responses/modal_body/determinations.html index 7a198108a..f33b7e01f 100644 --- a/app/templates/request/responses/modal_body/determinations.html +++ b/app/templates/request/responses/modal_body/determinations.html @@ -1,10 +1,10 @@ {% if response.dtype in (determination_type.ACKNOWLEDGMENT, determination_type.REOPENING) %} -

Expected date of completion: {{ moment(response.date).format('dddd, MMMM D, YYYY [at] h:mm A')}}

+

Expected date of completion: {{ moment(response.date).format('dddd, MM/DD/YYYY [at] h:mm A')}}

{% if response.reason is not none %}

{{ response.reason }}

{% endif %} {% elif response.dtype == determination_type.EXTENSION %} -

Due date changed to: {{ moment(response.date).format('dddd, MMMM D, YYYY [at] h:mm A') }}

+

Due date changed to: {{ moment(response.date).format('dddd, MM/DD/YYYY [at] h:mm A') }}

{% if response.reason is not none %}

{{ response.reason }}

{% endif %} diff --git a/app/templates/request/responses/row.html b/app/templates/request/responses/row.html index 4fb02095e..9bc0775f1 100644 --- a/app/templates/request/responses/row.html +++ b/app/templates/request/responses/row.html @@ -1,15 +1,15 @@
{{ row_num }}
-
{{ response | format_response_type }}
{% if current_user.is_agency %} -
- {{ moment(response.date_modified).format('dddd, MMMM D, YYYY [at] h:mm A') }} +
+ {{ moment(response.date_modified).format('dddd, MM/DD/YYYY [at] h:mm A') }}
- {{ moment(response.date_modified).format('dddd, MMMM D, YYYY [at] h:mm A') }} + {{ moment(response.date_modified).format('dddd, MM/DD/YYYY [at] h:mm A') }}
{% endif %}
\ No newline at end of file diff --git a/app/templates/request/result_row.html b/app/templates/request/result_row.html index 1d993a449..ec3dfb250 100644 --- a/app/templates/request/result_row.html +++ b/app/templates/request/result_row.html @@ -24,7 +24,7 @@ {{ request._id }}
- {{ moment(request._source.date_received).format('MMM DD, YYYY') }} + {{ moment(request._source.date_received).format('MM/DD/YYYY') }}
{% if current_user.is_agency %} @@ -43,11 +43,11 @@
{% endif %}
- {{ moment(request._source.date_due).format('MMM DD, YYYY') }} + {{ moment(request._source.date_due).format('MM/DD/YYYY') }}
{% if current_user.is_agency %}
- {{ moment(request._source.date_closed).format('MMM DD, YYYY') if request._source.date_closed else '' }} + {{ moment(request._source.date_closed).format('MM/DD/YYYY') if request._source.date_closed else '' }}
{{ request._source.requester_name }}