Merge pull request #1515 from stevenc987/main

NAME REQUEST - NAME RESULT LETTER - APPROVED DATE INCORRECT#20141
bcgov · Mar 14, 2024 · 0478cc7 · 0478cc7
2 parents 26c9de9 + 6f9c7d1
commit 0478cc7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py
@@ -1,2 +1,2 @@
-__version__ = '1.1.49'
+__version__ = '1.1.50'
 
diff --git a/api/namex/resources/name_requests/report_resource.py b/api/namex/resources/name_requests/report_resource.py
@@ -278,7 +278,8 @@ def _get_template_data(nr_model):
                 action_text = actions_obj.get('DEFAULT')
             if action_text:
                 nr_report_json['nextAction'] = action_text
-        nr_report_json['approvalDate'] = datetime.today().strftime('%B %-d, %Y')
+        nr_report_json['retrievalDateTime'] = datetime.now().astimezone(timezone('US/Pacific')).strftime(DATE_FORMAT)
+
         nr_report_json['hasUnreviewedNames'] = ReportResource._hasUnReviewedNames(nr_report_json['names'])
         return nr_report_json
 

diff --git a/api/report-templates/template-parts/name-request/nrDetails.html b/api/report-templates/template-parts/name-request/nrDetails.html
@@ -5,7 +5,7 @@
            <div class="bold">Business Type:</div>
            <div class="bold pt-2">Request Status:</div>
            <div class="bold pt-2">Request Type:</div>
-           <div class="bold pt-2">Approval Date:</div>
+           <div class="bold pt-2">Retrieval Time:</div>
         </td>
         <td>
            <div>
@@ -16,7 +16,7 @@
             {% endif %}
            <div class="pt-2">{{ nrStateDescription }}</div>
            <div class="pt-2">{{ requestCodeDescription }}</div>
-           <div class="pt-2">{{ approvalDate }} Pacific Time</div>
+           <div class="pt-2">{{ retrievalDateTime }}</div>
         </td>
       </tr>
    </table>