Skip to content

Commit 8f96f29

Browse files
Update .pre-commit-config.yaml (#789)
2 parents ed37cb9 + 9831fbe commit 8f96f29

58 files changed

Lines changed: 3391 additions & 3301 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ repos:
1717
- id: check-toml
1818
- id: detect-private-key
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
20-
rev: v0.15.21
20+
rev: v0.15.22
2121
hooks:
2222
- id: ruff
2323
args: [--config, pyproject.toml]
2424
- id: ruff-format
2525
args: [--config, pyproject.toml]
2626
- repo: https://github.com/djlint/djLint
27-
rev: v1.40.6
27+
rev: v1.42.0
2828
hooks:
2929
- id: djlint-reformat-jinja
3030
- repo: local
Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
<h1 class="utrecht-heading-1">{% trans %}Update requirements and measures{% endtrans %}</h1>
22
<p>
3-
{% trans %}Changing the AI-Act profile will lead to the following changes in requirements and measures.{% endtrans %}
3+
{% trans %}Changing the AI-Act profile will lead to the following changes in requirements and measures.{% endtrans %}
44
</p>
55
{% if added_requirements|length > 0 %}
6-
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}New requirements{% endtrans %}</h2>
7-
<ul class="rvo-item-list">
6+
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}New requirements{% endtrans %}</h2>
7+
<ul class="rvo-item-list">
88
{% for requirement in added_requirements %}
9-
<li class="rvo-item-list__item">
10-
<div class="rvo-layout-row rvo-layout-gap--sm">
11-
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
12-
<span>{{ requirement.name }}</span>
13-
</div>
14-
</li>
9+
<li class="rvo-item-list__item">
10+
<div class="rvo-layout-row rvo-layout-gap--sm">
11+
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
12+
<span>{{ requirement.name }}</span>
13+
</div>
14+
</li>
1515
{% endfor %}
16-
</ul>
16+
</ul>
1717
{% endif %}
1818
{% if removed_requirements|length > 0 %}
19-
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}Removed requirements{% endtrans %}</h2>
20-
<ul class="rvo-item-list">
19+
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}Removed requirements{% endtrans %}</h2>
20+
<ul class="rvo-item-list">
2121
{% for requirement in removed_requirements %}
22-
<li class="rvo-item-list__item">
23-
<div class="rvo-layout-row rvo-layout-gap--sm">
24-
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
25-
<span>{{ requirement.name }}</span>
26-
</div>
27-
</li>
22+
<li class="rvo-item-list__item">
23+
<div class="rvo-layout-row rvo-layout-gap--sm">
24+
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
25+
<span>{{ requirement.name }}</span>
26+
</div>
27+
</li>
2828
{% endfor %}
29-
</ul>
29+
</ul>
3030
{% endif %}
3131
{% if added_measures|length > 0 %}
32-
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}New measures{% endtrans %}</h2>
33-
<ul class="rvo-item-list">
32+
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}New measures{% endtrans %}</h2>
33+
<ul class="rvo-item-list">
3434
{% for measure in added_measures %}
35-
<li class="rvo-item-list__item">
36-
<div class="rvo-layout-row rvo-layout-gap--sm">
37-
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
38-
<span>{{ measure.name }}</span>
39-
</div>
40-
</li>
35+
<li class="rvo-item-list__item">
36+
<div class="rvo-layout-row rvo-layout-gap--sm">
37+
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
38+
<span>{{ measure.name }}</span>
39+
</div>
40+
</li>
4141
{% endfor %}
42-
</ul>
42+
</ul>
4343
{% endif %}
4444
{% if removed_measures|length > 0 %}
45-
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}Removed measures{% endtrans %}</h2>
46-
<ul class="rvo-item-list">
45+
<h2 class="utrecht-heading-2 margin-bottom-small margin-top-large">{% trans %}Removed measures{% endtrans %}</h2>
46+
<ul class="rvo-item-list">
4747
{% for measure in removed_measures %}
48-
<li class="rvo-item-list__item">
49-
<div class="rvo-layout-row rvo-layout-gap--sm">
50-
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
51-
<span>{{ measure.name }}</span>
52-
</div>
53-
</li>
48+
<li class="rvo-item-list__item">
49+
<div class="rvo-layout-row rvo-layout-gap--sm">
50+
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
51+
<span>{{ measure.name }}</span>
52+
</div>
53+
</li>
5454
{% endfor %}
55-
</ul>
55+
</ul>
5656
{% endif %}
5757
<div class="margin-top-large">
58-
<button class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
59-
onclick="amt.updateFormStateAndSubmit('{{ new_values["form-id"] }}','CONFIRM_SAVE'); amt.closeAndResetDynamicModal('modal'); return false;">
60-
{% trans %}Apply changes{% endtrans %}
61-
</button>
58+
<button class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
59+
onclick="amt.updateFormStateAndSubmit('{{ new_values["form-id"] }}','CONFIRM_SAVE'); amt.closeAndResetDynamicModal('modal'); return false;">
60+
{% trans %}Apply changes{% endtrans %}
61+
</button>
6262
</div>

