From 7f30c3ff3ecf07dbba89ee2b601ecaec85c4f5bc Mon Sep 17 00:00:00 2001 From: "Hassan D. M. Sambo" Date: Mon, 30 Dec 2024 11:09:36 -0500 Subject: [PATCH 1/2] Fix for failing regression test (#4567) * Fix for failing regression test * Switched to rem --- backend/audit/templates/audit/my_submissions.html | 2 +- backend/static/scss/_table.scss | 4 ++++ backend/static/scss/main.scss | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 backend/static/scss/_table.scss diff --git a/backend/audit/templates/audit/my_submissions.html b/backend/audit/templates/audit/my_submissions.html index 1ba43e74d..f86a147b0 100644 --- a/backend/audit/templates/audit/my_submissions.html +++ b/backend/audit/templates/audit/my_submissions.html @@ -17,7 +17,7 @@

Audits in progress

The audits listed below are in progress, and you are still able to edit them before submission. Select an audit by clicking on its Status to make changes and continue the submission process. - Status + Status Entity name Report ID diff --git a/backend/static/scss/_table.scss b/backend/static/scss/_table.scss new file mode 100644 index 000000000..f149da4ec --- /dev/null +++ b/backend/static/scss/_table.scss @@ -0,0 +1,4 @@ +.status-column { + width: 7.5rem; + text-align: left; +} diff --git a/backend/static/scss/main.scss b/backend/static/scss/main.scss index 1db78aadf..848abfe0f 100644 --- a/backend/static/scss/main.scss +++ b/backend/static/scss/main.scss @@ -15,3 +15,4 @@ @use '_form'; @use '_search'; @use '_workbook-upload'; +@use '_table'; From b11e4eb04902b7c4ca1acb8782b166d6b2935a82 Mon Sep 17 00:00:00 2001 From: Phil Dominguez <142051477+phildominguez-gsa@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:32:40 -0500 Subject: [PATCH 2/2] Retaining audit year selections for search (#4569) --- .../dissemination/templates/search_filters/audit-year.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/dissemination/templates/search_filters/audit-year.html b/backend/dissemination/templates/search_filters/audit-year.html index 0156f5d0d..08041c72a 100644 --- a/backend/dissemination/templates/search_filters/audit-year.html +++ b/backend/dissemination/templates/search_filters/audit-year.html @@ -11,11 +11,7 @@ name="audit_year" type="checkbox" value={{ value }} - {% for item in form_user_input.audit_year %} - {% if item == value or item == text %} - checked - {% endif %} - {% endfor %} + {% if value in form_user_input.audit_year or text in form_user_input.audit_year %}checked{% endif %} />