Compare commits
3 commits
ae8040fb04
...
e3ce5efdd6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3ce5efdd6 | ||
|
|
a1c1b9f280 | ||
|
|
b550857a8d |
5 changed files with 72 additions and 2 deletions
|
|
@ -0,0 +1,33 @@
|
||||||
|
# Generated by Django 4.2.8 on 2024-03-12 20:44
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('seminar', '0117_auto_20240312_2125'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='organizator',
|
||||||
|
options={'managed': False, 'ordering': ['-organizuje_do', 'osoba__jmeno', 'osoba__prijmeni'], 'verbose_name': 'Organizátor', 'verbose_name_plural': 'Organizátoři'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='osoba',
|
||||||
|
options={'managed': False, 'ordering': ['prijmeni', 'jmeno'], 'verbose_name': 'Osoba', 'verbose_name_plural': 'Osoby'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='prijemce',
|
||||||
|
options={'managed': False, 'verbose_name': 'příjemce', 'verbose_name_plural': 'příjemce'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='resitel',
|
||||||
|
options={'managed': False, 'ordering': ['osoba'], 'verbose_name': 'Řešitel', 'verbose_name_plural': 'Řešitelé'},
|
||||||
|
),
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='skola',
|
||||||
|
options={'managed': False, 'ordering': ['mesto', 'nazev'], 'verbose_name': 'Škola', 'verbose_name_plural': 'Školy'},
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -25,6 +25,7 @@ class Osoba(SeminarModelBase):
|
||||||
verbose_name = 'Osoba'
|
verbose_name = 'Osoba'
|
||||||
verbose_name_plural = 'Osoby'
|
verbose_name_plural = 'Osoby'
|
||||||
ordering = ['prijmeni','jmeno']
|
ordering = ['prijmeni','jmeno']
|
||||||
|
managed = False
|
||||||
|
|
||||||
id = models.AutoField(primary_key = True)
|
id = models.AutoField(primary_key = True)
|
||||||
|
|
||||||
|
|
@ -128,6 +129,7 @@ class Skola(SeminarModelBase):
|
||||||
verbose_name = 'Škola'
|
verbose_name = 'Škola'
|
||||||
verbose_name_plural = 'Školy'
|
verbose_name_plural = 'Školy'
|
||||||
ordering = ['mesto', 'nazev']
|
ordering = ['mesto', 'nazev']
|
||||||
|
managed = False
|
||||||
|
|
||||||
# Interní ID
|
# Interní ID
|
||||||
id = models.AutoField(primary_key = True)
|
id = models.AutoField(primary_key = True)
|
||||||
|
|
@ -180,6 +182,7 @@ class Prijemce(SeminarModelBase):
|
||||||
db_table = 'seminar_prijemce'
|
db_table = 'seminar_prijemce'
|
||||||
verbose_name = 'příjemce'
|
verbose_name = 'příjemce'
|
||||||
verbose_name_plural = 'příjemce'
|
verbose_name_plural = 'příjemce'
|
||||||
|
managed = False
|
||||||
|
|
||||||
|
|
||||||
# Interní ID
|
# Interní ID
|
||||||
|
|
@ -209,6 +212,7 @@ class Resitel(SeminarModelBase):
|
||||||
verbose_name = 'Řešitel'
|
verbose_name = 'Řešitel'
|
||||||
verbose_name_plural = 'Řešitelé'
|
verbose_name_plural = 'Řešitelé'
|
||||||
ordering = ['osoba']
|
ordering = ['osoba']
|
||||||
|
managed = False
|
||||||
|
|
||||||
# Interní ID
|
# Interní ID
|
||||||
id = models.AutoField(primary_key = True)
|
id = models.AutoField(primary_key = True)
|
||||||
|
|
@ -395,7 +399,7 @@ class Resitel(SeminarModelBase):
|
||||||
|
|
||||||
@reversion.register(ignore_duplicates=True)
|
@reversion.register(ignore_duplicates=True)
|
||||||
class Organizator(SeminarModelBase):
|
class Organizator(SeminarModelBase):
|
||||||
osoba = models.OneToOneField(Osoba, verbose_name='osoba', related_name='org',
|
osoba = models.OneToOneField(Osoba, verbose_name='osoba', related_name='org_old',
|
||||||
help_text='osobní údaje organizátora', null=False, blank=False,
|
help_text='osobní údaje organizátora', null=False, blank=False,
|
||||||
on_delete=models.PROTECT)
|
on_delete=models.PROTECT)
|
||||||
|
|
||||||
|
|
@ -445,3 +449,4 @@ class Organizator(SeminarModelBase):
|
||||||
# TODO: Zohledňovat přezdívky?
|
# TODO: Zohledňovat přezdívky?
|
||||||
# TODO: Sjednotit s tím, jak se řadí organizátoři v seznau orgů na webu
|
# TODO: Sjednotit s tím, jak se řadí organizátoři v seznau orgů na webu
|
||||||
ordering = ['-organizuje_do', 'osoba__jmeno', 'osoba__prijmeni']
|
ordering = ['-organizuje_do', 'osoba__jmeno', 'osoba__prijmeni']
|
||||||
|
managed = False
|
||||||
|
|
|
||||||
5
split-apps-meta/unmanage.notes
Normal file
5
split-apps-meta/unmanage.notes
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
vim seminar/models/whatever
|
||||||
|
Model.Meta.managed = False
|
||||||
|
Model.field.related_name = Model.related_name + '_old' # až vyrobíme nový objekt, tak nesmí kolidovat.
|
||||||
|
# related_name se vyhodnocuje za běhu, takže pokud nic nespustíme (celý
|
||||||
|
# blok migrací spustíme najednou), tak nám nevadí, že v tuhle chvíli nefunguje půlka views ap :-)
|
||||||
21
various/migrations/0004_nastaveni_aktualni_cislo.py
Normal file
21
various/migrations/0004_nastaveni_aktualni_cislo.py
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
# Generated by Django 4.2.8 on 2024-03-12 20:44
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
import various.models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('seminar', '0118_alter_organizator_options_alter_osoba_options_and_more'),
|
||||||
|
('various', '0003_fix_permissions'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='nastaveni',
|
||||||
|
name='aktualni_cislo',
|
||||||
|
field=models.ForeignKey(default=various.models._default_aktualni_cislo, on_delete=django.db.models.deletion.PROTECT, to='seminar.cislo', verbose_name='Aktuální číslo'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -7,6 +7,10 @@ from seminar.models import Cislo
|
||||||
|
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
|
# Whatever, makemigrations chce default, má ho mít lol.
|
||||||
|
def _default_aktualni_cislo():
|
||||||
|
return Cislo.objects.last()
|
||||||
|
|
||||||
@reversion.register(ignore_duplicates=True)
|
@reversion.register(ignore_duplicates=True)
|
||||||
class Nastaveni(SingletonModel):
|
class Nastaveni(SingletonModel):
|
||||||
|
|
||||||
|
|
@ -18,7 +22,9 @@ class Nastaveni(SingletonModel):
|
||||||
# null=False, on_delete=models.PROTECT)
|
# null=False, on_delete=models.PROTECT)
|
||||||
|
|
||||||
aktualni_cislo = models.ForeignKey(Cislo, verbose_name='Aktuální číslo',
|
aktualni_cislo = models.ForeignKey(Cislo, verbose_name='Aktuální číslo',
|
||||||
null=False, on_delete=models.PROTECT)
|
null=False, on_delete=models.PROTECT,
|
||||||
|
default=_default_aktualni_cislo,
|
||||||
|
)
|
||||||
|
|
||||||
cena_sous = models.IntegerField(null=False,
|
cena_sous = models.IntegerField(null=False,
|
||||||
verbose_name="Účastnický poplatek za soustředění",
|
verbose_name="Účastnický poplatek za soustředění",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue