From 517b06bcda547bc7c09f74468d31f9e1f6e475ea Mon Sep 17 00:00:00 2001
From: "Tomas \"Jethro\" Pokorny" <xtompok@gmail.com>
Date: Wed, 29 May 2019 01:54:05 +0200
Subject: [PATCH] Bugfixy v migracich.

---
 seminar/migrations/0050_auto_20190510_2228.py | 10 ----------
 seminar/migrations/0051_resitel_to_osoba.py   |  2 +-
 .../0057_reseni_to_reseni_hodnoceni.py        | 19 ++++++++++++-------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/seminar/migrations/0050_auto_20190510_2228.py b/seminar/migrations/0050_auto_20190510_2228.py
index 7e54a817..89c69b22 100644
--- a/seminar/migrations/0050_auto_20190510_2228.py
+++ b/seminar/migrations/0050_auto_20190510_2228.py
@@ -33,16 +33,6 @@ class Migration(migrations.Migration):
             name='osoba',
             field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='seminar.Osoba', verbose_name='osoba'),
         ),
-        migrations.AlterField(
-            model_name='uloha',
-            name='vzorak',
-            field=models.OneToOneField(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.AlterField(
-            model_name='uloha',
-            name='zadani',
-            field=models.OneToOneField(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.CreateModel(
             name='TreeNode',
             fields=[
diff --git a/seminar/migrations/0051_resitel_to_osoba.py b/seminar/migrations/0051_resitel_to_osoba.py
index 0eb1433e..17237bd0 100644
--- a/seminar/migrations/0051_resitel_to_osoba.py
+++ b/seminar/migrations/0051_resitel_to_osoba.py
@@ -48,7 +48,7 @@ def resitel_to_osoba(apps,schema_editor):
 				elif o.email == u.email:
 					u.email = 'Použij osobu!'
 				else:
-					raise ValueError('o.email a u.email rozdílné: "{}" vs. "{}"'.format(o.email, u.first_name))
+					raise ValueError('o.email a u.email rozdílné: "{}" vs. "{}"'.format(o.email, u.email))
 			u.save()
 					
 
diff --git a/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py b/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py
index f266c923..b3f0405b 100644
--- a/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py
+++ b/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py
@@ -6,16 +6,21 @@ from django.db import migrations
 
 def reseni_to_Reseni(apps, schema_editor): 
 	Reseni = apps.get_model('seminar','Reseni')
+	Reseni_Resitele = apps.get_model('seminar','Reseni_Resitele')
 	Hodnoceni = apps.get_model('seminar','Hodnoceni')
 	
 	for r in Reseni.objects.all():
-		r.resitele.add(r.resitel)
-		h = Hodnoceni.objects.create(body=r.body)
-		h.cislo_body = r.cislo_body
-		h.problem = r.problem
-		h.reseni = r
-		h.save()
-		r.save()
+		rr = Reseni_Resitele.objects.create(resitele = r.resitel, reseni=r)
+		if r.body == None:
+			print("!!!!!!!!!!!!!!!")
+			print(r.id,r)
+			print("!!!!!!!!!!!!!!!")
+		else:
+			h = Hodnoceni.objects.create(
+				body=r.body,
+				cislo_body = r.cislo_body,
+				problem = r.problem_old,
+				reseni = r)
 	
 
 class Migration(migrations.Migration):