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 @@
{% trans 'department'|capfirst %}
{{ object.user.profile.get_department_display }}
-
{% trans 'health issues'|capfirst %}
+
{% trans 'health issues or specific diet'|capfirst %}
{{ object.health_issues|default:"—" }}
-
{% trans 'specific diet'|capfirst %}
-
{{ object.specific_diet|default:"—" }}
-
{% trans 'suggested bus'|capfirst %}
{{ survey.information.selected_bus_name }}
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
{% trans 'birth date'|capfirst %}
{{ registration.birth_date }}
-
{% trans 'health issues'|capfirst %}
+
{% trans 'health issues or specific diet'|capfirst %}
{{ registration.health_issues }}
-
{% trans 'specific diet'|capfirst %}
-
{{ registration.specific_diet }}
-
{% trans 'emergency contact name'|capfirst %}
{{ registration.emergency_contact_name }}