Merge pull request #307 from CityOfNewYork/hotfix/OP-1241

Hotfix/OP-1241: Use consistent date formatting
CityOfNewYork · Feb 23, 2018 · 0b3655e · 0b3655e
2 parents d6a954d + 2dd6775
commit 0b3655e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -5,7 +5,7 @@
             {{ row_num }}
         </div>
         <div class="col-sm-9 text-right">
-            {{ moment(event.timestamp).format('D/M/YY h:mm A') }}
+            {{ moment(event.timestamp).format('MM/DD/YYYY h:mm A') }}
         </div>
     </div>
     <div class="row history-row-content">

diff --git 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) %}
-    <p>Expected date of completion: <strong>{{ moment(response.date).format('dddd, MMMM D, YYYY [at] h:mm A')}}</strong></p>
+    <p>Expected date of completion: <strong>{{ moment(response.date).format('dddd, MM/DD/YYYY [at] h:mm A')}}</strong></p>
     {% if response.reason is not none %}
         <p>{{ response.reason }}</p>
     {% endif %}
 {% elif response.dtype == determination_type.EXTENSION %}
-    <p>Due date changed to: <strong>{{ moment(response.date).format('dddd, MMMM D, YYYY [at] h:mm A') }}</strong></p>
+    <p>Due date changed to: <strong>{{ moment(response.date).format('dddd, MM/DD/YYYY [at] h:mm A') }}</strong></p>
     {% if response.reason is not none %}
         <p>{{ response.reason }}</p>
     {% endif %}

diff --git a/app/templates/request/responses/row.html b/app/templates/request/responses/row.html
@@ -1,15 +1,15 @@
 <div class="row response-row" data-toggle="modal" data-target="#response-modal-{{ response.id }}"
      data-backdrop="static" data-keyboard="false">
     <div class="col-md-1 response-row-num">{{ row_num }}</div>
-    <div class="col-md-{% if current_user.is_agency %}5{% else %}2{% endif %}
+    <div class="col-md-{% if current_user.is_agency %}6{% else %}2{% endif %}
     {% if response.type == response_type.INSTRUCTIONS %}offline-instructions-row{% endif %}
     {% if response.dtype == determination_type.REOPENING %}re-opened-row{% endif %}">
         <strong>{{ response | format_response_type }}</strong>
     </div>
 
     {% if current_user.is_agency %}
-        <div class="col-md-6 text-right">
-            {{ moment(response.date_modified).format('dddd, MMMM D, YYYY [at] h:mm A') }}
+        <div class="col-md-5 text-right">
+            {{ moment(response.date_modified).format('dddd, MM/DD/YYYY [at] h:mm A') }}
         </div>
         <div class="row">
             <div class="col-md-10 metadata-preview">
@@ -25,7 +25,7 @@
             {% endif %}
         </div>
         <div class="col-md-3">
-            {{ 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') }}
         </div>
     {% endif %}
 </div>
diff --git a/app/templates/request/result_row.html b/app/templates/request/result_row.html
@@ -24,7 +24,7 @@
                 {{ request._id }}
             </div>
             <div class="col-sm-2">
-                {{ moment(request._source.date_received).format('MMM DD, YYYY') }}
+                {{ moment(request._source.date_received).format('MM/DD/YYYY') }}
             </div>
             <div class="col-sm-{% if current_user.is_agency %}1{% else %}3{% endif %}">
                 {% if current_user.is_agency %}
@@ -43,11 +43,11 @@
                 </div>
             {% endif %}
             <div class="col-sm-2">
-                {{ moment(request._source.date_due).format('MMM DD, YYYY') }}
+                {{ moment(request._source.date_due).format('MM/DD/YYYY') }}
             </div>
             {% if current_user.is_agency %}
                 <div class="col-sm-2">
-                    {{ 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 '' }}
                 </div>
                 <div class="col-sm-2">
                     {{ request._source.requester_name }}