remove commented code in migrations, make school and tutoring_group optional on student

oser_backend/profiles/migrations/0002_auto_20180512_1344.py

+# Generated by Django 2.0.4 on 2018-05-12 11:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('profiles', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='student',
+            name='school',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='students', to='tutoring.School', verbose_name='lycée'),
+        ),
+        migrations.AlterField(
+            model_name='student',
+            name='tutoring_group',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='students', to='tutoring.TutoringGroup', verbose_name='groupe de tutorat'),
+        ),
+    ]

oser_backend/profiles/models.py

@@ -47,6 +47,7 @@ class Student(ProfileMixin, models.Model):
         'tutoring.TutoringGroup',
         on_delete=models.SET_NULL,
         null=True,
+        blank=True,
         related_name='students',
         verbose_name='groupe de tutorat')
 
@@ -54,6 +55,7 @@ class Student(ProfileMixin, models.Model):
         'tutoring.School',
         on_delete=models.SET_NULL,
         null=True,
+        blank=True,
         related_name='students',
         verbose_name='lycée')
 

oser_backend/tests/test_profiles/test_student.py

@@ -18,7 +18,18 @@ class StudentTestCase(ModelTestCase):
         'tutoring_group': {
             'verbose_name': 'groupe de tutorat',
             'null': True,
+            'blank': True,
         },
+        'school': {
+            'verbose_name': 'lycée',
+            'null': True,
+            'blank': True,
+        },
+        'registration': {
+            'verbose_name': "dossier d'inscription",
+            'null': True,
+            'blank': True,
+        }
     }
     model_tests = {
         'verbose_name': 'lycéen',

oser_backend/tutoring/migrations/0002_auto_20180421_1425.py

@@ -15,11 +15,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        # migrations.AddField(
-        #     model_name='tutortutoringgroup',
-        #     name='tutor',
-        #     field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='profiles.Tutor', verbose_name='Tuteur'),
-        # ),
         migrations.AddField(
             model_name='tutortutoringgroup',
             name='tutoring_group',
@@ -35,11 +30,6 @@ class Migration(migrations.Migration):
             name='school',
             field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tutoring_groups', to='tutoring.School', verbose_name='lycée'),
         ),
-        # migrations.AddField(
-        #     model_name='tutoringgroup',
-        #     name='tutors',
-        #     field=models.ManyToManyField(blank=True, related_name='tutoring_groups', through='tutoring.TutorTutoringGroup', to='profiles.Tutor', verbose_name='tuteurs'),
-        # ),
         migrations.AddField(
             model_name='school',
             name='address',

oser_backend/tutoring/migrations/0006_auto_20180512_1344.py

+# Generated by Django 2.0.4 on 2018-05-12 11:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tutoring', '0005_auto_20180512_1325'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tutoringgroup',
+            name='tutors',
+            field=models.ManyToManyField(blank=True, related_name='tutoring_groups', through='tutoring.TutorTutoringGroup', to='profiles.Tutor', verbose_name='tuteurs'),
+        ),
+        migrations.AlterField(
+            model_name='tutortutoringgroup',
+            name='tutor',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='profiles.Tutor', verbose_name='Tuteur'),
+        ),
+    ]

oser_backend/tutoring/models.py

@@ -22,7 +22,7 @@ class TutorTutoringGroup(models.Model):
         'TutoringGroup', on_delete=models.CASCADE,
         verbose_name='groupe de tutorat')
     tutor = models.ForeignKey(
-        'profiles.Tutor', on_delete=models.CASCADE, null=True,
+        'profiles.Tutor', on_delete=models.CASCADE,
         verbose_name='Tuteur')
     is_leader = models.BooleanField(default=False, verbose_name='Responsable')
 
@@ -51,7 +51,6 @@ class TutoringGroup(models.Model):
                                     related_name='tutoring_groups',
                                     verbose_name='tuteurs',
                                     blank=True,
-                                    null=True,
                                     through='TutorTutoringGroup')
     school = models.ForeignKey('School', on_delete=models.SET_NULL,
                                null=True,