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

run hooks

parent ea8c153a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 690 additions and 238 deletions
contracts/admin.py
+ 1
− 4
View file @ 74bc6674
......@@ -2,10 +2,7 @@ from django.contrib import admin
from shared.admin import MarkdownxGuardedModelAdmin
from .forms import (
ContractAdminForm,
SigneeAdminForm,
)
from .forms import ContractAdminForm, SigneeAdminForm
from .models import (
Contract,
Contractee,
......
contracts/migrations/0001_initial.py
+ 552
− 123
View file @ 74bc6674
# Generated by Django 4.1.4 on 2023-02-20 11:46
import colorfield.fields
import contracts.models
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django_countries.fields
import markdownx.models
from django.conf import settings
from django.db import migrations, models
import contracts.models
import shared.models
class Migration(migrations.Migration):
initial = True
dependencies = [
......@@ -20,211 +20,640 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
name='Contract',
name="Contract",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('all_parties_sign_date', models.DateField(blank=True, null=True, verbose_name='Datum podpisu všech stran')),
('valid_start_date', models.DateField(verbose_name='Začátek účinnosti')),
('valid_end_date', models.DateField(verbose_name='Konec platnosti')),
('legal_state', models.CharField(choices=[('valid', 'Platná'), ('effective', 'Účinná'), ('not_effective', 'Neúčinná'), ('invalid', 'Neplatná')], max_length=13, verbose_name='Stav právního ujednání')),
('public_state', models.CharField(choices=[('yes', 'Veřejná'), ('no', 'Neveřejná')], max_length=7, verbose_name='Veřejnost smlouvy')),
('paper_form_state', models.CharField(choices=[('sent', 'Odeslaná'), ('stored', 'Uložená'), ('to_shred', 'Ke skartaci'), ('shredded', 'Skartovaná'), ('lost', 'Ztracená')], max_length=8, verbose_name='Stav papírové formy')),
('publishing_rejection_comment', models.CharField(blank=True, help_text='Obsah není veřejně přístupný.', max_length=65536, null=True, verbose_name='Důvod nezveřejnění')),
('tender_url', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz na výběrové řízení')),
('agreement_url', models.URLField(blank=True, max_length=256, null=True, verbose_name='Odkaz na schválení')),
('identifier', models.CharField(max_length=128, verbose_name='Identifikační číslo')),
('notes', markdownx.models.MarkdownxField(blank=True, help_text='Poznámky jsou viditelné pro všechny, kteří mohou smlouvu spravovat.', null=True, verbose_name='Poznámky')),
('summary', markdownx.models.MarkdownxField(blank=True, help_text='Obsah není veřejně přístupný.', null=True, verbose_name='Rekapitulace')),
('created_by', models.ForeignKey(blank=True, help_text='Informace není veřejně přístupná. Pokud vytváříš novou smlouvu, budeš to ty.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='uploaded_contracts', to=settings.AUTH_USER_MODEL, verbose_name='Vytvořena uživatelem')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"all_parties_sign_date",
models.DateField(
blank=True, null=True, verbose_name="Datum podpisu všech stran"
),
),
(
"valid_start_date",
models.DateField(verbose_name="Začátek účinnosti"),
),
("valid_end_date", models.DateField(verbose_name="Konec platnosti")),
(
"legal_state",
models.CharField(
choices=[
("valid", "Platná"),
("effective", "Účinná"),
("not_effective", "Neúčinná"),
("invalid", "Neplatná"),
],
max_length=13,
verbose_name="Stav právního ujednání",
),
),
(
"public_state",
models.CharField(
choices=[("yes", "Veřejná"), ("no", "Neveřejná")],
max_length=7,
verbose_name="Veřejnost smlouvy",
),
),
(
"paper_form_state",
models.CharField(
choices=[
("sent", "Odeslaná"),
("stored", "Uložená"),
("to_shred", "Ke skartaci"),
("shredded", "Skartovaná"),
("lost", "Ztracená"),
],
max_length=8,
verbose_name="Stav papírové formy",
),
),
(
"publishing_rejection_comment",
models.CharField(
blank=True,
help_text="Obsah není veřejně přístupný.",
max_length=65536,
null=True,
verbose_name="Důvod nezveřejnění",
),
),
(
"tender_url",
models.URLField(
blank=True,
max_length=256,
null=True,
verbose_name="Odkaz na výběrové řízení",
),
),
(
"agreement_url",
models.URLField(
blank=True,
max_length=256,
null=True,
verbose_name="Odkaz na schválení",
),
),
(
"identifier",
models.CharField(
max_length=128, verbose_name="Identifikační číslo"
),
),
(
"notes",
markdownx.models.MarkdownxField(
blank=True,
help_text="Poznámky jsou viditelné pro všechny, kteří mohou smlouvu spravovat.",
null=True,
verbose_name="Poznámky",
),
),
(
"summary",
markdownx.models.MarkdownxField(
blank=True,
help_text="Obsah není veřejně přístupný.",
null=True,
verbose_name="Rekapitulace",
),
),
(
"created_by",
models.ForeignKey(
blank=True,
help_text="Informace není veřejně přístupná. Pokud vytváříš novou smlouvu, budeš to ty.",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="uploaded_contracts",
to=settings.AUTH_USER_MODEL,
verbose_name="Vytvořena uživatelem",
),
),
],
options={
'verbose_name': 'Smlouva',
'verbose_name_plural': 'Smlouvy',
"verbose_name": "Smlouva",
"verbose_name_plural": "Smlouvy",
},
),
migrations.CreateModel(
name='Contractee',
name="Contractee",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(default='Česká pirátská strana', max_length=256, verbose_name='Jméno')),
('address_street_with_number', models.CharField(default='Na Moráni 360/3', max_length=256, verbose_name='Ulice, č.p.')),
('address_district', models.CharField(default='Praha 2', max_length=256, verbose_name='Obec')),
('address_zip', models.CharField(default='128 00', max_length=16, verbose_name='PSČ')),
('address_country', django_countries.fields.CountryField(default='CZ', max_length=2, verbose_name='Země')),
('ico_number', models.CharField(blank=True, default='71339698', max_length=16, null=True, verbose_name='IČO')),
('department', models.CharField(blank=True, max_length=128, null=True, verbose_name='Organizační složka')),
('color', colorfield.fields.ColorField(blank=True, default=None, image_field=None, max_length=18, null=True, samples=None, verbose_name='Barva')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"name",
models.CharField(
default="Česká pirátská strana",
max_length=256,
verbose_name="Jméno",
),
),
(
"address_street_with_number",
models.CharField(
default="Na Moráni 360/3",
max_length=256,
verbose_name="Ulice, č.p.",
),
),
(
"address_district",
models.CharField(
default="Praha 2", max_length=256, verbose_name="Obec"
),
),
(
"address_zip",
models.CharField(
default="128 00", max_length=16, verbose_name="PSČ"
),
),
(
"address_country",
django_countries.fields.CountryField(
default="CZ", max_length=2, verbose_name="Země"
),
),
(
"ico_number",
models.CharField(
blank=True,
default="71339698",
max_length=16,
null=True,
verbose_name="IČO",
),
),
(
"department",
models.CharField(
blank=True,
max_length=128,
null=True,
verbose_name="Organizační složka",
),
),
(
"color",
colorfield.fields.ColorField(
blank=True,
default=None,
image_field=None,
max_length=18,
null=True,
samples=None,
verbose_name="Barva",
),
),
],
options={
'verbose_name': 'Naše smluvní strana',
'verbose_name_plural': 'Naše smluvní strany',
"verbose_name": "Naše smluvní strana",
"verbose_name_plural": "Naše smluvní strany",
},
),
migrations.CreateModel(
name='ContractFilingArea',
name="ContractFilingArea",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=32, verbose_name='Jméno')),
('person_responsible', models.CharField(max_length=256, verbose_name='Odpovědná osoba')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=32, verbose_name="Jméno")),
(
"person_responsible",
models.CharField(max_length=256, verbose_name="Odpovědná osoba"),
),
],
options={
'verbose_name': 'Spisovna',
'verbose_name_plural': 'Spisovny',
"verbose_name": "Spisovna",
"verbose_name_plural": "Spisovny",
},
bases=(shared.models.NameStrMixin, models.Model),
),
migrations.CreateModel(
name='ContractIssue',
name="ContractIssue",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=32, verbose_name='Jméno')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=32, verbose_name="Jméno")),
],
options={
'verbose_name': 'Problém se smlouvou',
'verbose_name_plural': 'Problémy se smlouvami',
"verbose_name": "Problém se smlouvou",
"verbose_name_plural": "Problémy se smlouvami",
},
bases=(shared.models.NameStrMixin, models.Model),
),
migrations.CreateModel(
name='ContractType',
name="ContractType",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=32, verbose_name='Jméno')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=32, verbose_name="Jméno")),
],
options={
'verbose_name': 'Typ smlouvy',
'verbose_name_plural': 'Typy smlouvy',
"verbose_name": "Typ smlouvy",
"verbose_name_plural": "Typy smlouvy",
},
bases=(shared.models.NameStrMixin, models.Model),
),
migrations.CreateModel(
name='Signee',
name="Signee",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256, verbose_name='Jméno')),
('is_legal_entity', models.BooleanField(help_text='Důležité označit správně! Pokud není osoba právnická, zveřejňujeme pouze obec a zemi.', verbose_name='Je právnická osoba')),
('address_street_with_number', models.CharField(help_text='Viditelné pouze u právnických osob.', max_length=256, verbose_name='Ulice, č.p.')),
('address_district', models.CharField(max_length=256, verbose_name='Obec')),
('address_zip', models.CharField(help_text='Viditelné pouze u právnických osob.', max_length=16, verbose_name='PSČ')),
('address_country', django_countries.fields.CountryField(max_length=2, verbose_name='Země')),
('ico_number', models.CharField(blank=True, max_length=16, null=True, verbose_name='IČO')),
('date_of_birth', models.DateField(blank=True, null=True, verbose_name='Datum narození')),
('department', models.CharField(blank=True, max_length=128, null=True, verbose_name='Organizační složka')),
('color', colorfield.fields.ColorField(blank=True, default=None, image_field=None, max_length=18, null=True, samples=None, verbose_name='Barva')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=256, verbose_name="Jméno")),
(
"is_legal_entity",
models.BooleanField(
help_text="Důležité označit správně! Pokud není osoba právnická, zveřejňujeme pouze obec a zemi.",
verbose_name="Je právnická osoba",
),
),
(
"address_street_with_number",
models.CharField(
help_text="Viditelné pouze u právnických osob.",
max_length=256,
verbose_name="Ulice, č.p.",
),
),
(
"address_district",
models.CharField(max_length=256, verbose_name="Obec"),
),
(
"address_zip",
models.CharField(
help_text="Viditelné pouze u právnických osob.",
max_length=16,
verbose_name="PSČ",
),
),
(
"address_country",
django_countries.fields.CountryField(
max_length=2, verbose_name="Země"
),
),
(
"ico_number",
models.CharField(
blank=True, max_length=16, null=True, verbose_name="IČO"
),
),
(
"date_of_birth",
models.DateField(
blank=True, null=True, verbose_name="Datum narození"
),
),
(
"department",
models.CharField(
blank=True,
max_length=128,
null=True,
verbose_name="Organizační složka",
),
),
(
"color",
colorfield.fields.ColorField(
blank=True,
default=None,
image_field=None,
max_length=18,
null=True,
samples=None,
verbose_name="Barva",
),
),
],
options={
'verbose_name': 'Jiná smluvní strana',
'verbose_name_plural': 'Ostatní smluvní strany',
"verbose_name": "Jiná smluvní strana",
"verbose_name_plural": "Ostatní smluvní strany",
},
),
migrations.CreateModel(
name='SigneeSignature',
name="SigneeSignature",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateField(verbose_name='Datum podpisu')),
('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='signee_signatures', to='contracts.contract', verbose_name='Podpisy jiných smluvních stran')),
('signee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='signatures', to='contracts.signee', verbose_name='Smluvní strana')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("date", models.DateField(verbose_name="Datum podpisu")),
(
"contract",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="signee_signatures",
to="contracts.contract",
verbose_name="Podpisy jiných smluvních stran",
),
),
(
"signee",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="signatures",
to="contracts.signee",
verbose_name="Smluvní strana",
),
),
],
options={
'verbose_name': 'Podpis jiné smluvní strany',
'verbose_name_plural': 'Podpisy ostatních smluvních stran',
"verbose_name": "Podpis jiné smluvní strany",
"verbose_name_plural": "Podpisy ostatních smluvních stran",
},
),
migrations.CreateModel(
name='SigneeRepresentative',
name="SigneeRepresentative",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256, verbose_name='Jméno')),
('function', models.CharField(blank=True, max_length=256, null=True, verbose_name='Funkce')),
('role', models.CharField(blank=True, max_length=256, null=True, verbose_name='Role')),
('signee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='representatives', to='contracts.signee', verbose_name='Smluvní strana')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=256, verbose_name="Jméno")),
(
"function",
models.CharField(
blank=True, max_length=256, null=True, verbose_name="Funkce"
),
),
(
"role",
models.CharField(
blank=True, max_length=256, null=True, verbose_name="Role"
),
),
(
"signee",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="representatives",
to="contracts.signee",
verbose_name="Smluvní strana",
),
),
],
options={
'verbose_name': 'Zástupce',
'verbose_name_plural': 'Zástupci',
"verbose_name": "Zástupce",
"verbose_name_plural": "Zástupci",
},
bases=(contracts.models.RepresentativeMixin, models.Model),
),
migrations.CreateModel(
name='ContractIntent',
name="ContractIntent",
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', models.URLField(max_length=256, verbose_name='Odkaz')),
('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='intents', 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", models.URLField(max_length=256, verbose_name="Odkaz")),
(
"contract",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="intents",
to="contracts.contract",
verbose_name="Smlouva",
),
),
],
options={
'verbose_name': 'Záměr',
'verbose_name_plural': 'Záměry',
"verbose_name": "Záměr",
"verbose_name_plural": "Záměry",
},
bases=(shared.models.NameStrMixin, models.Model),
),
migrations.CreateModel(
name='ContractFile',
name="ContractFile",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(blank=True, max_length=128, null=True, verbose_name='Jméno')),
('is_public', models.BooleanField(default=False, verbose_name='Veřejně dostupný')),
('file', models.FileField(upload_to='', verbose_name='Soubor')),
('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='contracts.contract', verbose_name='Soubory')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"name",
models.CharField(
blank=True, max_length=128, null=True, verbose_name="Jméno"
),
),
(
"is_public",
models.BooleanField(default=False, verbose_name="Veřejně dostupný"),
),
("file", models.FileField(upload_to="", verbose_name="Soubor")),
(
"contract",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="files",
to="contracts.contract",
verbose_name="Soubory",
),
),
],
options={
'verbose_name': 'Soubor',
'verbose_name_plural': 'Soubory',
"verbose_name": "Soubor",
"verbose_name_plural": "Soubory",
},
bases=(shared.models.NameStrMixin, models.Model),
),
migrations.CreateModel(
name='ContracteeSignature',
name="ContracteeSignature",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateField(verbose_name='Datum podpisu')),
('contract', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contractee_signatures', to='contracts.contract', verbose_name='Podpisy našich smluvních stran')),
('contractee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='signatures', to='contracts.contractee', verbose_name='Smluvní strana')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("date", models.DateField(verbose_name="Datum podpisu")),
(
"contract",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="contractee_signatures",
to="contracts.contract",
verbose_name="Podpisy našich smluvních stran",
),
),
(
"contractee",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="signatures",
to="contracts.contractee",
verbose_name="Smluvní strana",
),
),
],
options={
'verbose_name': 'Podpis naší smluvní strany',
'verbose_name_plural': 'Podpisy našich smluvních stran',
"verbose_name": "Podpis naší smluvní strany",
"verbose_name_plural": "Podpisy našich smluvních stran",
},
),
migrations.CreateModel(
name='ContracteeRepresentative',
name="ContracteeRepresentative",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256, verbose_name='Jméno')),
('function', models.CharField(blank=True, max_length=256, null=True, verbose_name='Funkce')),
('role', models.CharField(blank=True, max_length=256, null=True, verbose_name='Role')),
('contractee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='representatives', to='contracts.contractee', verbose_name='Smluvní strana')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=256, verbose_name="Jméno")),
(
"function",
models.CharField(
blank=True, max_length=256, null=True, verbose_name="Funkce"
),
),
(
"role",
models.CharField(
blank=True, max_length=256, null=True, verbose_name="Role"
),
),
(
"contractee",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="representatives",
to="contracts.contractee",
verbose_name="Smluvní strana",
),
),
],
options={
'verbose_name': 'Zástupce',
'verbose_name_plural': 'Zástupci',
"verbose_name": "Zástupce",
"verbose_name_plural": "Zástupci",
},
bases=(contracts.models.RepresentativeMixin, models.Model),
),
migrations.AddField(
model_name='contract',
name='filing_area',
field=models.ForeignKey(blank=True, help_text='Obsah není veřejně přístupný.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='filed_contracts', to='contracts.contractfilingarea', verbose_name='Spisovna'),
model_name="contract",
name="filing_area",
field=models.ForeignKey(
blank=True,
help_text="Obsah není veřejně přístupný.",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="filed_contracts",
to="contracts.contractfilingarea",
verbose_name="Spisovna",
),
),
migrations.AddField(
model_name='contract',
name='issues',
field=models.ManyToManyField(blank=True, to='contracts.contractissue', verbose_name='Problémy'),
model_name="contract",
name="issues",
field=models.ManyToManyField(
blank=True, to="contracts.contractissue", verbose_name="Problémy"
),
),
migrations.AddField(
model_name='contract',
name='primary_contract',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='subcontracts', to='contracts.contract', verbose_name='Primární smlouva'),
model_name="contract",
name="primary_contract",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="subcontracts",
to="contracts.contract",
verbose_name="Primární smlouva",
),
),
migrations.AddField(
model_name='contract',
name='public_status_set_by',
field=models.ForeignKey(blank=True, help_text='Obsah není veřejně přístupný.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='public_status_altered_contracts', to=settings.AUTH_USER_MODEL, verbose_name='Zveřejněno / nezveřejněno uživatelem'),
model_name="contract",
name="public_status_set_by",
field=models.ForeignKey(
blank=True,
help_text="Obsah není veřejně přístupný.",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="public_status_altered_contracts",
to=settings.AUTH_USER_MODEL,
verbose_name="Zveřejněno / nezveřejněno uživatelem",
),
),
migrations.AddField(
model_name='contract',
name='types',
field=models.ManyToManyField(to='contracts.contracttype', verbose_name='Typ'),
model_name="contract",
name="types",
field=models.ManyToManyField(
to="contracts.contracttype", verbose_name="Typ"
),
),
]
contracts/migrations/0002_contract_is_approved_alter_contract_valid_end_date.py
+ 11
− 8
View file @ 74bc6674
......@@ -4,21 +4,24 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0001_initial'),
("contracts", "0001_initial"),
]
operations = [
migrations.AddField(
model_name='contract',
name='is_approved',
field=models.BooleanField(default=False, help_text='Může měnit jen schvalovatel. Pokud je smlouva veřejná, zaškrtnutím se vypustí ven.', verbose_name='Je schválená'),
model_name="contract",
name="is_approved",
field=models.BooleanField(
default=False,
help_text="Může měnit jen schvalovatel. Pokud je smlouva veřejná, zaškrtnutím se vypustí ven.",
verbose_name="Je schválená",
),
preserve_default=False,
),
migrations.AlterField(
model_name='contract',
name='valid_end_date',
field=models.DateField(verbose_name='Konec účinnosti'),
model_name="contract",
name="valid_end_date",
field=models.DateField(verbose_name="Konec účinnosti"),
),
]
contracts/migrations/0003_contract_expected_cost_hour_and_more.py
+ 16
− 11
View file @ 74bc6674
......@@ -4,25 +4,30 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0002_contract_is_approved_alter_contract_valid_end_date'),
("contracts", "0002_contract_is_approved_alter_contract_valid_end_date"),
]
operations = [
migrations.AddField(
model_name='contract',
name='expected_cost_hour',
field=models.IntegerField(blank=True, null=True, verbose_name='Očekávané výdaje (hodina)'),
model_name="contract",
name="expected_cost_hour",
field=models.IntegerField(
blank=True, null=True, verbose_name="Očekávané výdaje (hodina)"
),
),
migrations.AddField(
model_name='contract',
name='expected_cost_month',
field=models.IntegerField(blank=True, null=True, verbose_name='Očekávané výdaje (měsíc)'),
model_name="contract",
name="expected_cost_month",
field=models.IntegerField(
blank=True, null=True, verbose_name="Očekávané výdaje (měsíc)"
),
),
migrations.AddField(
model_name='contract',
name='expected_cost_year',
field=models.IntegerField(blank=True, null=True, verbose_name='Očekávané výdaje (rok)'),
model_name="contract",
name="expected_cost_year",
field=models.IntegerField(
blank=True, null=True, verbose_name="Očekávané výdaje (rok)"
),
),
]
contracts/migrations/0004_alter_contract_options.py
+ 7
− 4
View file @ 74bc6674
......@@ -4,14 +4,17 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('contracts', '0003_contract_expected_cost_hour_and_more'),
("contracts", "0003_contract_expected_cost_hour_and_more"),
]
operations = [
migrations.AlterModelOptions(
name='contract',
options={'permissions': (('approve', 'Schválit / zrušit schválení'),), 'verbose_name': 'Smlouva', 'verbose_name_plural': 'Smlouvy'},
name="contract",
options={
"permissions": (("approve", "Schválit / zrušit schválení"),),
"verbose_name": "Smlouva",
"verbose_name_plural": "Smlouvy",
},
),
]
contracts/migrations/0005_alter_contract_primary_contract.py
+ 13
− 6
View file @ 74bc6674
# Generated by Django 4.1.4 on 2023-02-21 06:07
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0004_alter_contract_options'),
("contracts", "0004_alter_contract_options"),
]
operations = [
migrations.AlterField(
model_name='contract',
name='primary_contract',
field=models.ForeignKey(blank=True, help_text='Např. pro dodatky nebo objednávky u rámcových smluv.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='subcontracts', to='contracts.contract', verbose_name='Primární smlouva'),
model_name="contract",
name="primary_contract",
field=models.ForeignKey(
blank=True,
help_text="Např. pro dodatky nebo objednávky u rámcových smluv.",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="subcontracts",
to="contracts.contract",
verbose_name="Primární smlouva",
),
),
]
contracts/migrations/0006_alter_contract_issues_alter_contract_summary.py
+ 17
− 8
View file @ 74bc6674
......@@ -4,20 +4,29 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0005_alter_contract_primary_contract'),
("contracts", "0005_alter_contract_primary_contract"),
]
operations = [
migrations.AlterField(
model_name='contract',
name='issues',
field=models.ManyToManyField(blank=True, help_text='Veřejně nazváno "Poznámky".', to='contracts.contractissue', verbose_name='Problémy'),
model_name="contract",
name="issues",
field=models.ManyToManyField(
blank=True,
help_text='Veřejně nazváno "Poznámky".',
to="contracts.contractissue",
verbose_name="Problémy",
),
),
migrations.AlterField(
model_name='contract',
name='summary',
field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Sumarizace obsahu smlouvy'),
model_name="contract",
name="summary",
field=models.CharField(
blank=True,
max_length=256,
null=True,
verbose_name="Sumarizace obsahu smlouvy",
),
),
]
contracts/migrations/0007_alter_contractee_address_country_and_more.py
+ 7
− 8
View file @ 74bc6674
......@@ -4,20 +4,19 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contracts', '0006_alter_contract_issues_alter_contract_summary'),
("contracts", "0006_alter_contract_issues_alter_contract_summary"),
]
operations = [
migrations.AlterField(
model_name='contractee',
name='address_country',
field=models.CharField(default='CZ', max_length=256, verbose_name='Země'),
model_name="contractee",
name="address_country",
field=models.CharField(default="CZ", max_length=256, verbose_name="Země"),
),
migrations.AlterField(
model_name='signee',
name='address_country',
field=models.CharField(default='CZ', max_length=256, verbose_name='Země'),
model_name="signee",
name="address_country",
field=models.CharField(default="CZ", max_length=256, verbose_name="Země"),
),
]
contracts/models.py
+ 17
− 19
View file @ 74bc6674
import math
from colorfield.fields import ColorField
from django.conf import settings
from django.db import models
from colorfield.fields import ColorField
from markdownx.models import MarkdownxField
from shared.models import NameStrMixin
......@@ -368,7 +368,7 @@ class Contract(models.Model):
help_text=(
"Může měnit jen schvalovatel. Pokud je smlouva "
"veřejná, zaškrtnutím se vypustí ven."
)
),
)
valid_start_date = models.DateField(
......@@ -439,7 +439,7 @@ class Contract(models.Model):
ContractIssue,
blank=True,
verbose_name="Problémy",
help_text="Veřejně nazváno \"Poznámky\".",
help_text='Veřejně nazváno "Poznámky".',
)
# NOTE: Could we make this into expected_cost_type and expected_cost_amount?
......@@ -479,7 +479,7 @@ class Contract(models.Model):
null=True,
related_name="subcontracts",
verbose_name="Primární smlouva",
help_text="Např. pro dodatky nebo objednávky u rámcových smluv."
help_text="Např. pro dodatky nebo objednávky u rámcových smluv.",
) # WARNING: Dependent on the type!
notes = MarkdownxField(
......@@ -493,9 +493,7 @@ class Contract(models.Model):
verbose_name = "Smlouva"
verbose_name_plural = "Smlouvy"
permissions = (
("approve", "Schválit / zrušit schválení"),
)
permissions = (("approve", "Schválit / zrušit schválení"),)
def __str__(self) -> str:
return self.identifier
......
contracts/templates/contracts/index.html
+ 9
− 9
View file @ 74bc6674
contracts/templates/contracts/view_contract.html
+ 14
− 14
View file @ 74bc6674
contracts/templatetags/subtract.py
+ 1
− 1
View file @ 74bc6674
contracts/views.py
+ 15
− 13
View file @ 74bc6674
from django.conf import settings
from django.shortcuts import render
from django.core.paginator import Paginator
from django.shortcuts import render
from .models import Contract
......@@ -8,15 +8,17 @@ from .models import Contract
def index(request):
contracts = Contract.objects.filter(
contracts = (
Contract.objects.filter(
is_approved=True,
public_state=Contract.PublicStates.YES,
).order_by("valid_start_date").all()
)
.order_by("valid_start_date")
.all()
)
paginator = Paginator(contracts, 25)
page = paginator.get_page(
request.GET.get('page')
)
page = paginator.get_page(request.GET.get("page"))
print(request.user)
......@@ -30,7 +32,7 @@ def index(request):
"description": "Description",
"paginator": paginator,
"page": page,
}
},
)
......@@ -49,5 +51,5 @@ def view_contract(request, id: int):
"title": contract.identifier,
"description": "", # TODO
"contract": contract,
}
},
)
shared/templates/shared/includes/base.html
+ 10
− 10
View file @ 74bc6674
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