Skip to content

Commit ce2172c

Browse files
richardboredrichardbored
authored
Merge pull request #1125 from alphagov/2108-fix-bugs-in-dashboard
2108: Fixed dashboard errors
2 parents 76d8336 + 56f3eae commit ce2172c

11 files changed

Lines changed: 15 additions & 15 deletions

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/10_reviewing_changes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Update acknowledged</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/11_final_decision_due.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">12-week review date</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/12_in_correspondence_with_equality_body.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">12-week review date</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/1_new_cases_table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<th scope="col" class="govuk-table__header amp-width-15-percent">Date created</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
1010
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
11-
{% if show_all_cases %}
11+
{% if filter == "all-cases" %}
1212
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1313
{% else %}
1414
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/2_tests_in_progress_table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Date created</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/3_reports_in_progress_table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Date created</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Step progress</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/4_qa_in_progress_table.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<table class="govuk-table">
55
<thead class="govuk-table__head">
66
<tr class="govuk-table__row">
7-
<th scope="col" class="govuk-table__header amp-width-15-percent">Date created</th>
7+
<th scope="col" class="govuk-table__header amp-width-15-percent">Date of test</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">QA Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>
@@ -17,7 +17,7 @@
1717
<tbody class="govuk-table__body">
1818
{% for case in cases %}
1919
<tr class="govuk-table__row ">
20-
<th scope="row" class="govuk-table__header amp-width-15-percent govuk-!-font-weight-regular">{{ case.created|amp_date_trunc }}</th>
20+
<th scope="row" class="govuk-table__header amp-width-15-percent govuk-!-font-weight-regular">{{ case.audit.date_of_test|amp_date_trunc }}</th>
2121
<td class="govuk-table__cell amp-width-one-quarter">
2222
<a href="{{ case.get_absolute_url }}" class="govuk-link">{{ case.organisation_name|truncatechars:25 }}</a>
2323
</td>
@@ -30,7 +30,7 @@
3030
No auditor
3131
{% endif %}
3232
{% else %}
33-
<a href="{% url 'simplified:edit-qa-approval' case.id %}" class="govuk-link"> {{case.get_report_approved_status_display}} </a>
33+
<a href="{% url 'simplified:edit-qa-auditor' case.id %}" class="govuk-link"> {{case.get_report_approved_status_display}} </a>
3434
{% endif %}
3535
</td>
3636
</tr>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/6_report_ready_to_send.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Date created</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/7_in_report_correspondence.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Next action due</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>

‎accessibility_monitoring_platform/apps/dashboard/templates/dashboard/simplified/8_in_probation_period.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<th scope="col" class="govuk-table__header amp-width-15-percent">Next action due</th>
88
<th scope="col" class="govuk-table__header amp-width-one-quarter">Case</th>
99
<th scope="col" class="govuk-table__header amp-width-one-quarter">Full URL</th>
10-
{% if show_all_cases %}
10+
{% if filter == "all-cases" %}
1111
<th scope="col" class="govuk-table__header amp-width-one-quarter">Auditor</th>
1212
{% else %}
1313
<th scope="col" class="govuk-table__header amp-width-one-quarter">Current step</th>
@@ -33,7 +33,7 @@
3333
{% endif %}
3434
{% else %}
3535
<a href="{% url 'simplified:manage-contact-details' case.id %}" class="govuk-link">
36-
{% if case.report_followup_week_12_due_date < today %}
36+
{% if case.report_followup_week_12_due_date <= today %}
3737
Overdue
3838
{% else %}
3939
Waiting for 12-weeks deadline

0 commit comments

Comments
 (0)