Compare commits

..

No commits in common. "e3ce5efdd67ccf16a71fcea74c2c1e1eefcb3266" and "ae8040fb04720fc504bf2a017ef909eb62093c15" have entirely different histories.

5 changed files with 2 additions and 72 deletions

View file

@ -1,33 +0,0 @@
# 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'},
),
]

View file

@ -25,7 +25,6 @@ class Osoba(SeminarModelBase):
verbose_name = 'Osoba'
verbose_name_plural = 'Osoby'
ordering = ['prijmeni','jmeno']
managed = False
id = models.AutoField(primary_key = True)
@ -129,7 +128,6 @@ class Skola(SeminarModelBase):
verbose_name = 'Škola'
verbose_name_plural = 'Školy'
ordering = ['mesto', 'nazev']
managed = False
# Interní ID
id = models.AutoField(primary_key = True)
@ -182,7 +180,6 @@ class Prijemce(SeminarModelBase):
db_table = 'seminar_prijemce'
verbose_name = 'příjemce'
verbose_name_plural = 'příjemce'
managed = False
# Interní ID
@ -212,7 +209,6 @@ class Resitel(SeminarModelBase):
verbose_name = 'Řešitel'
verbose_name_plural = 'Řešitelé'
ordering = ['osoba']
managed = False
# Interní ID
id = models.AutoField(primary_key = True)
@ -399,7 +395,7 @@ class Resitel(SeminarModelBase):
@reversion.register(ignore_duplicates=True)
class Organizator(SeminarModelBase):
osoba = models.OneToOneField(Osoba, verbose_name='osoba', related_name='org_old',
osoba = models.OneToOneField(Osoba, verbose_name='osoba', related_name='org',
help_text='osobní údaje organizátora', null=False, blank=False,
on_delete=models.PROTECT)
@ -449,4 +445,3 @@ class Organizator(SeminarModelBase):
# TODO: Zohledňovat přezdívky?
# TODO: Sjednotit s tím, jak se řadí organizátoři v seznau orgů na webu
ordering = ['-organizuje_do', 'osoba__jmeno', 'osoba__prijmeni']
managed = False

View file

@ -1,5 +0,0 @@
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 :-)

View file

@ -1,21 +0,0 @@
# 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'),
),
]

View file

@ -7,10 +7,6 @@ from seminar.models import Cislo
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)
class Nastaveni(SingletonModel):
@ -22,9 +18,7 @@ class Nastaveni(SingletonModel):
# null=False, on_delete=models.PROTECT)
aktualni_cislo = models.ForeignKey(Cislo, verbose_name='Aktuální číslo',
null=False, on_delete=models.PROTECT,
default=_default_aktualni_cislo,
)
null=False, on_delete=models.PROTECT)
cena_sous = models.IntegerField(null=False,
verbose_name="Účastnický poplatek za soustředění",