mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Odstraneno zadani a vzorak ulohy

Browse source 
Byla to duplicita s UlohaZadaniNode a UlohaVzorakNode.
This commit is contained in:
Tomas "Jethro" Pokorny 2019-05-28 23:40:19 +02:00
parent b0e2bb9dfc
commit 0e83a76f32
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
seminar/migrations/0049_auto_20190430_2354.py
View file

@ -430,16 +430,6 @@ class Migration(migrations.Migration):
name='cislo_zadani', name='cislo_zadani',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zadane_ulohy', to='seminar.Cislo', verbose_name='číslo zadání'), field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zadane_ulohy', to='seminar.Cislo', verbose_name='číslo zadání'),
), ),
migrations.AddField(
model_name='uloha',
name='vzorak',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='uloha_vzorak_set', to='seminar.Text', verbose_name='vzorové řešení'),
),
migrations.AddField(
model_name='uloha',
name='zadani',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='uloha_zadani_set', to='seminar.Text', verbose_name='veřejné zadání'),
),
migrations.AddField( migrations.AddField(
model_name='tema', model_name='tema',
name='rocnik', name='rocnik',

11
seminar/models.py
View file

@ -706,14 +706,6 @@ class Uloha(Problem):
verbose_name = 'Úloha' verbose_name = 'Úloha'
verbose_name_plural = 'Úlohy' verbose_name_plural = 'Úlohy'
zadani = models.OneToOneField(Text, verbose_name='veřejné zadání',
related_name="uloha_zadani_set", blank=True, null=True)
vzorak = models.OneToOneField(Text, verbose_name='vzorové řešení',
related_name="uloha_vzorak_set", blank=True, null=True)
cislo_zadani = models.ForeignKey(Cislo, verbose_name='číslo zadání', blank=True, cislo_zadani = models.ForeignKey(Cislo, verbose_name='číslo zadání', blank=True,
null=True, related_name='zadane_ulohy') null=True, related_name='zadane_ulohy')
@ -1041,6 +1033,9 @@ class Reseni_Resitele(models.Model):
reseni = models.ForeignKey(Reseni, verbose_name='řešení') reseni = models.ForeignKey(Reseni, verbose_name='řešení')
# podil - jakou merou se ktery resitel podilel na danem reseni
# - pouziti v budoucnu, pokud by resitele nemeli dostat vsichni stejne bodu za spolecne reseni
def __str__(self): def __str__(self):
return '{} od {}'.format(self.reseni, self.resitel) return '{} od {}'.format(self.reseni, self.resitel)
# NOTE: Poteciální DB HOG bez select_related # NOTE: Poteciální DB HOG bez select_related