Skip to content
Snippets Groups Projects
Commit b505986e authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

list filtering, departments + normalization

parent 59c55233
No related branches found
No related tags found
1 merge request!3Release
Pipeline #12494 failed
Stage: build
Stage: test_deploy
Show whitespace changes
Inline Side-by-side
Showing
with 349 additions and 17 deletions
contracts/admin.py
+ 6
− 12
View file @ b505986e
import copy
import typing
from admin_auto_filters.filters import AutocompleteFilterFactory
from django.contrib import admin
from django.contrib.auth.models import Permission
from django.db import models
......@@ -168,11 +169,6 @@ class ContractAdmin(
):
form = ContractAdminForm
ordering = (
"-created_on",
"-updated_on",
"-name",
)
search_fields = ("name",)
readonly_fields = (
......@@ -364,12 +360,15 @@ class ContractAdmin(
return super().has_change_permission(request, obj)
list_filter = (
"types",
AutocompleteFilterFactory("Typ", "types"),
AutocompleteFilterFactory("Spisovna", "filing_area"),
AutocompleteFilterFactory("Problém", "issues"),
AutocompleteFilterFactory("Naše smluvná strana", "contractee_signatures__contractee"),
AutocompleteFilterFactory("Jiná smluvní strana", "signee_signatures__signee"),
"is_approved",
"is_valid",
"is_public",
"paper_form_state",
"issues",
("all_parties_sign_date", DateRangeFilter),
("valid_start_date", DateRangeFilter),
("valid_end_date", DateRangeFilter),
......@@ -385,19 +384,16 @@ class ContractAdmin(
class ContractTypeAdmin(MarkdownxGuardedModelAdmin):
model = ContractType
ordering = ("name",)
search_fields = ("name",)
class ContractIssueAdmin(MarkdownxGuardedModelAdmin):
model = ContractIssue
ordering = ("name",)
search_fields = ("name",)
class ContractFilingAreaAdmin(MarkdownxGuardedModelAdmin):
model = ContractFilingArea
ordering = ("name",)
search_fields = (
"name",
"person_responsible",
......@@ -425,7 +421,6 @@ class ContracteeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
"name",
"department",
)
ordering = ("name",)
class SigneeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
......@@ -446,7 +441,6 @@ class SigneeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
"name",
"department",
)
ordering = ("name",)
form = SigneeAdminForm
......
contracts/management/commands/import_old_contracts.py
+ 251
− 5
View file @ b505986e
......@@ -69,6 +69,10 @@ class Command(BaseCommand):
type_name = string.capwords(type_name)
patterns = (
(
r"\s\s+",
" "
),
(r" O ", " o "),
(r" S ", " s "),
(r" K ", " k "),
......@@ -140,10 +144,157 @@ class Command(BaseCommand):
return type_name
def normalize_department(self, type_name: str) -> str:
type_name = type_name.strip()
patterns = (
(
r"\s\s+",
" "
),
(
r"^Kraské sdružení Praha$",
"Krajské sdružení Praha"
),
(
r"^republikové předsednictvo$",
"Republikové předsednictvo"
),
(
r"^KS ",
"Krajské sdružení "
),
(
r"^(MS |místní sdružení )",
"Místní sdružení "
),
(
r"^(Ústecký kraj|Ustecký kraj)$",
"Krajské sdružení Ústecký kraj"
),
(
r"^Moravskoslezský kraj$",
"Krajské sdružení Moravskoslezský kraj",
),
(
r"^Karlovarský kraj$",
"Krajské sdružení Karlovarský kraj",
),
(
r"Jihočeská kraj",
"Jihočeský kraj",
),
(
r"^(Krajského |krajské |Kajské )",
"Krajské "
),
(
"^Poslanecký klub České pirátské strany$",
"Poslanecký klub"
),
(
r"Středočeký",
"Středočeský"
),
(
r"^Zahraničního odboru$",
"Zahraniční odbor"
),
(
r"JčK",
"Jihočeský kraj"
),
(
r"SčK",
"Středočeský kraj"
),
(
r"(ÚsK|UsK)",
"Ústecký kraj"
),
(
r"JmK",
"Jihomoravský kraj"
),
(
r"PaK",
"Pardubický kraj"
),
(
r"KhK",
"Královehradecký kraj"
),
(
r"(Prsonální|personální)",
"Personální"
),
(
r"^administrativní ",
"Administrativní "
),
(
r"technický",
"Technický"
),
(
r"Mediálni",
"Technický"
),
(
r"^řešitel ",
"Řešitel "
),
(
r"^předsednictvo ",
"Předsednictvo "
),
(
r"olomoucký",
"Olomoucký"
),
(
r"^místní ",
"Místní "
),
(
r"^celostátní ",
"Celostátní "
),
(
r"odbor",
"Odbor"
),
(
r"PKS",
"Předsednictvo krajského sdružení"
),
(
r"( KS | Krajského sdružení )",
" krajského sdružení "
),
(
r"^(Předsednictvo krajského sdružení |Předsednictvo |Místní předsednictvo )",
""
),
(
r"ého kraje$",
"ý kraj"
)
)
for pattern in patterns:
type_name = re.sub(pattern[0], pattern[1], type_name)
return type_name
def normalize_filing_area(self, area_name: str) -> str:
area_name = string.capwords(area_name)
patterns = (
(
r"\s\s+",
" "
),
(
r"^(Cenrální Spisovna|Censtrální Spisovna|Centrála|Centrálách Archiv Str"
r"any|Centrála Strany|Centrální Achiv Strany|Centrální Archiv|Centralni "
......@@ -303,6 +454,10 @@ class Command(BaseCommand):
).strip()
patterns = (
(
r"\s\s+",
" "
),
(
r"^(1\. Pirátská s\.r\.o|1\.Pirátská s\.r\.o\.)$",
"1. Pirátská s.r.o."
......@@ -322,7 +477,8 @@ class Command(BaseCommand):
(
(
r"^(Křesťanská a demokratická unie – Československá strana lidová|"
r"Křesťansko demokratická unie – Československá strana lidová)$"
r"Křesťansko demokratická unie – Československá strana lidová|Křes"
r"ťanská a demokratická unie - Československá strana lidová)$"
),
"Křesťanská a demokratická unie – Československá strana lidová"
),
......@@ -369,6 +525,34 @@ class Command(BaseCommand):
(
r" (KUdláčková|Kudlláčková)$",
" Kudláčková"
),
(
r"^Jiří knotek$",
"Jiří Knotek"
),
(
r"^JIří Roubíček$",
"Jiří Roubíček"
),
(
r"^Koalice Vlasta\. z\.s\.$",
"Koalice Vlasta, z.s."
),
(
r"^Mikuáš ",
"Mikuláš "
),
(
r"^Strana zelených$",
"Strana Zelených"
),
(
r"^Systemický institut s\.r\.o\.$",
"Systemický institut, s.r.o."
),
(
r"^Adéla hradilová$",
"Adéla Hradilová"
)
)
......@@ -428,7 +612,7 @@ class Command(BaseCommand):
instance.address_street_with_number = ""
if "road" in address:
instance.address_street_with_number = address["road"]
instance.address_street_with_number = string.capwords(address["road"])
if "house_number" in address:
instance.address_street_with_number += f" {address['house_number']}"
......@@ -436,12 +620,21 @@ class Command(BaseCommand):
for address_key, address_value in address.items():
match address_key:
case "city":
instance.address_district = address_value
if "district" not in address:
instance.address_district = string.capwords(address_value)
case "house":
if "city" not in address and "district" not in address:
instance.address_district = string.capwords(address_value)
case "city_district":
instance.address_district = string.capwords(address_value)
case "postcode":
instance.address_zip = address_value
instance.address_zip = string.capwords(address_value)
self.normalization_count += 1
case "IČ":
if is_contractee:
continue
if not isinstance(signing_party_value, int|str):
issue_count += 1
contract.notes += f"Špatně zadané IČO smluvní strany: {signing_party_value}\n"
......@@ -479,6 +672,23 @@ class Command(BaseCommand):
)
self.normalization_count += 1
function = None
if "funkce" in signing_party:
if isinstance(signing_party["funkce"], str):
function = signing_party["funkce"]
else:
issue_count += 1
contract.notes += f"Špatně zadaná funkce zástupce smluvní strany: {signing_party['funkce']}\n"
if self.verbosity >= 2:
self.stderr.write(
self.style.NOTICE(
f"Contract {slug} has an invalid signing party "
f"representative function: {signing_party['funkce']}."
)
)
representatives.append(
representative_model(
name=signing_party_value
......@@ -512,11 +722,40 @@ class Command(BaseCommand):
name=signing_party_value
)
)
case "orgán":
if not isinstance(signing_party_value, str):
issue_count += 1
contract.notes += f"Špatně zadaný orgán smluvní strany: {signing_party_value}\n"
if self.verbosity >= 2:
self.stderr.write(
self.style.NOTICE(
f"Contract {slug} has an invalid signing party "
f"department: {signing_party_value}."
)
)
continue
if signing_party_value in (
"Česká Pirátská strana",
"Česká pirátská strana",
):
# Irrelevant
continue
instance.department = self.normalize_department(signing_party_value)
self.normalization_count += 1
# Do our best to merge signing parties together.
existing_instance = model.objects.filter(
(
models.Q(name=instance.name)
& (
models.Q(department=instance.department)
if instance.department is not None
else models.Q(department__isnull=True)
)
& (
(
models.Q(address_street_with_number=instance.address_street_with_number)
......@@ -534,7 +773,14 @@ class Command(BaseCommand):
)
)
| (
(
models.Q(ico_number=instance.ico_number)
& (
models.Q(department=instance.department)
if instance.department is not None
else models.Q(department__isnull=True)
)
)
if instance.ico_number is not None
else models.Value(False)
)
......
contracts/migrations/0057_alter_contract_options_alter_contractee_options_and_more.py 0 → 100644
+ 37
− 0
View file @ b505986e
# Generated by Django 4.1.4 on 2023-04-23 10:28
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0056_rename_contractee_signature_contracteesignaturerepresentative_signature_and_more'),
]
operations = [
migrations.AlterModelOptions(
name='contract',
options={'ordering': ('-created_on', '-updated_on', '-name'), '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'},
),
migrations.AlterModelOptions(
name='contractee',
options={'ordering': ['-name', '-department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Naše smluvní strana', 'verbose_name_plural': 'Naše smluvní strany'},
),
migrations.AlterModelOptions(
name='contractfilingarea',
options={'ordering': ['-name'], 'verbose_name': 'Spisovna', 'verbose_name_plural': 'Spisovny'},
),
migrations.AlterModelOptions(
name='contractissue',
options={'ordering': ['-name'], 'verbose_name': 'Problém se smlouvou', 'verbose_name_plural': 'Problémy se smlouvami'},
),
migrations.AlterModelOptions(
name='contracttype',
options={'ordering': ['-name'], 'verbose_name': 'Typ smlouvy', 'verbose_name_plural': 'Typy smluv'},
),
migrations.AlterModelOptions(
name='signee',
options={'ordering': ['-name', '-department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Jiná smluvní strana', 'verbose_name_plural': 'Ostatní smluvní strany'},
),
]
contracts/migrations/0058_alter_contract_options_alter_contractee_options_and_more.py 0 → 100644
+ 37
− 0
View file @ b505986e
# Generated by Django 4.1.4 on 2023-04-23 10:29
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0057_alter_contract_options_alter_contractee_options_and_more'),
]
operations = [
migrations.AlterModelOptions(
name='contract',
options={'ordering': ('-created_on', '-updated_on', 'name'), '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'},
),
migrations.AlterModelOptions(
name='contractee',
options={'ordering': ['name', 'department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Naše smluvní strana', 'verbose_name_plural': 'Naše smluvní strany'},
),
migrations.AlterModelOptions(
name='contractfilingarea',
options={'ordering': ['name'], 'verbose_name': 'Spisovna', 'verbose_name_plural': 'Spisovny'},
),
migrations.AlterModelOptions(
name='contractissue',
options={'ordering': ['name'], 'verbose_name': 'Problém se smlouvou', 'verbose_name_plural': 'Problémy se smlouvami'},
),
migrations.AlterModelOptions(
name='contracttype',
options={'ordering': ['name'], 'verbose_name': 'Typ smlouvy', 'verbose_name_plural': 'Typy smluv'},
),
migrations.AlterModelOptions(
name='signee',
options={'ordering': ['name', 'department'], 'permissions': [('edit_others', 'Upravit cizí'), ('delete_others', 'Odstranit cizí')], 'verbose_name': 'Jiná smluvní strana', 'verbose_name_plural': 'Ostatní smluvní strany'},
),
]
contracts/models.py
+ 16
− 0
View file @ b505986e
......@@ -274,6 +274,8 @@ class Signee(
verbose_name = "Jiná smluvní strana"
verbose_name_plural = "Ostatní smluvní strany"
ordering = ["name", "department"]
permissions = OwnPermissionsMixin.Meta.permissions
......@@ -367,6 +369,8 @@ class Contractee(
verbose_name = "Naše smluvní strana"
verbose_name_plural = "Naše smluvní strany"
ordering = ["name", "department"]
permissions = OwnPermissionsMixin.Meta.permissions
......@@ -383,6 +387,8 @@ class ContractType(ContractCountMixin, NameStrMixin, models.Model):
class Meta:
app_label = "contracts"
ordering = ["name"]
verbose_name = "Typ smlouvy"
verbose_name_plural = "Typy smluv"
......@@ -400,6 +406,8 @@ class ContractIssue(ContractCountMixin, NameStrMixin, models.Model):
class Meta:
app_label = "contracts"
ordering = ["name"]
verbose_name = "Problém se smlouvou"
verbose_name_plural = "Problémy se smlouvami"
......@@ -422,6 +430,8 @@ class ContractFilingArea(ContractCountMixin, NameStrMixin, models.Model):
class Meta:
app_label = "contracts"
ordering = ["name"]
verbose_name = "Spisovna"
verbose_name_plural = "Spisovny"
......@@ -789,6 +799,12 @@ class Contract(NameStrMixin, models.Model):
verbose_name = "Smlouva"
verbose_name_plural = "Smlouvy"
ordering = (
"-created_on",
"-updated_on",
"name",
)
permissions = [
("approve", "Schválit / zrušit schválení"),
("view_confidential", "Zobrazit tajné informace"),
......
registry/settings/base.py
+ 1
− 0
View file @ b505986e
......@@ -53,6 +53,7 @@ INSTALLED_APPS = [
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles",
"admin_auto_filters",
"dbsettings",
"nested_admin",
"rangefilter",
......
requirements/base.txt
+ 1
− 0
View file @ b505986e
clamd==1.0.2
django==4.1.4
django-admin-autocomplete-filter==0.7.1
django-admin-index==2.0.2
django-admin-interface==0.24.2
django-admin-rangefilter==0.9.0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft