Skip to content

Commit d56f9c2

Browse files
crosspolarcrosspolar
committed
chore: update pre-commit hooks
1 parent ddbe2ca commit d56f9c2

5 files changed

+84
-77
lines changed

‎.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# It is recommended to specify the latest version of Python
22
# supported by your project here
33
default_language_version:
4-
python: python3.11
4+
python: python3.12
55
repos:
66
# Using this mirror lets us use mypyc-compiled black, which is about 2x faster
77
- repo: https://github.com/psf/black-pre-commit-mirror
8-
rev: 24.4.2
8+
rev: 24.8.0
99
hooks:
1010
- id: black
1111
- repo: https://github.com/djlint/djLint
12-
rev: v1.34.1
12+
rev: v1.35.2
1313
hooks:
1414
- id: djlint-reformat-django
1515
- id: djlint-django

‎tapir/coop/templates/coop/draftuser_list.html

+44-39
Original file line numberDiff line numberDiff line change
@@ -16,58 +16,63 @@
1616
<div class="card mb-2">
1717
<div class="card-header d-flex justify-content-between align-items-center">
1818
<h5>{% translate "Applicants" %}</h5>
19-
<div class="btn-group">
20-
<button type="button"
21-
class="{% tapir_button_link %} btn dropdown-toggle m-1"
22-
data-bs-toggle="dropdown">{% translate "Export" %}</button>
23-
<div class="dropdown-menu dropdown-menu-right">
24-
{% for format in view.export_formats %}
25-
<a class="dropdown-item" href="{% export_url format %}">
26-
download <code>.{{ format }}</code>
27-
</a>
28-
{% endfor %}
29-
</div>
19+
<div class="btn-group">
20+
<button type="button"
21+
class="{% tapir_button_link %} btn dropdown-toggle m-1"
22+
data-bs-toggle="dropdown">{% translate "Export" %}</button>
23+
<div class="dropdown-menu dropdown-menu-right">
24+
{% for format in view.export_formats %}
25+
<a class="dropdown-item" href="{% export_url format %}">
26+
download <code>.{{ format }}</code>
27+
</a>
28+
{% endfor %}
29+
</div>
3030
<a class="{% tapir_button_link_to_action %} m-1"
3131
href="{% url 'coop:draftuser_create' %}">
32-
<span class="material-icons">person_add</span>
32+
<span class="material-icons">person_add</span>
3333
Create
3434
</a>
3535
<div class="m-1">
36-
<button class="{% tapir_button_link_to_action %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFilter" aria-expanded="false" aria-controls="collapseFilter">
36+
<button class="{% tapir_button_link_to_action %}"
37+
type="button"
38+
data-bs-toggle="collapse"
39+
data-bs-target="#collapseFilter"
40+
aria-expanded="false"
41+
aria-controls="collapseFilter">
3742
{% translate "Filters" %}
3843
<span class="material-icons">unfold_more</span>
3944
</button>
40-
</div>
45+
</div>
4146
</div>
4247
</div>
43-
{% if filter %}
44-
<div class="collapse" id="collapseFilter">
45-
<ul class="list-group list-group-flush">
46-
<li class="list-group-item">
47-
<form action="" method="get" class="form member-filter-form">
48-
<div class="member-filter-form-filters">{% bootstrap_form filter.form %}</div>
49-
<div class="member-filter-form-buttons">
50-
<button class="filter-button {% tapir_button_link %}">
51-
<span class="material-icons">filter_alt</span>{% translate 'Filter' %}
52-
</button>
53-
<a class="{% tapir_button_link %}"
54-
href="{% url 'coop:draftuser_list' %}">
55-
<span class="material-icons">clear</span>
56-
{% translate "Clear all filters" %}
57-
</a>
58-
<div class="ms-2">
59-
{% blocktranslate with filtered=filtered_draftuser_count total=total_draftuser_count %}
48+
{% if filter %}
49+
<div class="collapse" id="collapseFilter">
50+
<ul class="list-group list-group-flush">
51+
<li class="list-group-item">
52+
<form action="" method="get" class="form member-filter-form">
53+
<div class="member-filter-form-filters">{% bootstrap_form filter.form %}</div>
54+
<div class="member-filter-form-buttons">
55+
<button class="filter-button {% tapir_button_link %}">
56+
<span class="material-icons">filter_alt</span>{% translate 'Filter' %}
57+
</button>
58+
<a class="{% tapir_button_link %}"
59+
href="{% url 'coop:draftuser_list' %}">
60+
<span class="material-icons">clear</span>
61+
{% translate "Clear all filters" %}
62+
</a>
63+
<div class="ms-2">
64+
{% blocktranslate with filtered=filtered_draftuser_count total=total_draftuser_count %}
6065
Filtered {{ filtered }} of {{ total }}
6166
{% endblocktranslate %}
62-
</div>
6367
</div>
64-
</form>
65-
</li>
66-
</ul>
67-
</div>
68-
{% endif %}
68+
</div>
69+
</form>
70+
</li>
71+
</ul>
72+
</div>
73+
{% endif %}
6974
<ul>
70-
<li class="list-group-item">{% render_table table %}</li>
75+
<li class="list-group-item">{% render_table table %}</li>
7176
</ul>
72-
</div>
77+
</div>
7378
{% endblock content %}

