Merge pull request #1111 from alphagov/dev

v0.7.35 - Fix search link parameters on Dashboard

Author: ahernp

accessibility_monitoring_platform/apps/audits/templates/audits/helpers/test_summary.html

@@ -217,6 +217,7 @@ <h2 id="page-{{ page.id }}" class="govuk-heading-m govuk-!-font-size-19 govuk-!-
                     </table>
                 </div>
             </div>
+            {% include 'common/top_and_bottom.html' %}
         {% endfor %}
     {% else %}
         {% for wcag_definition, failures in audit_failures_by_wcag.items %}
@@ -284,6 +285,7 @@ <h2 id="wcag-{{ wcag_definition.id }}" class="govuk-heading-m govuk-body govuk-!
                     </table>
                 </div>
             </div>
+            {% include 'common/top_and_bottom.html' %}
         {% endfor %}
         {% if pages_with_retest_notes %}
             <h2 id="additional-page-issues" class="govuk-heading-m govuk-!-font-size-19 govuk-!-font-weight-bold">Additional issues found on page ({{ pages_with_retest_notes|length }})</h2>
@@ -334,6 +336,7 @@ <h2 id="additional-page-issues" class="govuk-heading-m govuk-!-font-size-19 govu
                 {% endfor %}
                 </tbody>
             </table>
+            {% include 'common/top_and_bottom.html' %}
         {% endif %}
     {% endif %}
 {% endif %}
@@ -345,5 +348,8 @@ <h2 id="additional-page-issues" class="govuk-heading-m govuk-!-font-size-19 govu
         {% else %}
             {% include 'audits/helpers/test_summary_initial_statement_content.html' %}
         {% endif %}
+        {% include 'common/top_and_bottom.html' %}
     {% endfor %}
 {% endif %}
+
+<hr id="bottom-of-page" class="amp-width-100 amp-margin-bottom-30">

accessibility_monitoring_platform/apps/common/templates/common/case_form.html

@@ -21,7 +21,7 @@
                 {% block nav %}
                     {% if case.archive %}
                         <p class="govuk-body-s amp-margin-bottom-10">
-                            <a href="{% url 'simplified:case-detail' case.id %}" class="govuk-link govuk-link--no-visited-state">Return to case overview</a>
+                            <a href="{{ case.get_absolute_url }}" class="govuk-link govuk-link--no-visited-state">Return to case overview</a>
                         </p>
                     {% endif %}
                     {% if case.test_type == 'simplified' %}

accessibility_monitoring_platform/apps/common/templates/common/top_and_bottom.html

@@ -0,0 +1,6 @@
+<div class="govuk-grid-row amp-margin-bottom-20 amp-margin-top-20">
+    <div class="govuk-grid-column-full govuk-button-group">
+        ▼ &nbsp; <a href="#bottom-of-page" class="govuk-link govuk-link--no-visited-state">Go to bottom of page</a>
+        ▲ &nbsp; {% include 'common/back_to_top.html' %}
+    </div>
+</div>

accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/simplified_nav.html

@@ -76,8 +76,8 @@
         Case closed and waiting to be sent to equalities body - {{ cases_by_status.case_closed_waiting_to_be_sent|length }}{% if cases_by_status.case_closed_waiting_to_be_sent %}</a>{% endif %}
     </p>
     <p class="govuk-body govuk-!-font-size-16 amp-margin-bottom-10">
-        Case closed and sent to equalities body - 
-        <a href="{% url 'cases:case-list' %}?{% if show_all_cases %}{% else %}auditor={{ user.id }}&{% endif %}status=case-closed-sent-to-equalities-body" class="govuk-link govuk-link--no-visited-state">
+        Case closed and sent to equalities body -
+        <a href="{% url 'cases:case-list' %}?{% if filter == 'all-cases' %}{% else %}auditor={{ user.id }}&{% endif %}status=180-case-closed-sent-to-equalities-body" class="govuk-link govuk-link--no-visited-state">
             View in search</a>
     </p>
     <p class="govuk-body govuk-!-font-size-16 amp-margin-bottom-10">
@@ -87,8 +87,8 @@
         In correspondence with equalities body - {{ cases_by_status.in_correspondence_with_equalities_body|length }}{% if cases_by_status.in_correspondence_with_equalities_body %}</a>{% endif %}
     </p>
     <p class="govuk-body govuk-!-font-size-16 amp-margin-bottom-10">
-        Completed cases - 
-        <a href="{% url 'cases:case-list' %}?{% if show_all_cases %}{% else %}auditor={{ user.id }}&{% endif %}status=complete" class="govuk-link govuk-link--no-visited-state">
+        Completed cases -
+        <a href="{% url 'cases:case-list' %}?{% if filter == 'all-cases' %}{% else %}auditor={{ user.id }}&{% endif %}status=200-complete" class="govuk-link govuk-link--no-visited-state">
             View in search</a>
     </p>
 </nav>

accessibility_monitoring_platform/apps/dashboard/tests/test_views.py

@@ -98,7 +98,7 @@ def test_dashboard_shows_link_to_closed_and_sent_cases(admin_client, admin_user)
 
     assertContains(
         response,
-        f"""<a href="/cases/?auditor={admin_user.id}&status=case-closed-sent-to-equalities-body"
+        f"""<a href="/cases/?auditor={admin_user.id}&status=180-case-closed-sent-to-equalities-body"
             class="govuk-link govuk-link--no-visited-state">
                 View in search</a>""",
         html=True,
@@ -173,7 +173,7 @@ def test_dashboard_shows_link_to_completed_cases(admin_client, admin_user):
 
     assertContains(
         response,
-        f"""<a href="/cases/?auditor={admin_user.id}&status=complete"
+        f"""<a href="/cases/?auditor={admin_user.id}&status=200-complete"
             class="govuk-link govuk-link--no-visited-state">
                 View in search</a>""",
         html=True,

accessibility_monitoring_platform/apps/detailed/templates/detailed/details/details_psb_zendesk_tickets.html

@@ -6,7 +6,7 @@
     {% endif %}
     {% for zendesk_ticket in case.zendesk_tickets %}
         <p class="govuk-body-m"><b>PSB Zendesk ticket #{{ zendesk_ticket.id_within_case }}</b></p>
-        <table class="govuk-table" data-search-target-page-name="" data-search-target-label="PSB Zendesk tickets" data-search-target-url="{% url 'simplified:zendesk-tickets' case.id %}">
+        <table class="govuk-table" data-search-target-page-name="" data-search-target-label="PSB Zendesk tickets" data-search-target-url="{% url 'detailed:zendesk-tickets' case.id %}">
             <tbody class="govuk-table__body">
                 <tr class="govuk-table__row">
                     <th scope="row" class="govuk-table__header amp-font-weight-normal amp-width-one-half">Summary</th>

accessibility_monitoring_platform/apps/notifications/templates/notifications/task_list.html

@@ -189,7 +189,7 @@ <h2 class="govuk-heading-m amp-margin-bottom-20">
                                         <b>Case</b>
                                     </div>
                                     <div>
-                                        <a href="{% url 'simplified:case-detail' task.base_case.id %}" class="govuk-link govuk-link--no-visited-state">{{ task.base_case.organisation_name }}</a>
+                                        <a href="{{ task.base_case.get_absolute_url }}" class="govuk-link govuk-link--no-visited-state">{{ task.base_case.organisation_name }}</a>
                                     </div>
                                 </div>
                                 <div class="amp-margin-bottom-10 amp-column-view-parent">