From fc4577c66156ce122acc56675a510729c898a52f Mon Sep 17 00:00:00 2001
From: Lucie Galland <lucie.galland@ens.fr>
Date: Thu, 30 Sep 2021 08:38:47 +0200
Subject: [PATCH] instru liste for multiinstrumentiste answer in doodle

---
 calendrier/forms.py                           |  2 +-
 .../migrations/0006_auto_20210929_1629.py     | 23 +++++++++++++++
 calendrier/models.py                          |  4 ++-
 calendrier/templates/calendrier/reponse.html  | 13 +++++++++
 .../templates/calendrier/view_event.html      |  4 +++
 calendrier/views.py                           |  5 +++-
 gestion/models.py                             | 29 +++++++++----------
 7 files changed, 62 insertions(+), 18 deletions(-)
 create mode 100644 calendrier/migrations/0006_auto_20210929_1629.py

diff --git a/calendrier/forms.py b/calendrier/forms.py
index 2b67099..47c126f 100644
--- a/calendrier/forms.py
+++ b/calendrier/forms.py
@@ -37,7 +37,7 @@ class EventForm(forms.ModelForm):
 class ParticipantsForm(forms.ModelForm):
     class Meta:
         model = Participants
-        fields = ("reponse", "details", "dont_play_main", "instrument")
+        fields = ("reponse", "details", "dont_play_main", "instrument","instrument_autre")
         widgets = {
             "details": forms.Textarea(attrs={"placeholder": _("50 caractères max")}),
         }
diff --git a/calendrier/migrations/0006_auto_20210929_1629.py b/calendrier/migrations/0006_auto_20210929_1629.py
new file mode 100644
index 0000000..85cc209
--- /dev/null
+++ b/calendrier/migrations/0006_auto_20210929_1629.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.24 on 2021-09-29 14:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calendrier', '0005_auto_20210726_0949'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='participants',
+            name='instrument_autre',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='participants',
+            name='instrument',
+            field=models.CharField(blank=True, choices=[('Clarinette', 'Clarinette'), ('Euphonium', 'Euphonium'), ('Percussion', 'Percussion'), ('Piccolo', 'Piccolo'), ('Saxophone Alto', 'Saxophone Alto'), ('Saxophone Ténor', 'Saxophone Ténor'), ('Saxophone Baryton', 'Saxophone Baryton'), ('Souba', 'Souba'), ('Trombone', 'Trombone'), ('Trompette', 'Trompette'), ('Autre', 'Autre'), ('ne sais pas', 'Je ne sais pas encore')], max_length=50, null=True),
+        ),
+    ]
diff --git a/calendrier/models.py b/calendrier/models.py
index 5e42fb7..c24449d 100644
--- a/calendrier/models.py
+++ b/calendrier/models.py
@@ -3,6 +3,7 @@ import uuid
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from gestion.models import INSTRU_CHOICES
 from gestion.models import ErnestoUser
 
 ANSWERS = (
@@ -61,7 +62,8 @@ class Participants(models.Model):
     reponse = models.CharField(
         _("Réponse"), max_length=20, default="non", choices=ANSWERS
     )
-    instrument = models.CharField(max_length=50, blank=True, null=True)
+    instrument = models.CharField(max_length=50, blank=True, null=True, choices=INSTRU_CHOICES)
+    instrument_autre = models.CharField(max_length=50, blank=True, null=True)
     dont_play_main = models.CharField(
         _("Je veux jouer d'un instrument different de mon instrument principal:"),
         default="Non",
diff --git a/calendrier/templates/calendrier/reponse.html b/calendrier/templates/calendrier/reponse.html
index e222c53..9157a17 100644
--- a/calendrier/templates/calendrier/reponse.html
+++ b/calendrier/templates/calendrier/reponse.html
@@ -35,6 +35,8 @@
   <div id="dont_play_main_field" {% if request.user.profile.multi_instrumentiste == "Non" %} style="display: none; "{% endif %}>
 {% elif field.id_for_label == "id_instrument" %}
   <div id="instru_ev_field"  style="display: none; ">
+    {% elif field.id_for_label == "id_instrument_autre" %}
+      <div id="instru_autre_ev_field"  style="display: none; ">
 {% else %}
 
   <div>
@@ -71,4 +73,15 @@
         }
     });
 </script>
