diff --git a/deploy_v2/admin_org_prava.json b/deploy_v2/admin_org_prava.json index 370aec4f..c7fc8c7d 100644 --- a/deploy_v2/admin_org_prava.json +++ b/deploy_v2/admin_org_prava.json @@ -216,57 +216,57 @@ }, { "codename": "add_cislo", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "cislo" }, { "codename": "change_cislo", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "cislo" }, { "codename": "delete_cislo", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "cislo" }, { "codename": "view_cislo", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "cislo" }, { "codename": "add_clanek", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "clanek" }, { "codename": "change_clanek", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "clanek" }, { "codename": "delete_clanek", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "clanek" }, { "codename": "view_clanek", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "clanek" }, { "codename": "add_deadline", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "deadline" }, { "codename": "change_deadline", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "deadline" }, { "codename": "view_deadline", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "deadline" }, { @@ -371,22 +371,22 @@ }, { "codename": "add_pohadka", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "pohadka" }, { "codename": "change_pohadka", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "pohadka" }, { "codename": "delete_pohadka", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "pohadka" }, { "codename": "view_pohadka", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "pohadka" }, { @@ -411,22 +411,22 @@ }, { "codename": "add_problem", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "problem" }, { "codename": "change_problem", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "problem" }, { "codename": "delete_problem", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "problem" }, { "codename": "view_problem", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "problem" }, { @@ -441,22 +441,22 @@ }, { "codename": "add_rocnik", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "rocnik" }, { "codename": "change_rocnik", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "rocnik" }, { "codename": "delete_rocnik", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "rocnik" }, { "codename": "view_rocnik", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "rocnik" }, { @@ -541,42 +541,42 @@ }, { "codename": "add_tema", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "tema" }, { "codename": "change_tema", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "tema" }, { "codename": "delete_tema", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "tema" }, { "codename": "view_tema", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "tema" }, { "codename": "add_uloha", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "uloha" }, { "codename": "change_uloha", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "uloha" }, { "codename": "delete_uloha", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "uloha" }, { "codename": "view_uloha", - "ct_app_label": "seminar", + "ct_app_label": "tvorba", "ct_model": "uloha" }, { diff --git a/odevzdavatko/migrations/0004_tvorba_pre.py b/odevzdavatko/migrations/0004_tvorba_pre.py new file mode 100644 index 00000000..a571c07e --- /dev/null +++ b/odevzdavatko/migrations/0004_tvorba_pre.py @@ -0,0 +1,13 @@ +# Generated by Django 4.2.16 on 2024-10-30 01:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('odevzdavatko', '0003_odstrel_odevzdavatka_post'), + ] + + operations = [ + ] diff --git a/odevzdavatko/migrations/0005_tvorba_relink.py b/odevzdavatko/migrations/0005_tvorba_relink.py new file mode 100644 index 00000000..2d235410 --- /dev/null +++ b/odevzdavatko/migrations/0005_tvorba_relink.py @@ -0,0 +1,35 @@ +# Generated by Django 4.2.16 on 2024-10-30 13:18 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('tvorba', '0001_tvorba_create'), + ('odevzdavatko', '0004_tvorba_pre'), + ] + + operations = [ + migrations.AlterField( + model_name='hodnoceni', + name='cislo_body', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='hodnoceni', to='tvorba.cislo', verbose_name='číslo pro body'), + ), + migrations.AlterField( + model_name='hodnoceni', + name='deadline_body', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='hodnoceni', to='tvorba.deadline', verbose_name='deadline pro body'), + ), + migrations.AlterField( + model_name='hodnoceni', + name='problem', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='hodnoceni', to='tvorba.problem', verbose_name='problém'), + ), + migrations.AlterField( + model_name='reseni', + name='problem', + field=models.ManyToManyField(help_text='Problém', through='odevzdavatko.Hodnoceni', to='tvorba.problem', verbose_name='problém'), + ), + ] diff --git a/odevzdavatko/migrations/0006_tvorba_post.py b/odevzdavatko/migrations/0006_tvorba_post.py new file mode 100644 index 00000000..13ab895c --- /dev/null +++ b/odevzdavatko/migrations/0006_tvorba_post.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.16 on 2024-10-30 21:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('odevzdavatko', '0005_tvorba_relink'), + ('tvorba', '0003_tvorba_post'), + ] + + operations = [ + ] diff --git a/odevzdavatko/models.py b/odevzdavatko/models.py index a5b6a7e1..a52f370f 100644 --- a/odevzdavatko/models.py +++ b/odevzdavatko/models.py @@ -9,7 +9,7 @@ from django.urls import reverse_lazy from django.utils import timezone from django.conf import settings -import seminar.models as am # tvorba +import tvorba.models as am from seminar.models import base as bm from odevzdavatko.utils import vzorecek_na_prepocet, inverze_vzorecku_na_prepocet diff --git a/personalni/migrations/0014_tvorba_pre.py b/personalni/migrations/0014_tvorba_pre.py new file mode 100644 index 00000000..2d976333 --- /dev/null +++ b/personalni/migrations/0014_tvorba_pre.py @@ -0,0 +1,13 @@ +# Generated by Django 4.2.16 on 2024-10-30 01:07 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('personalni', '0013_odstrel_odevzdavatka_post'), + ] + + operations = [ + ] diff --git a/personalni/migrations/0015_tvorba_post.py b/personalni/migrations/0015_tvorba_post.py new file mode 100644 index 00000000..6580b1e8 --- /dev/null +++ b/personalni/migrations/0015_tvorba_post.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.16 on 2024-10-30 21:35 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('personalni', '0014_tvorba_pre'), + ('tvorba', '0003_tvorba_post'), + ] + + operations = [ + ] diff --git a/personalni/templates/personalni/profil/orgorozcestnik.html b/personalni/templates/personalni/profil/orgorozcestnik.html index 90d5867d..9d0bbdba 100644 --- a/personalni/templates/personalni/profil/orgorozcestnik.html +++ b/personalni/templates/personalni/profil/orgorozcestnik.html @@ -20,7 +20,7 @@

Tvorba čísla