diff --git a/seminar/migrations/0049_auto_20190430_2354.py b/seminar/migrations/0049_auto_20190430_2354.py index 8957b010..239f86a8 100644 --- a/seminar/migrations/0049_auto_20190430_2354.py +++ b/seminar/migrations/0049_auto_20190430_2354.py @@ -430,16 +430,6 @@ class Migration(migrations.Migration): 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í'), ), - 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( model_name='tema', name='rocnik', diff --git a/seminar/models.py b/seminar/models.py index 0af567b6..79cf7e3b 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -706,14 +706,6 @@ class Uloha(Problem): verbose_name = 'Úloha' 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, null=True, related_name='zadane_ulohy') @@ -1041,6 +1033,9 @@ class Reseni_Resitele(models.Model): 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): return '{} od {}'.format(self.reseni, self.resitel) # NOTE: Poteciální DB HOG bez select_related