Moved position of waitlist header, updated tests

bmun · Dec 19, 2023 · 6790661 · 6790661
1 parent 816de35
commit 6790661
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/huxley/core/admin/registration.py b/huxley/core/admin/registration.py
@@ -23,10 +23,10 @@ def get_rows(self):
             "Beginners", "Intermediates", "Advanced", "Spanish Speakers",
             "Chinese Speakers", "Assignments Finalized", "Waivers Complete",
             "Delegate Fees Paid", "Delegate Fees Owed",
-            "Paid Registration Fee?", "Invoice Sent", "Payment Type", "Country 1", "Country 2", "Country 3",
+            "Paid Registration Fee?", "Invoice Sent", "Payment Type", "Waitlisted", "Country 1", "Country 2", "Country 3",
             "Country 4", "Country 5", "Country 6", "Country 7", "Country 8",
             "Country 9", "Country 10", "Committee Preferences",
-            "Registration Comments", "Waitlisted"
+            "Registration Comments"
         ]) 
 
         for registration in Registration.objects.all().order_by(
@@ -61,10 +61,10 @@ def get_rows(self):
                     registration.invoices_sent
                 ]
             ] + payment_type_string +
+            is_waitlisted_string +
             country_preferences + 
             committee_preferences +
-            [str(registration.registration_comments)] +
-            is_waitlisted_string )
+            [str(registration.registration_comments)])
         return rows
 
     def info(self, request):

diff --git a/huxley/core/tests/admin/test_registration.py b/huxley/core/tests/admin/test_registration.py
@@ -25,10 +25,10 @@ def test_preference_export(self):
             "Beginners", "Intermediates", "Advanced", "Spanish Speakers",
             "Chinese Speakers",  "Assignments Finalized", "Waivers Complete", 
             "Delegate Fees Paid", "Delegate Fees Owed", "Paid Registration Fee?", 
-            "Invoice Sent", "Payment Type",
+            "Invoice Sent", "Payment Type", "Waitlisted", 
             "Country 1", "Country 2", "Country 3", "Country 4", "Country 5", 
             "Country 6", "Country 7", "Country 8", "Country 9", "Country 10", 
-            "Committee Preferences", "Registration Comments", "Waitlisted"
+            "Committee Preferences", "Registration Comments"
         ]
 
         fields_csv = ",".join(map(str, header)) + "\r\n"
@@ -62,10 +62,10 @@ def test_preference_export(self):
             registration.invoices_sent
         ]
         fields.extend(payment_type_string)
+        fields.extend(is_waitlisted_string)
         fields.extend(country_preferences)
         fields.extend(committee_preferences)
         fields.extend(registration.registration_comments)
-        fields.extend(is_waitlisted_string)
 
         fields_csv += ','.join(map(str, fields))
         self.assertEquals(fields_csv, response.content[:-3].decode('utf-8'))