Merge branch 'master' into dependabot/pip/lxml-4.9.1

uktrade · Feb 19, 2024 · 420fe1f · 420fe1f
2 parents 3143a68 + 966fcbd
commit 420fe1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/trade_remedies_public/cases/v2_views/active_investigations.py b/trade_remedies_public/cases/v2_views/active_investigations.py
@@ -40,7 +40,7 @@ class SingleSubmissionView(BaseAnonymousPublicTemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        submission = self.client.submissions(
+        submission = self.call_client(timeout=70).submissions(
             self.kwargs["submission_id"],
             fields=[
                 "case",

diff --git a/trade_remedies_public/templates/v2/active_investigations/home.html b/trade_remedies_public/templates/v2/active_investigations/home.html
@@ -189,8 +189,8 @@ <h2 class="govuk-heading-m">Active investigations</h2>
                                     <td class="govuk-table__cell" data-order="{{ case.initiated_at|date:'U' }}">
                                         <span class="govuk-visually-hidden--desktop">Initiated: </span>{{ case.initiated_at|date:'d M Y' }}
                                     </td>
-                                    <td class="govuk-table__cell" data-order="{{ case.last_modified|date:'U' }}">
-                                        <span class="govuk-visually-hidden--desktop">Updated: </span>{{ case.last_modified|date:'d M Y' }}
+                                    <td class="govuk-table__cell" data-order="{{ case.date_last_submission_made_public|date:'U' }}">
+                                        <span class="govuk-visually-hidden--desktop">Updated: </span>{{ case.date_last_submission_made_public|date:'d M Y' }}
                                     </td>
                                 </tr>
                             {% endfor %}
@@ -314,8 +314,8 @@ <h2 class="govuk-heading-m">Completed investigations</h2>
                                         <td class="govuk-table__cell" data-order="{{ case.initiated_at|date:'U' }}">
                                             <span class="govuk-visually-hidden--desktop">Initiated: </span>{{ case.initiated_at|date:'d M Y' }}
                                         </td>
-                                        <td class="govuk-table__cell" data-order="{{ case.last_modified|date:'U' }}">
-                                            <span class="govuk-visually-hidden--desktop">Updated: </span>{{ case.last_modified|date:'d M Y' }}
+                                        <td class="govuk-table__cell" data-order="{{ case.date_last_submission_made_public|date:'U' }}">
+                                            <span class="govuk-visually-hidden--desktop">Updated: </span>{{ case.date_last_submission_made_public|date:'d M Y' }}
                                         </td>
                                     </tr>
                                 {% endfor %}

diff --git a/trade_remedies_public/templates/v2/active_investigations/single_case_view.html b/trade_remedies_public/templates/v2/active_investigations/single_case_view.html
@@ -91,14 +91,6 @@ <h2 class="govuk-heading-m">Case details</h2>
                                 in</a> to register interest.</p>
                     {% endif %}
                     <dl class="govuk-summary-list">
-                        <div class="govuk-summary-list__row">
-                            <dt class="govuk-summary-list__key">
-                                Status
-                            </dt>
-                            <dd class="govuk-summary-list__value">
-                                {{ case.get_status.stage }}
-                            </dd>
-                        </div>
                         <div class="govuk-summary-list__row">
                             <dt class="govuk-summary-list__key">
                                 Applicant
@@ -122,15 +114,7 @@ <h2 class="govuk-heading-m">Case details</h2>
                                 Last updated
                             </dt>
                             <dd class="govuk-summary-list__value">
-                                {{ case.last_modified|date:'d M Y' }}
-                            </dd>
-                        </div>
-                        <div class="govuk-summary-list__row">
-                            <dt class="govuk-summary-list__key">
-                                Registration due by
-                            </dt>
-                            <dd class="govuk-summary-list__value">
-                                {{ case.registration_deadline|date:'d M Y' }}
+                                {{ case.date_last_submission_made_public|date:'d M Y' }}
                             </dd>
                         </div>
                         <div class="govuk-summary-list__row">