From 7552e55c8ddc3f9f3de6b2f403d3088259aa888c Mon Sep 17 00:00:00 2001
From: mcngnt <mcngnt@MartinDell>
Date: Thu, 29 Aug 2024 22:19:11 +0200
Subject: [PATCH 1/2] removed diet filed

---
 apps/wei/forms/surveys/wei2024.py               |  2 ++
 ...0010_remove_weiregistration_specific_diet.py | 17 +++++++++++++++++
 apps/wei/models.py                              |  6 ------
 apps/wei/templates/wei/attribute_bus_1A.html    |  5 +----
 apps/wei/templates/wei/weimembership_form.html  |  5 +----
 5 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 apps/wei/migrations/0010_remove_weiregistration_specific_diet.py

diff --git a/apps/wei/forms/surveys/wei2024.py b/apps/wei/forms/surveys/wei2024.py
index 6ececf4d..ceaf221f 100644
--- a/apps/wei/forms/surveys/wei2024.py
+++ b/apps/wei/forms/surveys/wei2024.py
@@ -1,6 +1,8 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import json
+
 from functools import lru_cache
 
 from django import forms
diff --git a/apps/wei/migrations/0010_remove_weiregistration_specific_diet.py b/apps/wei/migrations/0010_remove_weiregistration_specific_diet.py
new file mode 100644
index 00000000..119927c0
--- /dev/null
+++ b/apps/wei/migrations/0010_remove_weiregistration_specific_diet.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.15 on 2024-08-29 20:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0009_weiregistration_specific_diet'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='specific_diet',
+        ),
+    ]
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 80584268..76fd465d 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -232,12 +232,6 @@ class WEIRegistration(models.Model):
         verbose_name=_("health issues"),
     )
 
-    specific_diet = models.TextField(
-        blank=True,
-        default="",
-        verbose_name=_("specific diet"),
-    )
-
     emergency_contact_name = models.CharField(
         max_length=255,
         verbose_name=_("emergency contact name"),
diff --git a/apps/wei/templates/wei/attribute_bus_1A.html b/apps/wei/templates/wei/attribute_bus_1A.html
index 89dc692b..1140ed49 100644
--- a/apps/wei/templates/wei/attribute_bus_1A.html
+++ b/apps/wei/templates/wei/attribute_bus_1A.html
@@ -25,12 +25,9 @@
                 <dt class="col-xl-6">{% trans 'department'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ object.user.profile.get_department_display }}</dd>
 
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ object.health_issues|default:"—" }}</dd>
 
-                <dt class="col-xl-6">{% trans 'specific diet'|capfirst %}</dt>
-                <dd class="col-xl-6">{{ object.specific_diet|default:"—" }}</dd>
-
                 <dt class="col-xl-6">{% trans 'suggested bus'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ survey.information.selected_bus_name }}</dd>
             </dl>
diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html
index ec6ebed4..ff3024ca 100644
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -64,12 +64,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.birth_date }}</dd>
 
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.health_issues }}</dd>
 
-                <dt class="col-xl-6">{% trans 'specific diet'|capfirst %}</dt>
-                <dd class="col-xl-6">{{ registration.specific_diet }}</dd>
-
                 <dt class="col-xl-6">{% trans 'emergency contact name'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.emergency_contact_name }}</dd>
 

From 185a2cabf257f936d47d651e2509f7d449a17fed Mon Sep 17 00:00:00 2001
From: mcngnt <mcngnt@MartinDell>
Date: Thu, 29 Aug 2024 22:47:33 +0200
Subject: [PATCH 2/2] corrected emoji + linting

---
 apps/wei/forms/surveys/wei2024.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/wei/forms/surveys/wei2024.py b/apps/wei/forms/surveys/wei2024.py
index ceaf221f..13d619dc 100644
--- a/apps/wei/forms/surveys/wei2024.py
+++ b/apps/wei/forms/surveys/wei2024.py
@@ -1,8 +1,6 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import json
-
 from functools import lru_cache
 
 from django import forms
@@ -57,7 +55,7 @@ buses_descr = [
         pour les plus calmes, vous trouverez au bus Aspique-Kyottes les 2A+ qui vous feront kiffer votre WEI.""",
     ],
     [
-        "Zanzo[Bus] 🤩👽🐔", "#FFFF", 3,
+        "Zanzo[Bus] 🤯🚸🐒", "#FFFF", 3,
         """Dans un entre-trois bien senti entre zinzinerie, enfance et vieillerie, le Zanzo[BUS] est un concentré de fun mêlé à
         de la dinguerie à gogo. N'hésitez plus et rejoignez-nous pour un WEI toujours plus déjanté !""",
     ],