Skip to content

Commit

Permalink
Enable djLint "Django" Profile (#4102)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@jperson1
jperson1 authored Jul 19, 2024
1 parent f0c289e commit 0e15946
Show file tree
Hide file tree
Showing 31 changed files with 168 additions and 184 deletions.
2 changes: 1 addition & 1 deletion backend/audit/templates/audit/auditee-certification-step-1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ <h2 class="font-sans-md">Check the box next to each item confirm your report mee
<div class="grid-row margin-bottom-8 margin-top-10">
<button class="usa-button grid-col-5" id="continue">Agree to auditee certification</button>
<a class="usa-link margin-left-3 grid-col-2 flex-align-self-center"
href="/">Cancel</a>
href="{% url 'audit:SubmissionProgress' report_id %}">Cancel</a>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion backend/audit/templates/audit/my_submissions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1 class="font-sans-xl">Audits in progress</h1>
(Unlock)
</a>
</p>
{% endif%}
{% endif %}
</td>
<td>{{ item.auditee_name }}</td>
<td>{{ item.report_id }}</td>
Expand Down
4 changes: 2 additions & 2 deletions backend/audit/templates/audit/submission_checklist/section_block.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% load sprite_helper %}
<li class="usa-icon-list__item padding-bottom-105" id="{{ url_tail }}">

{% 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 %}
Expand All @@ -22,7 +22,7 @@
{% if text_nb %}<strong>{{ text_nb }}</strong>{% endif %}
</p>

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

<p class="margin-0">
<a class="usa-link" href="{% url reverse_url_for_file_upload report_id %}">{{ edit_text }}</a>
Expand Down
26 changes: 13 additions & 13 deletions backend/audit/templates/audit/submission_checklist/submission-checklist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<div class="grid-row">
<div class="grid-container margin-top-6 margin-bottom-6">

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

<div id="submission-checklist-content">
<ul class="usa-icon-list usa-icon-list--size-sm tablet:grid-col-11 font-sans-md">

{% if not pre_submission_validation.completed %}
{% include './key-info-preliminary.html' %}
{% include "./key-info-preliminary.html" %}
{% section_block report_id general_information %}
{% section_block report_id audit_information %}
{% section_block report_id single_audit_report %}
Expand All @@ -30,27 +30,27 @@
{% section_block report_id additional_ueis %}
{% section_block report_id secondary_auditors %}
{% section_block report_id additional_eins %}
{% include './key-info-pre-validation.html' %}
{% include './tribal-data-release.html' %}
{% include './validation.html' %}
{% include "./key-info-pre-validation.html" %}
{% include "./tribal-data-release.html" %}
{% include "./validation.html" %}
{% else %}
{% include './key-info-certification.html' %}
{% include './preview-button-group.html' %}
{% include "./key-info-certification.html" %}
{% include "./preview-button-group.html" %}
{% endif %}

