From 432178e53879a5f468c437cf59c408b1cc4a4e97 Mon Sep 17 00:00:00 2001
From: Gael Le Mignot <gael@pilotsystems.net>
Date: Fri, 4 Feb 2022 09:59:05 +0100
Subject: [PATCH] Removed obsoleted field training

---
 teleforma/forms.py                              |  1 -
 .../commands/teleforma-import-users.py          |  7 ++++---
 .../migrations/0016_remove_student_training.py  | 17 +++++++++++++++++
 teleforma/models/crfpa.py                       |  3 ---
 teleforma/views/crfpa.py                        |  8 +-------
 5 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 teleforma/migrations/0016_remove_student_training.py

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 01674afd..d30d6b03 100644
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -203,7 +203,6 @@ class UserForm(ModelForm):
                           written_speciality=data.get('written_speciality'),
                           oral_1=data.get('oral_1'),
                           promo_code=data.get('promo_code'),
-                          training=training,
                           payment_schedule=data.get('payment_schedule'),
                           fascicule=fascicule,
                           subscription_fees=subscription_fees
diff --git a/teleforma/management/commands/teleforma-import-users.py b/teleforma/management/commands/teleforma-import-users.py
index 894664e2..89cc7434 100644
--- a/teleforma/management/commands/teleforma-import-users.py
+++ b/teleforma/management/commands/teleforma-import-users.py
@@ -50,10 +50,11 @@ class Command(BaseCommand):
                 student = Student(user=user)
                 student.period, c = Period.objects.get_or_create(name=period)
                 student.iej, c = IEJ.objects.get_or_create(name=row[2].value)
-                student.training, c = Training.objects.get_or_create(code=row[3].value,
-                                                                     period=student.period)
+                c = Training.objects.get_or_create(code=row[3].value,
+                                                   period=student.period)
                 student.save()
-
+                student.trainings.add(c)
+                
             student.procedure = self.get_first_course(row[4].value)
             student.written_speciality = self.get_first_course(row[5].value)
             student.oral_speciality = self.get_first_course(row[6].value)
diff --git a/teleforma/migrations/0016_remove_student_training.py b/teleforma/migrations/0016_remove_student_training.py
new file mode 100644
index 00000000..281f5be6
--- /dev/null
+++ b/teleforma/migrations/0016_remove_student_training.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.3 on 2022-02-04 09:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teleforma', '0015_auto_20211210_1411'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='student',
+            name='training',
+        ),
+    ]
diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 712bbf4b..efb34078 100755
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -147,9 +147,6 @@ class Student(models.Model):
                             blank=True, null=True, on_delete=models.SET_NULL)
     trainings = models.ManyToManyField('Training', related_name='student_trainings', verbose_name=_('trainings'),
                                        blank=True)
-    # deprecated, replaced by trainings field
-    training = models.ForeignKey('Training', related_name='student_training', verbose_name=_('training'),
-                                 blank=True, null=True, limit_choices_to={'available': True}, on_delete=models.SET_NULL)
     procedure = models.ForeignKey('Course', related_name="procedure_students",
                                   verbose_name=_('procedure'), help_text="Matière de procédure",
                                   blank=True, null=True, limit_choices_to={'procedure': True}, on_delete=models.SET_NULL)
diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 1722581c..9676a546 100644
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -775,10 +775,6 @@ class RegistrationPDFView(PDFTemplateResponseMixin, TemplateView):
 
         # some form fixes
         student = user.student.all()[0]
-        if student.training and not student.trainings.all():
-            student.trainings.add(student.training)
-        if not student.training and student.trainings.all():
-            student.training = student.trainings.all()[0]
         if not student.oral_1:
             student.oral_1 = Course.objects.get(code='X')
         if not student.oral_2:
@@ -828,9 +824,7 @@ class ReceiptPDFView(PDFTemplateResponseMixin, TemplateView):
 
         student = user.student.all()[0]
 
-        if not student.training and student.trainings.all():
-            student.training = student.trainings.all()[0]
-        training = student.training
+        training = student.trainings.all()[0]
         period = training.period
         student.save()
         profile = user.profile.all()[0]
-- 
2.39.5