+<script type="text/javascript">
+  $('#id_instrument').on('change', function() {
+
+        if (this.value == "Autre" ) {
+            $('#instru_autre_ev_field').show();
+        }
+        else {
+            $('#instru_autre_ev_field').hide();
+        }
+    });
+</script>
 {% endblock %}
diff --git a/calendrier/templates/calendrier/view_event.html b/calendrier/templates/calendrier/view_event.html
index 7cdf9f7..64284e3 100644
--- a/calendrier/templates/calendrier/view_event.html
+++ b/calendrier/templates/calendrier/view_event.html
@@ -180,7 +180,11 @@
 
     </td>
       <td>{% if participant.dont_play_main == 'Oui' %}
+        {% if participant.instrument == "Autre" %}
+          {{participant.instrument_autre}}
+        {% else %}
           {{participant.instrument}}
+          {% endif %}
         {% elif participant.participant.instru == "Autre" %}
         {{participant.participant.instru_autre}}
         {% else %}
diff --git a/calendrier/views.py b/calendrier/views.py
index ffd9b39..f588232 100644
--- a/calendrier/views.py
+++ b/calendrier/views.py
@@ -195,7 +195,10 @@ class ViewEvent(LoginRequiredMixin, TemplateView):
             if instru == "Autre":
                 instru = participant.participant.instru_autre
             if participant.dont_play_main == "Oui":
-                instru = participant.instrument
+                if participant.instrument == "Autre":
+                    instru = participant.instrument_autre
+                else:
+                    instru = participant.instrument
 
             sure, maybe, namesoui, namespe, namesnon = instrument_count[instru]
 
diff --git a/gestion/models.py b/gestion/models.py
index 81da941..5e41990 100644
--- a/gestion/models.py
+++ b/gestion/models.py
@@ -8,7 +8,20 @@ from django.utils.translation import gettext_lazy as _
 import os
 from django.conf import settings
 
-
+INSTRU_CHOICES = [
+        ("Clarinette", _("Clarinette")),
+        ("Euphonium", _("Euphonium")),
+        ("Percussion", _("Percussion")),
+        ("Piccolo", _("Piccolo")),
+        ("Saxophone Alto", _("Saxophone Alto")),
+        ("Saxophone Ténor", _("Saxophone Ténor")),
+        ("Saxophone Baryton", _("Saxophone Baryton")),
+        ("Souba", _("Souba")),
+        ("Trombone", _("Trombone")),
+        ("Trompette", _("Trompette")),
+        ("Autre", _("Autre")),
+        ("ne sais pas", _("Je ne sais pas encore")),
+    ]
 class Photo(models.Model):
     PHOTO_PLACEMENT = (
         ("home_join", _("Rejoignez nous")),
@@ -75,20 +88,6 @@ class ErnestoUser(models.Model):
         help_text=_("seulement visible par les chef·fe·s"),
     )
 
-    INSTRU_CHOICES = [
-        ("Clarinette", _("Clarinette")),
-        ("Euphonium", _("Euphonium")),
-        ("Percussion", _("Percussion")),
-        ("Piccolo", _("Piccolo")),
-        ("Saxophone Alto", _("Saxophone Alto")),
-        ("Saxophone Ténor", _("Saxophone Ténor")),
-        ("Saxophone Baryton", _("Saxophone Baryton")),
-        ("Souba", _("Souba")),
-        ("Trombone", _("Trombone")),
-        ("Trompette", _("Trompette")),
-        ("Autre", _("Autre")),
-        ("ne sais pas", _("Je ne sais pas encore")),
-    ]
 
     COLORS_CHOICES = [
         ("#e4522f#ffffff", _("Orange et Blanc")),