From be93a497f322b8eb586963a969cb963dbf2e687a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Mon, 17 Apr 2023 08:40:08 +0200
Subject: [PATCH] run hooks
---
contracts/admin.py | 9 +++-
contracts/forms.py | 2 +-
...tracteesignaturerepresentative_function.py | 11 +++--
.../0046_alter_contract_paper_form_state.py | 21 ++++++--
...contract_agreement_url_contractapproval.py | 49 ++++++++++++++-----
...alter_contractapproval_options_and_more.py | 30 ++++++++----
.../migrations/0049_alter_contract_options.py | 19 +++++--
contracts/settings.py | 1 -
contracts/views.py | 11 ++---
9 files changed, 104 insertions(+), 49 deletions(-)
diff --git a/contracts/admin.py b/contracts/admin.py
index 929c458..c30a49b 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -10,16 +10,21 @@ from rangefilter.filters import DateRangeFilter
from shared.admin import FieldsetInlineOrder, MarkdownxGuardedModelAdmin
-from .forms import ContractAdminForm, ContractFileAdminForm, SigneeAdminForm, AtLeastOneRequiredInlineFormSet
+from .forms import (
+ AtLeastOneRequiredInlineFormSet,
+ ContractAdminForm,
+ ContractFileAdminForm,
+ SigneeAdminForm,
+)
from .models import (
Contract,
+ ContractApproval,
Contractee,
ContracteeSignature,
ContracteeSignatureRepresentative,
ContractFile,
ContractFilingArea,
ContractIntent,
- ContractApproval,
ContractIssue,
ContractType,
Signee,
diff --git a/contracts/forms.py b/contracts/forms.py
index e25eea8..a33c832 100644
--- a/contracts/forms.py
+++ b/contracts/forms.py
@@ -16,7 +16,7 @@ class AtLeastOneRequiredInlineFormSet(BaseInlineFormSet):
return
if not any(
- cleaned_data and not cleaned_data.get('DELETE', False)
+ cleaned_data and not cleaned_data.get("DELETE", False)
for cleaned_data in self.cleaned_data
):
raise forms.ValidationError("Vyžadován aspoň jeden záznam.")
diff --git a/contracts/migrations/0045_alter_contracteesignaturerepresentative_function.py b/contracts/migrations/0045_alter_contracteesignaturerepresentative_function.py
index 365c6ee..a2972d0 100644
--- a/contracts/migrations/0045_alter_contracteesignaturerepresentative_function.py
+++ b/contracts/migrations/0045_alter_contracteesignaturerepresentative_function.py
@@ -4,16 +4,17 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
- ('contracts', '0044_alter_contract_tender_url'),
+ ("contracts", "0044_alter_contract_tender_url"),
]
operations = [
migrations.AlterField(
- model_name='contracteesignaturerepresentative',
- name='function',
- field=models.CharField(default='k vyplnění', max_length=256, verbose_name='Funkce'),
+ model_name="contracteesignaturerepresentative",
+ name="function",
+ field=models.CharField(
+ default="k vyplnění", max_length=256, verbose_name="Funkce"
+ ),
preserve_default=False,
),
]
diff --git a/contracts/migrations/0046_alter_contract_paper_form_state.py b/contracts/migrations/0046_alter_contract_paper_form_state.py
index c8783c8..6bbab31 100644
--- a/contracts/migrations/0046_alter_contract_paper_form_state.py
+++ b/contracts/migrations/0046_alter_contract_paper_form_state.py
@@ -4,15 +4,26 @@ from django.db import migrations, models
class Migration(migrations.Migration):
-
dependencies = [
- ('contracts', '0045_alter_contracteesignaturerepresentative_function'),
+ ("contracts", "0045_alter_contracteesignaturerepresentative_function"),
]
operations = [
migrations.AlterField(
- model_name='contract',
- name='paper_form_state',
- field=models.CharField(choices=[('on_the_way', 'Na cestě'), ('sent', 'Odeslaný'), ('mailbox', 'Ve schránce'), ('to_shred', 'Ke skartaci'), ('shredded', 'Skartovaný'), ('stored', 'Uložený'), ('lost', 'Ztracený')], max_length=10, verbose_name='Stav fyzického dokumentu'),
+ model_name="contract",
+ name="paper_form_state",
+ field=models.CharField(
+ choices=[
+ ("on_the_way", "Na cestě"),
+ ("sent", "Odeslaný"),
+ ("mailbox", "Ve schránce"),
+ ("to_shred", "Ke skartaci"),
+ ("shredded", "Skartovaný"),
+ ("stored", "Uložený"),
+ ("lost", "Ztracený"),
+ ],
+ max_length=10,
+ verbose_name="Stav fyzického dokumentu",
+ ),
),
]
diff --git a/contracts/migrations/0047_remove_contract_agreement_url_contractapproval.py b/contracts/migrations/0047_remove_contract_agreement_url_contractapproval.py
index b6a0e89..46b4ba5 100644
--- a/contracts/migrations/0047_remove_contract_agreement_url_contractapproval.py
+++ b/contracts/migrations/0047_remove_contract_agreement_url_contractapproval.py
@@ -1,33 +1,56 @@
# Generated by Django 4.1.4 on 2023-04-16 13:13
-import contracts.models
-from django.db import migrations, models
import django.db.models.deletion
+from django.db import migrations, models
+
+import contracts.models
import shared.models
class Migration(migrations.Migration):
-
dependencies = [
- ('contracts', '0046_alter_contract_paper_form_state'),
+ ("contracts", "0046_alter_contract_paper_form_state"),
]
operations = [
migrations.RemoveField(
- model_name='contract',
- name='agreement_url',
+ model_name="contract",
+ name="agreement_url",
),
migrations.CreateModel(
- name='ContractApproval',
+ name="ContractApproval",
fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=128, verbose_name='Jméno')),
- ('url', contracts.models.SubdomainValidatedURLField(help_text='Běžně odkaz na fórum. Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.', max_length=256, verbose_name='Odkaz')),
- ('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='approvals', to='contracts.contract', verbose_name='Smlouva')),
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("name", models.CharField(max_length=128, verbose_name="Jméno")),
+ (
+ "url",
+ contracts.models.SubdomainValidatedURLField(
+ help_text="Běžně odkaz na fórum. Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.",
+ max_length=256,
+ verbose_name="Odkaz",
+ ),
+ ),
+ (
+ "contract",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="approvals",
+ to="contracts.contract",
+ verbose_name="Smlouva",
+ ),
+ ),
],
options={
- 'verbose_name': 'Schválení',
- 'verbose_name_plural': 'Schválení',
+ "verbose_name": "Schválení",
+ "verbose_name_plural": "Schválení",
},
bases=(shared.models.NameStrMixin, models.Model),
),
diff --git a/contracts/migrations/0048_alter_contractapproval_options_and_more.py b/contracts/migrations/0048_alter_contractapproval_options_and_more.py
index ef92c3e..0c6368f 100644
--- a/contracts/migrations/0048_alter_contractapproval_options_and_more.py
+++ b/contracts/migrations/0048_alter_contractapproval_options_and_more.py
@@ -1,27 +1,37 @@
# Generated by Django 4.1.4 on 2023-04-16 13:17
-import contracts.models
from django.db import migrations
+import contracts.models
+
class Migration(migrations.Migration):
-
dependencies = [
- ('contracts', '0047_remove_contract_agreement_url_contractapproval'),
+ ("contracts", "0047_remove_contract_agreement_url_contractapproval"),
]
operations = [
migrations.AlterModelOptions(
- name='contractapproval',
- options={'verbose_name': 'Odkaz na schválení na Fóru', 'verbose_name_plural': 'Odkazy na schválení na Fóru'},
+ name="contractapproval",
+ options={
+ "verbose_name": "Odkaz na schválení na Fóru",
+ "verbose_name_plural": "Odkazy na schválení na Fóru",
+ },
),
migrations.AlterModelOptions(
- name='contractintent',
- options={'verbose_name': 'Odkaz na záměr v Piroplácení', 'verbose_name_plural': 'Odkazy na záměry v Piroplácení'},
+ name="contractintent",
+ options={
+ "verbose_name": "Odkaz na záměr v Piroplácení",
+ "verbose_name_plural": "Odkazy na záměry v Piroplácení",
+ },
),
migrations.AlterField(
- model_name='contractapproval',
- name='url',
- field=contracts.models.SubdomainValidatedURLField(help_text='Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.', max_length=256, verbose_name='Odkaz'),
+ model_name="contractapproval",
+ name="url",
+ field=contracts.models.SubdomainValidatedURLField(
+ help_text="Využívá se např. u koaličních smluv. Musí začínat <i>https</i> a být pod doménou <i>pirati.cz</i>.",
+ max_length=256,
+ verbose_name="Odkaz",
+ ),
),
]
diff --git a/contracts/migrations/0049_alter_contract_options.py b/contracts/migrations/0049_alter_contract_options.py
index 30756a5..1a5e3a5 100644
--- a/contracts/migrations/0049_alter_contract_options.py
+++ b/contracts/migrations/0049_alter_contract_options.py
@@ -4,14 +4,25 @@ from django.db import migrations
class Migration(migrations.Migration):
-
dependencies = [
- ('contracts', '0048_alter_contractapproval_options_and_more'),
+ ("contracts", "0048_alter_contractapproval_options_and_more"),
]
operations = [
migrations.AlterModelOptions(
- name='contract',
- options={'permissions': [('approve', 'Schválit / zrušit schválení'), ('view_confidential', 'Zobrazit tajné informace'), ('edit_when_approved', 'Upravit schválené'), ('delete_when_approved', 'Odstranit schválené'), ('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí'), ('can_edit_contract_settings', 'Can edit Smlouva settings')], 'verbose_name': 'Smlouva', 'verbose_name_plural': 'Smlouvy'},
+ name="contract",
+ options={
+ "permissions": [
+ ("approve", "Schválit / zrušit schválení"),
+ ("view_confidential", "Zobrazit tajné informace"),
+ ("edit_when_approved", "Upravit schválené"),
+ ("delete_when_approved", "Odstranit schválené"),
+ ("edit_others", "Upravit cizí"),
+ ("delete_others", "Odstranit cizí"),
+ ("can_edit_contract_settings", "Can edit Smlouva settings"),
+ ],
+ "verbose_name": "Smlouva",
+ "verbose_name_plural": "Smlouvy",
+ },
),
]
diff --git a/contracts/settings.py b/contracts/settings.py
index 45f7a67..8cd2d50 100644
--- a/contracts/settings.py
+++ b/contracts/settings.py
@@ -1,5 +1,4 @@
import dbsettings
-
from django import forms
diff --git a/contracts/views.py b/contracts/views.py
index a28fecd..2618dfd 100644
--- a/contracts/views.py
+++ b/contracts/views.py
@@ -67,12 +67,7 @@ def get_paginated_contracts(request, filter=None, annotations=None) -> tuple:
if annotations is not None:
contracts = contracts.annotate(**annotations)
- contracts = (
- contracts
- .filter(filter)
- .order_by("-valid_start_date")
- .all()
- )
+ contracts = contracts.filter(filter).order_by("-valid_start_date").all()
page, paginator = get_pagination(request, contracts)
@@ -149,7 +144,7 @@ def search(request):
{
"lower_name": Lower("name"),
"lower_summary": Lower("summary"),
- }
+ },
)
return render(
@@ -163,7 +158,7 @@ def search(request):
"paginator": paginator,
"query": query,
"query_is_set": query_is_set,
- }
+ },
)
--
GitLab