From 0e15946c130034d7a049b3f456b3b351166bba6e Mon Sep 17 00:00:00 2001 From: James Person Date: Fri, 19 Jul 2024 13:28:41 -0400 Subject: [PATCH] Enable djLint "Django" Profile (#4102) * Django specific linting: report_submission * Django specific linting: ./audit * Django specific linting: ./dissemination * Django specific linting, ./templates * Django specific linting: ./djangooidc * Use djlint profile "django" in pyproject.toml --- .../audit/auditee-certification-step-1.html | 2 +- .../audit/templates/audit/my_submissions.html | 2 +- .../submission_checklist/section_block.html | 4 +- .../submission-checklist.html | 26 +-- .../tribal-data-release.html | 8 +- .../submission_checklist/validation.html | 4 +- backend/audit/templates/uswds_sprite.html | 2 +- backend/dissemination/templates/search.html | 52 +++--- .../search_filters/direct_funding.html | 2 +- .../templates/search_filters/entity-type.html | 2 +- .../templates/search_filters/findings.html | 2 +- .../search_filters/fy-end-month.html | 6 +- .../search_filters/major-program.html | 2 +- backend/dissemination/templates/summary.html | 8 +- backend/djangooidc/templates/401.html | 4 +- backend/djangooidc/templates/500.html | 4 +- backend/pyproject.toml | 4 + .../templates/cancel-button.html | 2 +- .../report_submission/delete-file-page.html | 4 +- .../templates/report_submission/gen-form.html | 2 +- .../templates/report_submission/step-1.html | 2 +- .../templates/report_submission/step-2.html | 2 +- .../templates/report_submission/step-3.html | 2 +- .../report_submission/step-base.html | 4 +- .../report_submission/upload-page.html | 10 +- .../report_submission/templates/sidenav.html | 164 ++++++++---------- backend/templates/401.html | 4 +- backend/templates/base.html | 12 +- backend/templates/home.html | 2 +- backend/templates/includes/nav_primary.html | 6 +- backend/templates/post.html | 2 +- 31 files changed, 168 insertions(+), 184 deletions(-) diff --git a/backend/audit/templates/audit/auditee-certification-step-1.html b/backend/audit/templates/audit/auditee-certification-step-1.html index c01de146d7..016455f502 100644 --- a/backend/audit/templates/audit/auditee-certification-step-1.html +++ b/backend/audit/templates/audit/auditee-certification-step-1.html @@ -118,7 +118,7 @@

Check the box next to each item confirm your report mee
Cancel + href="{% url 'audit:SubmissionProgress' report_id %}">Cancel
diff --git a/backend/audit/templates/audit/my_submissions.html b/backend/audit/templates/audit/my_submissions.html index 3bbd72dea1..b570b99fd8 100644 --- a/backend/audit/templates/audit/my_submissions.html +++ b/backend/audit/templates/audit/my_submissions.html @@ -40,7 +40,7 @@

Audits in progress

(Unlock)

- {% endif%} + {% endif %} {{ item.auditee_name }} {{ item.report_id }} diff --git a/backend/audit/templates/audit/submission_checklist/section_block.html b/backend/audit/templates/audit/submission_checklist/section_block.html index b5ce427630..944b0f7928 100644 --- a/backend/audit/templates/audit/submission_checklist/section_block.html +++ b/backend/audit/templates/audit/submission_checklist/section_block.html @@ -11,7 +11,7 @@ {% load sprite_helper %}
  • - {% include './icon-list-icon.html' with completed=completed display=display %} + {% include "./icon-list-icon.html" with completed=completed display=display %} {% comment %} 1. Completed {% endcomment %} {% if completed %} @@ -22,7 +22,7 @@ {% if text_nb %}{{ text_nb }}{% endif %}

    - {% include './created-by.html' with name=completed_by time=completed_date %} + {% include "./created-by.html" with name=completed_by time=completed_date %}

    {{ edit_text }} diff --git a/backend/audit/templates/audit/submission_checklist/submission-checklist.html b/backend/audit/templates/audit/submission_checklist/submission-checklist.html index 6acb173a6b..e24ecff0c5 100644 --- a/backend/audit/templates/audit/submission_checklist/submission-checklist.html +++ b/backend/audit/templates/audit/submission_checklist/submission-checklist.html @@ -12,13 +12,13 @@

    - {% include './title.html' with auditee_name=auditee_name %} + {% include "./title.html" with auditee_name=auditee_name %}

    Search single audit reports

    - {% include "search-alert-info.html"%} + {% include "search-alert-info.html" %} {% if results|length > 0 %}
    Search single audit reports

    - {{ results.start_index }}-{{results.end_index}} of {{ results_count|intcomma }} results in {{ total_time_s|floatformat }} seconds. + {{ results.start_index }}-{{ results.end_index }} of {{ results_count|intcomma }} results in {{ total_time_s|floatformat }} seconds.

    {% if results_count <= summary_report_download_limit %}
    diff --git a/backend/dissemination/templates/search_filters/entity-type.html b/backend/dissemination/templates/search_filters/entity-type.html index e4e075f3e3..a809148abc 100644 --- a/backend/dissemination/templates/search_filters/entity-type.html +++ b/backend/dissemination/templates/search_filters/entity-type.html @@ -9,7 +9,7 @@
    diff --git a/backend/dissemination/templates/search_filters/findings.html b/backend/dissemination/templates/search_filters/findings.html index 548a310332..fabf090363 100644 --- a/backend/dissemination/templates/search_filters/findings.html +++ b/backend/dissemination/templates/search_filters/findings.html @@ -9,7 +9,7 @@
    diff --git a/backend/dissemination/templates/search_filters/fy-end-month.html b/backend/dissemination/templates/search_filters/fy-end-month.html index 76057a4a5f..36fb108b14 100644 --- a/backend/dissemination/templates/search_filters/fy-end-month.html +++ b/backend/dissemination/templates/search_filters/fy-end-month.html @@ -11,11 +11,11 @@ id="fy_end_month" name="fy_end_month"> - {% with '1 2 3 4 5 6 7 8 9 10 11 12' as list %} + {% with "1 2 3 4 5 6 7 8 9 10 11 12" as list %} {% for i in list.split %} - {% endfor %} {% endwith %} diff --git a/backend/dissemination/templates/search_filters/major-program.html b/backend/dissemination/templates/search_filters/major-program.html index a4f1f60959..121fb1eae3 100644 --- a/backend/dissemination/templates/search_filters/major-program.html +++ b/backend/dissemination/templates/search_filters/major-program.html @@ -9,7 +9,7 @@
    diff --git a/backend/dissemination/templates/summary.html b/backend/dissemination/templates/summary.html index faf147a311..a7cd9d3345 100644 --- a/backend/dissemination/templates/summary.html +++ b/backend/dissemination/templates/summary.html @@ -114,7 +114,7 @@

    Auditee

    Additional UEIs?  - {% if data|getkey:"Additional UEIs" %} + {% if data|getkey:"Additional UEIs" %} Y {% else %} N @@ -133,7 +133,7 @@

    Auditee

    Additional EINs?  - {% if data|getkey:"Additional EINs" %} + {% if data|getkey:"Additional EINs" %} Y {% else %} N @@ -208,7 +208,7 @@

    Auditor

    Secondary Auditors?  - {% if data|getkey:"Secondary Auditors" %} + {% if data|getkey:"Secondary Auditors" %} Y {% else %} N @@ -228,7 +228,7 @@

    Auditor

    Secondary Auditors?  - {% if data|getkey:"Secondary Auditors" %} + {% if data|getkey:"Secondary Auditors" %} Y {% else %} N diff --git a/backend/djangooidc/templates/401.html b/backend/djangooidc/templates/401.html index 1bd262c7c9..2e74fb1aea 100644 --- a/backend/djangooidc/templates/401.html +++ b/backend/djangooidc/templates/401.html @@ -1,3 +1,3 @@ -{% block title %}Unauthorized{% endblock %} +{% block title %}Unauthorized{% endblock title %} -{% block content %}Unauthorized{% endblock %} \ No newline at end of file +{% block content %}Unauthorized{% endblock content %} \ No newline at end of file diff --git a/backend/djangooidc/templates/500.html b/backend/djangooidc/templates/500.html index 3a2fdd92ae..378ea7de3b 100644 --- a/backend/djangooidc/templates/500.html +++ b/backend/djangooidc/templates/500.html @@ -1,3 +1,3 @@ -{% block title %}Server Error{% endblock %} +{% block title %}Server Error{% endblock title %} -{% block content %}Server Error{% endblock %} \ No newline at end of file +{% block content %}Server Error{% endblock content %} \ No newline at end of file diff --git a/backend/pyproject.toml b/backend/pyproject.toml index a4bdc9732c..1ac8180ed8 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -41,8 +41,12 @@ exclude_dirs = [ "audit/test_validators.py", "node_modules", "dissemination/test_search.py", + "dissemination/tests.py", + ".venv" ] [tool.djlint] ignore="H006,H022,H023,H019,H031" +profile="django" +use_gitignore=true # img_height,https,entity,javascript,lang diff --git a/backend/report_submission/templates/cancel-button.html b/backend/report_submission/templates/cancel-button.html index 3921ee0daf..d3af5d2b9d 100644 --- a/backend/report_submission/templates/cancel-button.html +++ b/backend/report_submission/templates/cancel-button.html @@ -17,7 +17,7 @@

    Cancel audit submission
    • - OK + OK
    -

    Confirm the deletion of the {{section_name}} worksheet by clicking the Delete Worksheet button below.

    +

    Confirm the deletion of the {{ section_name }} worksheet by clicking the Delete Worksheet button below.

    Cancel diff --git a/backend/report_submission/templates/report_submission/gen-form.html b/backend/report_submission/templates/report_submission/gen-form.html index f17abbb2ad..cfa6f4818e 100644 --- a/backend/report_submission/templates/report_submission/gen-form.html +++ b/backend/report_submission/templates/report_submission/gen-form.html @@ -8,7 +8,7 @@ -{% endblock %} +{% endblock metatags %} {% block content %}
    diff --git a/backend/report_submission/templates/report_submission/step-1.html b/backend/report_submission/templates/report_submission/step-1.html index 1f0fbb1ca0..6f72bd0e48 100644 --- a/backend/report_submission/templates/report_submission/step-1.html +++ b/backend/report_submission/templates/report_submission/step-1.html @@ -161,4 +161,4 @@
    -{% endblock %} +{% endblock step-content %} diff --git a/backend/report_submission/templates/report_submission/step-2.html b/backend/report_submission/templates/report_submission/step-2.html index 20dd05dac5..b003a471f3 100644 --- a/backend/report_submission/templates/report_submission/step-2.html +++ b/backend/report_submission/templates/report_submission/step-2.html @@ -190,4 +190,4 @@

    -{% endblock %} +{% endblock step-content %} diff --git a/backend/report_submission/templates/report_submission/step-3.html b/backend/report_submission/templates/report_submission/step-3.html index 780ca73414..42913bc7dd 100644 --- a/backend/report_submission/templates/report_submission/step-3.html +++ b/backend/report_submission/templates/report_submission/step-3.html @@ -501,4 +501,4 @@ -{% endblock %} +{% endblock step-content %} diff --git a/backend/report_submission/templates/report_submission/step-base.html b/backend/report_submission/templates/report_submission/step-base.html index 2110713430..2132145e57 100644 --- a/backend/report_submission/templates/report_submission/step-base.html +++ b/backend/report_submission/templates/report_submission/step-base.html @@ -7,7 +7,7 @@ -{% endblock %} +{% endblock metatags %} {% block content %}

    Create new audit

    @@ -38,6 +38,6 @@

    Create new audit

    - {% block step-content %}{% endblock %} + {% block step-content %}{% endblock step-content %} {% endblock content %} diff --git a/backend/report_submission/templates/report_submission/upload-page.html b/backend/report_submission/templates/report_submission/upload-page.html index 2f00d7b8ef..08ac728052 100644 --- a/backend/report_submission/templates/report_submission/upload-page.html +++ b/backend/report_submission/templates/report_submission/upload-page.html @@ -16,8 +16,8 @@

    {{ instructions }}

    {% if no_findings_disclaimer %} @@ -47,12 +47,12 @@

    Upload completed worksheet A file has already been uploaded for this section. A successful reupload will overwrite your previous submission.

    -

    Last uploaded by {{last_uploaded_by}} at {{last_uploaded_at}} +

    Last uploaded by {{ last_uploaded_by }} at {{ last_uploaded_at }} - Download current workbook + Download current workbook {% if remove_existing_workbook %}  |  - Remove current workbook + Remove current workbook {% endif %}

    diff --git a/backend/report_submission/templates/sidenav.html b/backend/report_submission/templates/sidenav.html index d049000095..d2f2423fc0 100644 --- a/backend/report_submission/templates/sidenav.html +++ b/backend/report_submission/templates/sidenav.html @@ -1,94 +1,74 @@ -