{% comment %} Auditor Certification {% endcomment %}
<li class="usa-icon-list__item padding-bottom-105 margin-top-5"
id="auditor-certification-completed">
{% if certification.auditor_certified %}
{% include './icon-list-icon.html' with completed=certification.auditor_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditor_certified %}
<div class="text-success-darker">
<p class="text-bold text-underline margin-0">Auditor Certification (Complete)</p>
<p class="margin-0">
Your certifying auditor must attest and sign the single audit package before submission. In order to unlock this step, you must complete and upload all required workbooks from the previous steps, as well as the single audit report PDF.
</p>
</div>
{% elif certification.auditor_enabled %}
{% include './icon-list-icon.html' with completed=certification.auditor_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditor_certified %}
<div>
<p class="text-bold margin-0">
<a class="usa-link"
Expand All @@ -61,7 +61,7 @@
</p>
</div>
{% else %}
{% include './icon-list-icon.html' with completed=certification.auditor_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditor_certified %}
<div>
<p class="text-bold margin-0">Auditor Certification</p>
<p class="margin-0">
Expand All @@ -75,15 +75,15 @@
<li class="usa-icon-list__item padding-bottom-3"
id="auditee-certification-completed">
{% if certification.auditee_certified %}
{% include './icon-list-icon.html' with completed=certification.auditee_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditee_certified %}
<div class="text-success-darker">
<p class="text-bold text-underline margin-0">Auditee Certification (Complete)</p>
<p class="margin-0">
Your certifying auditee must attest and sign the single audit package before submission. In order to unlock this step, you must complete and upload all required workbooks from the previous steps, as well as the single audit report PDF.
</p>
</div>
{% elif certification.auditee_enabled %}
{% include './icon-list-icon.html' with completed=certification.auditee_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditee_certified %}
<div>
<p class="text-bold margin-0">
<a class="usa-link"
Expand All @@ -94,7 +94,7 @@
</p>
</div>
{% else %}
{% include './icon-list-icon.html' with completed=certification.auditee_certified %}
{% include "./icon-list-icon.html" with completed=certification.auditee_certified %}
<div>
<p class="text-bold margin-0">Auditee Certification</p>
<p class="margin-0">
Expand Down
8 changes: 4 additions & 4 deletions backend/audit/templates/audit/submission_checklist/tribal-data-release.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% if not is_tribal_data_consent_complete %}
{% comment %} 2. The auditee certifying official sees the link and can complete it. {% endcomment %}
{% if is_user_auditee_certifier %}
{% include './icon-list-icon.html' with completed=False %}
{% include "./icon-list-icon.html" with completed=False %}
<div>
<p class="text-bold margin-0">
<a class="usa-link"
Expand All @@ -24,7 +24,7 @@
</div>
{% comment %} 4. Anyone else with access sees an inactive section, no link. {% endcomment %}
{% else %}
{% include './icon-list-icon.html' with completed=False %}
{% include "./icon-list-icon.html" with completed=False %}
<div>
<p class="text-bold margin-0">Tribal data release</p>
<p class="margin-0">
Expand All @@ -35,7 +35,7 @@
{% else %}
{% comment %} 3. The form is complete. The auditee certifying official can edit it. {% endcomment %}
{% if is_user_auditee_certifier %}
{% include './icon-list-icon.html' with completed=True %}
{% include "./icon-list-icon.html" with completed=True %}
<div class="text-success-darker">
<p class="text-bold text-underline margin-0">Tribal data release (Complete)</p>
<p class="margin-0">
Expand All @@ -48,7 +48,7 @@
</div>
{% comment %} 5. The form is complete. Anyone else with access sees that it's done but still can't click a link. {% endcomment %}
{% else %}
{% include './icon-list-icon.html' with completed=True %}
{% include "./icon-list-icon.html" with completed=True %}
<div>
<p class="text-bold margin-0">Tribal data release (Complete)</p>
<p class="margin-0">
Expand Down
4 changes: 2 additions & 2 deletions backend/audit/templates/audit/submission_checklist/validation.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% comment %} The pre-submission validation section block {% endcomment %}
<li class="usa-icon-list__item padding-bottom-105" id="SF-SAC-completed">
{% if pre_submission_validation.completed %}
{% include './icon-list-icon.html' with completed=pre_submission_validation.completed %}
{% include "./icon-list-icon.html" with completed=pre_submission_validation.completed %}
<div class="text-success-darker">
<p class="text-bold text-underline margin-0">Pre-submission validation (Complete)</p>
<p class="margin-0">Before submitting your audit, use our validation tool to check your workbooks for errors.</p>
</div>
{% else %}
{% include './icon-list-icon.html' with completed=pre_submission_validation.completed %}
{% include "./icon-list-icon.html" with completed=pre_submission_validation.completed %}
<div>
<p class="text-bold margin-0">
<a class="usa-link"
Expand Down
2 changes: 1 addition & 1 deletion backend/audit/templates/uswds_sprite.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<use xlink:href="/icons/sprite.svg#{{icon_name}}"></use>
<use xlink:href="/icons/sprite.svg#{{ icon_name }}"></use>
52 changes: 26 additions & 26 deletions backend/dissemination/templates/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ <h3>Filters</h3>
data-allow-multiple>
{% if advanced_search_flag %}
{% comment %} Advanced search contains filters the cross-reference tables (materialized DisseminationCombined table). {% endcomment %}
{% include "search_filters/audit-year.html"%}
{% include "search_filters/uei-ein.html"%}
{% include "search_filters/aln.html"%}
{% include "search_filters/name.html"%}
{% include "search_filters/acceptance-date.html"%}
{% include "search_filters/state.html"%}
{% include "search_filters/cog-over.html"%}
{% include "search_filters/findings.html"%}
{% include "search_filters/direct_funding.html"%}
{% include "search_filters/major-program.html"%}
{% include "search_filters/fy-end-month.html"%}
{% include "search_filters/type-requirement.html"%}
{% include "search_filters/entity-type.html"%}
{% include "search_filters/passthrough-name.html"%}
{% include "search_filters/report-id.html"%}
{% include "search_filters/audit-year.html" %}
{% include "search_filters/uei-ein.html" %}
{% include "search_filters/aln.html" %}
{% include "search_filters/name.html" %}
{% include "search_filters/acceptance-date.html" %}
{% include "search_filters/state.html" %}
{% include "search_filters/cog-over.html" %}
{% include "search_filters/findings.html" %}
{% include "search_filters/direct_funding.html" %}
{% include "search_filters/major-program.html" %}
{% include "search_filters/fy-end-month.html" %}
{% include "search_filters/type-requirement.html" %}
{% include "search_filters/entity-type.html" %}
{% include "search_filters/passthrough-name.html" %}
{% include "search_filters/report-id.html" %}
{% else %}
{% comment %} Basic search contains filters only applicable to the general table. {% endcomment %}
{% include "search_filters/audit-year.html"%}
{% include "search_filters/uei-ein.html"%}
{% include "search_filters/name.html"%}
{% include "search_filters/acceptance-date.html"%}
{% include "search_filters/state.html"%}
{% include "search_filters/fy-end-month.html"%}
{% include "search_filters/entity-type.html"%}
{% include "search_filters/report-id.html"%}
{% include "search_filters/audit-year.html" %}
{% include "search_filters/uei-ein.html" %}
{% include "search_filters/name.html" %}
{% include "search_filters/acceptance-date.html" %}
{% include "search_filters/state.html" %}
{% include "search_filters/fy-end-month.html" %}
{% include "search_filters/entity-type.html" %}
{% include "search_filters/report-id.html" %}
{% endif %}
</div>