amt/site/templates/algorithms/details_base.html.j2

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,54 @@
33
{% import "macros/tabs.html.j2" as tabs with context %}
44
{% block title %}{{ algorithm.name }} | AMT{% endblock %}
55
{% block content %}
6-
<div id="delete-modal" class="minbzk-modal display-none">
7-
<div class="modal-underlay" onclick="amt.closeModal('delete-modal')"></div>
8-
<div class="modal-content-container model-content-auto-size">
9-
<div class="modal-content rvo-layout-column"
10-
style="overflow-x: hidden;
11-
height: auto;
12-
width: auto">
13-
<div class="amt-flex-container">
14-
<h3 class="utrecht-heading-3 rvo-heading--no-margins">{% trans %}Delete algoritmic system{% endtrans %}</h3>
15-
</div>
16-
<hr class="rvo-hr" />
17-
<p style="padding-block: 0.5em 0.4em;">
18-
<strong>{% trans %}Are you sure you want to delete your algoritmic system {% endtrans %} {{ algorithm.name }}?</strong>
6+
<div id="delete-modal" class="minbzk-modal display-none">
7+
<div class="modal-underlay" onclick="amt.closeModal('delete-modal')"></div>
8+
<div class="modal-content-container model-content-auto-size">
9+
<div class="modal-content rvo-layout-column"
10+
style="overflow-x: hidden;
11+
height: auto;
12+
width: auto">
13+
<div class="amt-flex-container">
14+
<h3 class="utrecht-heading-3 rvo-heading--no-margins">{% trans %}Delete algoritmic system{% endtrans %}</h3>
15+
</div>
16+
<hr class="rvo-hr" />
17+
<p style="padding-block: 0.5em 0.4em;">
18+
<strong>{% trans %}Are you sure you want to delete your algoritmic system {% endtrans %} {{ algorithm.name }}?</strong>
1919
</p>
2020
<p style="padding-block: 0.0em 1.25em;">
21-
{% trans %}Data will be stored for at least 45 days before permanent deletion.{% endtrans %}
22-
</p>
23-
<p class="utrecht-button-group">
24-
<button hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
25-
hx-delete="/algorithm/{{ algorithm.id }}"
26-
class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
27-
type="button">{% trans %}Yes{% endtrans %}</button>
28-
<button class="utrecht-button utrecht-button--secondary-action utrecht-button--rvo-md"
29-
onclick="amt.closeModal('delete-modal')"
30-
type="button">{% trans %}No{% endtrans %}</button>
31-
</p>
32-
</div>
33-
</div>
34-
</div>
35-
<div class="rvo-max-width-layout rvo-max-width-layout--lg rvo-max-width-layout-inline-padding--none">
21+
{% trans %}Data will be stored for at least 45 days before permanent deletion.{% endtrans %}
22+
</p>
23+
<p class="utrecht-button-group">
24+
<button hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
25+
hx-delete="/algorithm/{{ algorithm.id }}"
26+
class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
27+
type="button">{% trans %}Yes{% endtrans %}</button>
28+
<button class="utrecht-button utrecht-button--secondary-action utrecht-button--rvo-md"
29+
onclick="amt.closeModal('delete-modal')"
30+
type="button">{% trans %}No{% endtrans %}</button>
31+
</p>
32+
</div>
33+
</div>
34+
</div>
35+
<div class="rvo-max-width-layout rvo-max-width-layout--lg rvo-max-width-layout-inline-padding--none">
3636
<!-- algorithm header -->
3737
{{ tabs.show_algorithm_header() }}
3838
<!-- tabs container -->
3939
<div>
40-
<ul class="rvo-tabs rvo-ul rvo-ul--no-margin rvo-ul--no-padding rvo-ul--icon rvo-ul--icon-option-2"
41-
role="tablist"
42-
aria-label="Tabs">
43-
{% for tab_item in tab_items %}
44-
<li role="presentation" class="rvo-tabs__item">
45-
<a data-navigation="tab:{{ tab_item.get_url() }}"
46-
class="rvo-link rvo-tabs__item-link rvo-link--no-underline {% if tab_item.active %}rvo-tabs__item-link--active rvo-link--active{% else %}rvo-link--normal{% endif %}"
47-
role="tab"
48-
aria-selected="true"
49-
href="{{ tab_item.get_url() }}">{{ tab_item.display_text }}</a>
50-
</li>
51-
{% endfor %}
52-
</ul>
40+
<ul class="rvo-tabs rvo-ul rvo-ul--no-margin rvo-ul--no-padding rvo-ul--icon rvo-ul--icon-option-2"
41+
role="tablist"
42+
aria-label="Tabs">
43+
{% for tab_item in tab_items %}
44+
<li role="presentation" class="rvo-tabs__item">
45+
<a data-navigation="tab:{{ tab_item.get_url() }}"
46+
class="rvo-link rvo-tabs__item-link rvo-link--no-underline {% if tab_item.active %}rvo-tabs__item-link--active rvo-link--active{% else %}rvo-link--normal{% endif %}"
47+
role="tab"
48+
aria-selected="true"
49+
href="{{ tab_item.get_url() }}">{{ tab_item.display_text }}</a>
50+
</li>
51+
{% endfor %}
52+
</ul>
5353
</div>
5454
<div class="margin-top-large">{% block detail_content %}Placeholder{% endblock %}</div>
55-
</div>
55+
</div>
5656
{% endblock %}
Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
{% extends 'algorithms/details_base.html.j2' %}
22
{% import "macros/form_macros.html.j2" as macros with context %}
33
{% block detail_content %}
4-
<div class="rvo-accordion">
5-
{% for (requirement, completed_measures_count, measures) in requirements_and_measures %}
6-
<details class="rvo-accordion__item">
7-
<summary style="scroll-margin-top: 75px"
8-
id="{{ requirement.urn | replace(':', '_') }}"
9-
class="rvo-accordion__item-summary margin-bottom-large">
10-
<h3 class="utrecht-heading-3 rvo-accordion__item-title rvo-heading--no-margins rvo-heading--mixed">
11-
<span class="utrecht-icon rvo-icon rvo-icon-delta-omlaag rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--closed"
12-
role="img"
13-
aria-label="Delta omlaag"></span>
14-
<span class="utrecht-icon rvo-icon rvo-icon-delta-omhoog rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--open"
15-
role="img"
16-
aria-label="Delta omhoog"></span>
17-
{{ requirement.name }}
18-
</h3>
19-
<div class="rvo-accordion-teaser">
20-
<div class="rvo-layout rvo-margin-block-start--sm rvo-margin-block-end--sm ">{{ requirement.description }}</div>
21-
<div class="rvo-layout-row rvo-layout-gap--sm">
22-
{% if completed_measures_count == 0 %}
23-
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw"></div>
24-
{% elif completed_measures_count < measures | length %}
25-
<div class="rvo-status-indicator rvo-status-indicator--oranje"></div>
26-
{% else %}
27-
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
28-
{% endif %}
29-
{{ completed_measures_count }} / {{ measures | length }} {% trans %}measure executed{% endtrans %}
30-
</div>
31-
</div>
32-
</summary>
33-
{% for measure in measures %}
34-
<div class="rvo-accordion__content">
35-
<div class="rvo-layout-row rvo-layout-gap--sm rvo-layout-align-items-start rvo-layout-margin-horizontal--xl">
36-
{% if measure.state == "to do" %}
37-
<div class="rvo-status-indicator rvo-status-indicator--oranje-300"></div>
38-
{% elif measure.state == "in progress" %}
39-
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw"></div>
40-
{% elif measure.state == "in review" %}
41-
<div class="rvo-status-indicator rvo-status-indicator--oranje"></div>
42-
{% elif measure.state == "done" %}
43-
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
44-
{% elif measure.state == "not implemented" %}
45-
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw-300"></div>
46-
{% else %}
47-
{# This should not happen, red could be for overdue.#}
48-
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
49-
{% endif %}
50-
<div class="rvo-layout-column">
51-
<h4 class="utrecht-heading-4 rvo-heading--no-margins">{{ loop.index }}. {{ measure.name }}</h4>
52-
<p class="rvo-text">{{ measure.value }}</p>
53-
{% if permission(permission_path, 'Update', permissions) == True %}
54-
<a class="rvo-link rvo-link--normal rvo-link--with-icon"
55-
hx-trigger="click"
56-
hx-target="#dynamic-modal-content"
57-
hx-get="/algorithm/{{ algorithm_id }}/measure/{{ measure.urn }}?requirement_urn={{ requirement.urn }}"
58-
hx-swap="innerHTML"
59-
onclick="amt.openModal('modal')">
60-
<span class="utrecht-icon rvo-icon rvo-icon-pijl-naar-rechts rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
61-
role="img"
62-
aria-label="Home"></span>
63-
{% trans %}Edit{% endtrans %}
64-
</a>
65-
{% endif %}
66-
<div class="margin-top-middle">{{ macros.user_avatars(measure_task_functions[measure.urn]) }}</div>
67-
</div>
68-
</div>
4+
<div class="rvo-accordion">
5+
{% for (requirement, completed_measures_count, measures) in requirements_and_measures %}
6+
<details class="rvo-accordion__item">
7+
<summary style="scroll-margin-top: 75px"
8+
id="{{ requirement.urn | replace(':', '_') }}"
9+
class="rvo-accordion__item-summary margin-bottom-large">
10+
<h3 class="utrecht-heading-3 rvo-accordion__item-title rvo-heading--no-margins rvo-heading--mixed">
11+
<span class="utrecht-icon rvo-icon rvo-icon-delta-omlaag rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--closed"
12+
role="img"
13+
aria-label="Delta omlaag"></span>
14+
<span class="utrecht-icon rvo-icon rvo-icon-delta-omhoog rvo-icon--md rvo-icon--hemelblauw rvo-accordion__item-icon--open"
15+
role="img"
16+
aria-label="Delta omhoog"></span>
17+
{{ requirement.name }}
18+
</h3>
19+
<div class="rvo-accordion-teaser">
20+
<div class="rvo-layout rvo-margin-block-start--sm rvo-margin-block-end--sm ">{{ requirement.description }}</div>
21+
<div class="rvo-layout-row rvo-layout-gap--sm">
22+
{% if completed_measures_count == 0 %}
23+
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw"></div>
24+
{% elif completed_measures_count < measures | length %}
25+
<div class="rvo-status-indicator rvo-status-indicator--oranje"></div>
26+
{% else %}
27+
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
28+
{% endif %}
29+
{{ completed_measures_count }} / {{ measures | length }} {% trans %}measure executed{% endtrans %}
6930
</div>
31+
</div>
32+
</summary>
33+
{% for measure in measures %}
34+
<div class="rvo-accordion__content">
35+
<div class="rvo-layout-row rvo-layout-gap--sm rvo-layout-align-items-start rvo-layout-margin-horizontal--xl">
36+
{% if measure.state == "to do" %}
37+
<div class="rvo-status-indicator rvo-status-indicator--oranje-300"></div>
38+
{% elif measure.state == "in progress" %}
39+
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw"></div>
40+
{% elif measure.state == "in review" %}
41+
<div class="rvo-status-indicator rvo-status-indicator--oranje"></div>
42+
{% elif measure.state == "done" %}
43+
<div class="rvo-status-indicator rvo-status-indicator--groen"></div>
44+
{% elif measure.state == "not implemented" %}
45+
<div class="rvo-status-indicator rvo-status-indicator--hemelblauw-300"></div>
46+
{% else %}
47+
{# This should not happen, red could be for overdue.#}
48+
<div class="rvo-status-indicator rvo-status-indicator--rood"></div>
49+
{% endif %}
50+
<div class="rvo-layout-column">
51+
<h4 class="utrecht-heading-4 rvo-heading--no-margins">{{ loop.index }}. {{ measure.name }}</h4>
52+
<p class="rvo-text">{{ measure.value }}</p>
53+
{% if permission(permission_path, 'Update', permissions) == True %}
54+
<a class="rvo-link rvo-link--normal rvo-link--with-icon"
55+
hx-trigger="click"
56+
hx-target="#dynamic-modal-content"
57+
hx-get="/algorithm/{{ algorithm_id }}/measure/{{ measure.urn }}?requirement_urn={{ requirement.urn }}"
58+
hx-swap="innerHTML"
59+
onclick="amt.openModal('modal')">
60+
<span class="utrecht-icon rvo-icon rvo-icon-pijl-naar-rechts rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
61+
role="img"
62+
aria-label="Home"></span>
63+
{% trans %}Edit{% endtrans %}
64+
</a>
65+
{% endif %}
66+
<div class="margin-top-middle">{{ macros.user_avatars(measure_task_functions[measure.urn]) }}</div>
67+
</div>
68+
</div>
69+
</div>
7070
{% endfor %}
71-
</details>
72-
{% endfor %}
73-
</div>
74-
<script type="text/javascript">amt.showRequirementDetails();</script>
71+
</details>
72+
{% endfor %}
73+
</div>
74+
<script type="text/javascript">amt.showRequirementDetails();</script>
7575
{% endblock %}

0 commit comments

Comments
 (0)