Remove question about learner count from WRF

amy/autoemails/tests/test_views.py

@@ -53,7 +53,6 @@ def _setUpWorkshopRequest(self, create_event=False):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             audience_description="Students of Hogwarts",
             administrative_fee="nonprofit",
             scholarship_circumstances="",

amy/extforms/tests/test_workshop_inquiry_form.py

@@ -38,7 +38,6 @@ def test_fields_presence(self):
                 "preferred_dates",
                 "other_preferred_dates",
                 "language",
-                "number_attendees",
                 "administrative_fee",
                 "travel_expences_management",
                 "travel_expences_management_other",
@@ -80,7 +79,6 @@ def test_request_added(self):
             "preferred_dates": "",
             "other_preferred_dates": "03-04 November, 2018",
             "language": Language.objects.get(name="English").pk,
-            "number_attendees": "10-40",
             "audience_description": "Students of Hogwarts",
             "administrative_fee": "waiver",
             "scholarship_circumstances": "Bugdet cuts in Ministry of Magic",

amy/extforms/tests/test_workshop_request_form.py

@@ -30,7 +30,6 @@ def test_fields_presence(self):
                 "preferred_dates",
                 "other_preferred_dates",
                 "language",
-                "number_attendees",
                 "audience_description",
                 "administrative_fee",
                 "scholarship_circumstances",
@@ -74,7 +73,6 @@ def test_request_added(self):
             "preferred_dates": "",
             "other_preferred_dates": "03-04 November, 2018",
             "language": Language.objects.get(name="English").pk,
-            "number_attendees": "10-40",
             "audience_description": "Students of Hogwarts",
             "administrative_fee": "waiver",
             "scholarship_circumstances": "Bugdet cuts in Ministry of Magic",

amy/extrequests/forms.py

@@ -307,7 +307,6 @@ class Meta:
             "preferred_dates",
             "other_preferred_dates",
             "language",
-            "number_attendees",
             "audience_description",
             "administrative_fee",
             "scholarship_circumstances",
@@ -335,7 +334,6 @@ class Meta:
             "country": Select2Widget,
             "online_inperson": forms.RadioSelect(),
             "language": Select2Widget,
-            "number_attendees": forms.RadioSelect(),
             "academic_levels": forms.CheckboxSelectMultiple(),
             "computing_levels": forms.CheckboxSelectMultiple(),
             "organization_type": forms.RadioSelect(),
@@ -717,7 +715,6 @@ class Meta:
             "preferred_dates",
             "other_preferred_dates",
             "language",
-            "number_attendees",
             "administrative_fee",
             "travel_expences_management",
             "travel_expences_management_other",
@@ -743,7 +740,6 @@ class Meta:
             "country": Select2Widget,
             "online_inperson": forms.RadioSelect(),
             "language": Select2Widget,
-            "number_attendees": forms.RadioSelect(),
             "computing_levels": forms.CheckboxSelectMultiple(),
             "administrative_fee": forms.RadioSelect(),
             "travel_expences_management": RadioSelectWithOther(

amy/extrequests/migrations/0031_remove_workshopinquiryrequest_number_attendees.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.20 on 2023-08-15 11:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extrequests', '0030_auto_20211231_1108'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='workshopinquiryrequest',
+            name='number_attendees',
+        ),
+    ]

amy/extrequests/models.py

@@ -225,28 +225,6 @@ class WorkshopInquiryRequest(
         " language, but cannot guarantee the availability of "
         "non-English speaking Instructors.",
     )