Expand Down Expand Up @@ -83,7 +83,7 @@ <h3>Filters</h3>
</div>
<div class="grid-col audit-search-results">
<h1 class="font-sans-2xl">Search single audit reports</h1>
{% include "search-alert-info.html"%}
{% include "search-alert-info.html" %}
{% if results|length > 0 %}
<div class="margin-y-2 display-flex flex-justify-center">
<img hidden id="loader"
Expand All @@ -93,7 +93,7 @@ <h1 class="font-sans-2xl">Search single audit reports</h1>

<div class="margin-y-2 grid-row display-flex flex-justify">
<p class="margin-0 flex-align-self-center">
<span>{{ results.start_index }}-{{results.end_index}} of <strong>{{ results_count|intcomma }}</strong> results in {{ total_time_s|floatformat }} seconds.</span>
<span>{{ results.start_index }}-{{ results.end_index }} of <strong>{{ results_count|intcomma }}</strong> results in {{ total_time_s|floatformat }} seconds.</span>
</p>
{% if results_count <= summary_report_download_limit %}
<button class="usa-button display-flex"
Expand Down Expand Up @@ -144,7 +144,7 @@ <h1 class="font-sans-2xl">Search single audit reports</h1>
<td>
{% if result.oversight_agency %}
OVER-{{ result.oversight_agency }}
{% elif result.cognizant_agency %}
{% elif result.cognizant_agency %}
COG-{{ result.cognizant_agency }}
{% else %}
N/A
Expand Down
2 changes: 1 addition & 1 deletion backend/dissemination/templates/search_filters/direct_funding.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<input class="usa-checkbox__input"
id="direct_funding-{{ text }}"
name="direct_funding" type="checkbox"
value={{value}}
value={{ value }}
{% if value in form_user_input.direct_funding %}checked{% endif %} />
<label class="usa-checkbox__label" for="direct_funding-{{ text }}">{{ text }}</label>
</div>
Expand Down
2 changes: 1 addition & 1 deletion backend/dissemination/templates/search_filters/entity-type.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<input class="usa-checkbox__input"
id="entity_type-{{ text }}"
name="entity_type" type="checkbox"
value={{value}}
value={{ value }}
{% if value in form_user_input.entity_type %}checked{% endif %} />
<label class="usa-checkbox__label" for="entity_type-{{ text }}">{{ text }}</label>
</div>
Expand Down
2 changes: 1 addition & 1 deletion backend/dissemination/templates/search_filters/findings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<input class="usa-checkbox__input"
id="findings-{{ text }}"
name="findings" type="checkbox"
value={{value}}
value={{ value }}
{% if value in form_user_input.findings %}checked{% endif %} />
<label class="usa-checkbox__label" for="findings-{{ text }}">{{ text }}</label>
</div>
Expand Down
6 changes: 3 additions & 3 deletions backend/dissemination/templates/search_filters/fy-end-month.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
id="fy_end_month"
name="fy_end_month">
<option value id="fy-month--none">- Select -</option>
{% 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 %}
<option value="{{i}}"
<option value="{{ i }}"
{% if i in form_user_input.fy_end_month %}selected{% endif %}>
{{i}} - {% cycle 'January' 'February' 'March' 'April' 'May' 'June' 'July' 'August' 'September' 'October' 'November' 'December' %}
{{ i }} - {% cycle 'January' 'February' 'March' 'April' 'May' 'June' 'July' 'August' 'September' 'October' 'November' 'December' %}
</option>
{% endfor %}
{% endwith %}
Expand Down
2 changes: 1 addition & 1 deletion backend/dissemination/templates/search_filters/major-program.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<input class="usa-radio__input"
id="major_program-{{ text }}"
name="major_program" type="radio"
value={{value}}
value={{ value }}
{% if value in form_user_input.major_program %}checked{% endif %} />
<label class="usa-radio__label" for="major_program-{{ text }}">{{ text }}</label>
</div>
Expand Down
Loading

0 comments on commit 0e15946

Please sign in to comment.