‎tapir/coop/templates/coop/membershipresignation_detail.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,10 @@ <h5 class="card-header">
6464
<div class="col-9" id="membership_resignation_cancellation_date">{{ object.cancellation_date|date:"d.m.Y" }}</div>
6565
</div>
6666
{% if object.pay_out_day is not None %}
67-
<div class="row m-1">
68-
<div class="col-3 fw-bold text-end">{% translate "Membership ends" %}:</div>
69-
<div class="col-9"
70-
id="membership_resignation_cancellation_date">{{ object.pay_out_day|date:"d.m.Y" }}</div>
71-
</div>
67+
<div class="row m-1">
68+
<div class="col-3 fw-bold text-end">{% translate "Membership ends" %}:</div>
69+
<div class="col-9" id="membership_resignation_cancellation_date">{{ object.pay_out_day|date:"d.m.Y" }}</div>
70+
</div>
7271
{% endif %}
7372
<div class="row m-1">
7473
<div class="col-3 fw-bold text-end">{% translate "Resignation type" %}:</div>

‎tapir/coop/templates/coop/pdf/membership_confirmation_pdf.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@
7878
antworten dir so schnell wie möglich. Wir freuen uns, dass du dabei bist!
7979
</p>
8080
<p>Kooperative Grüße</p>
81-
<p>
82-
Dein SuperCoop-Vorstand
83-
</p>
81+
<p>Dein SuperCoop-Vorstand</p>
8482
</div>
8583
</body>
8684
</html>

‎tapir/coop/templates/coop/shareowner_list.html

+32-27
Original file line numberDiff line numberDiff line change
@@ -29,39 +29,44 @@ <h5>{% translate "Cooperative Members" %}</h5>
2929
{% endfor %}
3030
</div>
3131
<div class="m-1">
32-
<button class="{% tapir_button_link_to_action %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseFilter" aria-expanded="false" aria-controls="collapseFilter">
32+
<button class="{% tapir_button_link_to_action %}"
33+
type="button"
34+
data-bs-toggle="collapse"
35+
data-bs-target="#collapseFilter"
36+
aria-expanded="false"
37+
aria-controls="collapseFilter">
3338
{% translate "Filters" %}
3439
<span class="material-icons">unfold_more</span>
3540
</button>
36-
</div>
37-
</div>
38-
</div>
39-
{% if filter %}
40-
<div class="collapse" id="collapseFilter">
41-
<ul class="list-group list-group-flush" id="share_owner_table">
42-
<li class="list-group-item">
43-
<form action="" method="get" class="form member-filter-form">
44-
<div class="member-filter-form-filters">{% bootstrap_form filter.form %}</div>
45-
<div class="member-filter-form-buttons">
46-
<button class="filter-button {% tapir_button_link %}">
47-
<span class="material-icons">filter_alt</span>{% translate 'Filter' %}
48-
</button>
49-
<a class="{% tapir_button_link %}"
50-
href="{% url 'coop:shareowner_list' %}">
51-
<span class="material-icons">clear</span>
52-
{% translate "Clear all filters" %}
53-
</a>
54-
<div class="ms-2">
55-
{% blocktranslate %}
41+
</div>
42+
</div>
43+
</div>
44+
{% if filter %}
45+
<div class="collapse" id="collapseFilter">
46+
<ul class="list-group list-group-flush" id="share_owner_table">
47+
<li class="list-group-item">
48+
<form action="" method="get" class="form member-filter-form">
49+
<div class="member-filter-form-filters">{% bootstrap_form filter.form %}</div>
50+
<div class="member-filter-form-buttons">
51+
<button class="filter-button {% tapir_button_link %}">
52+
<span class="material-icons">filter_alt</span>{% translate 'Filter' %}
53+
</button>
54+
<a class="{% tapir_button_link %}"
55+
href="{% url 'coop:shareowner_list' %}">
56+
<span class="material-icons">clear</span>
57+
{% translate "Clear all filters" %}
58+
</a>
59+
<div class="ms-2">
60+
{% blocktranslate %}
5661
Filtered {{ filtered_member_count }} of {{ total_member_count }}
5762
{% endblocktranslate %}
58-
</div>
5963
</div>
60-
</form>
61-
</li>
62-
</ul>
63-
</div>
64-
{% endif %}
64+
</div>
65+
</form>
66+
</li>
67+
</ul>
68+
</div>
69+
{% endif %}
6570
<ul>
6671
<li class="list-group-item">{% render_table table %}</li>
6772
</ul>

0 commit comments

Comments
 (0)