-    ATTENDEES_NUMBER_CHOICES = (
-        UNSURE_CHOICE,
-        ("10-40", "10-40 (one room, two instructors)"),
-        ("40-80", "40-80 (two rooms, four instructors)"),
-        ("80-120", "80-120 (three rooms, six instructors)"),
-    )
-    number_attendees = models.CharField(
-        max_length=15,
-        choices=ATTENDEES_NUMBER_CHOICES,
-        blank=True,
-        null=True,
-        default=None,
-        verbose_name="Anticipated number of attendees",
-        help_text="These recommendations are for in-person workshops. "
-        "This number doesn't need to be precise, but will help us "
-        "decide how many instructors your workshop will need. "
-        "Each workshop must have at least two instructors.<br>"
-        "For online Carpentries workshops, we recommend a maximum of "
-        "20 learners per class. If your workshop attendance will "
-        "exceed 20 learners please be sure to include a note in the "
-        "comments section below. ",
-    )
     FEE_CHOICES = (
         (
             "nonprofit",

amy/extrequests/tests/test_workshop_inquiries.py

@@ -421,7 +421,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             travel_expences_management="booked",
             travel_expences_management_other="",
@@ -447,7 +446,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="40-80",
             administrative_fee="forprofit",
             travel_expences_management="reimbursed",
             travel_expences_management_other="",
@@ -590,7 +588,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             travel_expences_management="booked",
             travel_expences_management_other="",
@@ -686,7 +683,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             travel_expences_management="booked",
             travel_expences_management_other="",

amy/extrequests/tests/test_workshop_requests.py

@@ -44,7 +44,6 @@ def test_minimal_form(self):
             "preferred_dates": "{:%Y-%m-%d}".format(date.today()),
             "other_preferred_dates": "17-18 August, 2019",
             "language": Language.objects.get(name="English").pk,
-            "number_attendees": "10-40",
             "audience_description": "Students of Hogwarts",
             "administrative_fee": "waiver",
             "scholarship_circumstances": "Bugdet cuts in Ministry of Magic",
@@ -362,7 +361,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             audience_description="Students of Hogwarts",
             administrative_fee="nonprofit",
             scholarship_circumstances="",
@@ -384,7 +382,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="40-80",
             audience_description="Students of Hogwarts",
             administrative_fee="forprofit",
             scholarship_circumstances="",
@@ -521,7 +518,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             audience_description="Students of Hogwarts",
             administrative_fee="nonprofit",
             scholarship_circumstances="",
@@ -613,7 +609,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             audience_description="Students of Hogwarts",
             administrative_fee="nonprofit",
             scholarship_circumstances="",

amy/extrequests/tests/test_wrfinitial.py

@@ -64,7 +64,6 @@ def setUpOther(self):
             location="Scotland",
             preferred_dates=date(2020, 11, 11),
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             additional_contact="test@example.org;test2@example.org",
             online_inperson="online",
@@ -91,7 +90,6 @@ def setUpOther(self):
             location="Scotland",
             preferred_dates=date(2020, 11, 11),
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             additional_contact="test@example.org;test2@example.org",
             online_inperson="online",

amy/recruitment/tests/test_instructor_recruitment_views.py

@@ -298,7 +298,6 @@ def test_get_initial(self) -> None:
             country="GB",
             audience_description="Students of Hogwarts",
             user_notes="Only Gryffindor allowed.",
-            number_attendees="10-40",
             administrative_fee="nonprofit",
             language=Language.objects.get(name="English"),
         )

amy/templates/includes/workshopinquiry_details.html

@@ -100,8 +100,6 @@
 {% endif %}
     <tr><th>Preferred language for this workshop:</th>
         <td>{{ object.language }}</td></tr>
-    <tr><th>Anticipated number of attendees:</th>
-        <td>{{ object.get_number_attendees_display }}</td></tr>
     <tr><th>Administrative fee payment:</th>
         <td>{{ object.get_administrative_fee_display }}</td></tr>
     <tr><th>Travel expences management:</th>

amy/templates/includes/workshoprequest_details.html

@@ -54,8 +54,6 @@
 {% endif %}
     <tr><th>Language the workshop will be conducted in:</th>
         <td>{{ object.language }}</td></tr>
-    <tr><th>Anticipated number of attendees:</th>
-        <td>{{ object.get_number_attendees_display }}</td></tr>
     <tr><th>Audience description:</th>
         <td><pre>{{ object.audience_description }}</pre></td></tr>
     <tr><th>Administrative fee payment:</th>

amy/templates/mailing/workshopinquiry.txt

@@ -40,7 +40,6 @@ Requested workshop types: {% for type in object.requested_workshop_types.all %}{
 Preferred date: {{ object.preferred_dates|date:'Y-m-d' }}
 Other dates for the workshop: {{ object.other_preferred_dates }}
 Preferred language for this workshop: {{ object.language }}
-Anticipated number of attendees: {{ object.get_number_attendees_display }}
 Administrative fee payment: {{ object.get_administrative_fee_display }}
 Travel expences management: {{ object.get_travel_expences_management_display }} {% if object.travel_expences_management_other %}{{ object.travel_expences_management_other }}{% endif %}
 Travel expences agreement: {{ object.travel_expences_agreement|yesno }}

amy/templates/mailing/workshopinquiry_admin.txt

@@ -21,7 +21,6 @@ Preferred date: {{ object.preferred_dates|date:'Y-m-d' }}
 Other dates for the workshop: {{ object.other_preferred_dates }}
 "Dates too soon" warning shown: {{ object.preferred_dates_too_soon|yesno }}
 Preferred language for this workshop: {{ object.language }}
-Anticipated number of attendees: {{ object.get_number_attendees_display }}
 Administrative fee payment: {{ object.get_administrative_fee_display }}
 Travel expences management: {{ object.get_travel_expences_management_display }} {% if object.travel_expences_management_other %}{{ object.travel_expences_management_other }}{% endif %}
 Travel expences agreement: {{ object.travel_expences_agreement|yesno }}

amy/templates/mailing/workshoprequest.txt

@@ -38,7 +38,6 @@ Requested workshop types: {% for type in object.requested_workshop_types.all %}{
 Preferred date: {{ object.preferred_dates|date:'Y-m-d' }}
 Other dates for the workshop: {{ object.other_preferred_dates }}
 Language the workshop will be conducted in: {{ object.language }}
-Anticipated number of attendees: {{ object.get_number_attendees_display }}
 Audience description: {{ object.audience_description|default:"---" }}
 Administrative fee payment: {{ object.get_administrative_fee_display }}
 Scholarship circumstances: {{ object.scholarship_circumstances|default:"---" }}

amy/templates/mailing/workshoprequest_admin.txt

@@ -16,7 +16,6 @@ Preferred date: {{ object.preferred_dates|date:'Y-m-d' }}
 Other dates for the workshop: {{ object.other_preferred_dates }}
 "Dates too soon" warning shown: {{ object.preferred_dates_too_soon|yesno }}
 Language the workshop will be conducted in: {{ object.language }}
-Anticipated number of attendees: {{ object.get_number_attendees_display }}
 Audience description: {{ object.audience_description|default:"---" }}
 Administrative fee payment: {{ object.get_administrative_fee_display }}
 Scholarship circumstances: {{ object.scholarship_circumstances|default:"---" }}

amy/workshops/management/commands/fake_database.py

@@ -690,7 +690,6 @@ def fake_workshop_requests(self, count=10):
                 ).date(),
                 other_preferred_dates="Alternatively: soon",
                 language=language,
-                number_attendees=choice(WorkshopRequest.ATTENDEES_NUMBER_CHOICES)[0],
                 audience_description=self.faker.sentence(),
                 administrative_fee=administrative_fee,
                 scholarship_circumstances=scholarship_circumstances,
@@ -778,9 +777,6 @@ def fake_workshop_inquiries(self, count=10):
                 ).date(),
                 other_preferred_dates="Alternatively: soon",
                 language=language,
-                number_attendees=choice(
-                    WorkshopInquiryRequest.ATTENDEES_NUMBER_CHOICES
-                )[0],
                 administrative_fee=administrative_fee,
                 travel_expences_agreement=True,
                 travel_expences_management=travel_expences_management,

amy/workshops/migrations/0263_remove_workshoprequest_number_attendees.py

@@ -0,0 +1,42 @@
+# Generated by Django 3.2.20 on 2023-08-15 11:23
+
+from django.db import migrations, models
+
+ATTENDEES_NUMBER_CHOICES = (
+    ("10-40", "10-40 (one room, two instructors)"),
+    ("40-80", "40-80 (two rooms, four instructors)"),
+    ("80-120", "80-120 (three rooms, six instructors)"),
+)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("workshops", "0262_alter_trainingrequest_training_completion_agreement"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="workshoprequest",
+            name="number_attendees",
+            field=models.CharField(
+                max_length=15,
+                choices=ATTENDEES_NUMBER_CHOICES,
+                blank=False,
+                null=False,
+                default="",  # must have a default for migration to be reversible
+                verbose_name="Anticipated number of attendees",
+                help_text="These recommendations are for in-person workshops. "
+                "This number doesn't need to be precise, but will help us "
+                "decide how many instructors your workshop will need. "
+                "Each workshop must have at least two instructors.<br>"
+                "For online Carpentries workshops, we recommend a maximum of "
+                "20 learners per class. If your workshop attendance will "
+                "exceed 20 learners please be sure to include a note in the "
+                "comments section below. ",
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="workshoprequest",
+            name="number_attendees",
+        ),
+    ]

amy/workshops/models.py

@@ -3076,22 +3076,7 @@ class WorkshopRequest(
         ("40-80", "40-80 (two rooms, four instructors)"),
         ("80-120", "80-120 (three rooms, six instructors)"),
     )
-    number_attendees = models.CharField(
-        max_length=15,
-        choices=ATTENDEES_NUMBER_CHOICES,
-        blank=False,
-        null=False,
-        default=None,
-        verbose_name="Anticipated number of attendees",
-        help_text="These recommendations are for in-person workshops. "
-        "This number doesn't need to be precise, but will help us "
-        "decide how many instructors your workshop will need. "
-        "Each workshop must have at least two instructors.<br>"
-        "For online Carpentries workshops, we recommend a maximum of "
-        "20 learners per class. If your workshop attendance will "
-        "exceed 20 learners please be sure to include a note in the "
-        "comments section below. ",
-    )
+
     # MISSING
     # This field is no longer needed, and should be hidden in the form and
     # templates.

amy/workshops/tests/test_migrations.py

@@ -390,3 +390,30 @@ def test_workshops_0261_rollback(self):
         self.assertIsNone(demo_progress.involvement_type)
         self.assertIsNone(demo_progress.date)
         self.assertEqual(demo_progress.notes, "")
+
+
+class TestWorkshops0263Rollback(MigratorTestCase):
+    migrate_from = ("workshops", "0263_remove_workshoprequest_number_attendees")
+    migrate_to = (
+        "workshops",
+        "0262_alter_trainingrequest_training_completion_agreement",
+    )
+
+    def prepare(self):
+        """Prepare some data before the migration."""
+        # create some requests
+        WorkshopRequest = self.old_state.apps.get_model("workshops", "WorkshopRequest")
+        Language = self.old_state.apps.get_model("workshops", "Language")
+        WorkshopRequest.objects.create(
+            location="London",
+            country="GB",
+            language=Language.objects.get(name="English"),
+            administrative_fee="nonprofit",
+            travel_expences_agreement=True,
+        )
+
+    def test_workshops_0263_rollback(self):
+        """Ensure the migration can be rolled back without an error."""
+        WorkshopRequest = self.new_state.apps.get_model("workshops", "WorkshopRequest")
+        request = WorkshopRequest.objects.get(location="London")
+        self.assertEqual(request.number_attendees, "")

amy/workshops/tests/test_utils.py

@@ -1033,7 +1033,6 @@ def setUp(self):
             preferred_dates=None,
             other_preferred_dates="soon",
             language=Language.objects.get(name="English"),
-            number_attendees="10-40",
             audience_description="Students of Hogwarts",
             administrative_fee="waiver",
             travel_expences_management="booked",