diff --git a/tjdests/apps/destinations/migrations/0009_alter_decision_admission_status.py b/tjdests/apps/destinations/migrations/0009_alter_decision_admission_status.py new file mode 100644 index 0000000..c36a2bb --- /dev/null +++ b/tjdests/apps/destinations/migrations/0009_alter_decision_admission_status.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2 on 2021-04-22 17:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("destinations", "0008_alter_decision_admission_status"), + ] + + operations = [ + migrations.AlterField( + model_name="decision", + name="admission_status", + field=models.CharField( + choices=[ + ("ADMIT", "Admitted"), + ("WAITLIST", "Waitlisted"), + ("WAITLIST_ADMIT", "Waitlist-Admitted"), + ("WAITLIST_DENY", "Waitlist-Denied"), + ("DEFER", "Deferred"), + ("DEFER_ADMIT", "Deferred-Admitted"), + ("DEFER_DENY", "Deferred-Denied"), + ("DEFER_WAITLIST", "Deferred-Waitlisted"), + ("DEFER_WAITLIST_ADMIT", "Deferred-Waitlisted-Admitted"), + ("DEFER_WAITLIST_DENY", "Deferred-Waitlisted-Denied"), + ("DENY", "Denied"), + ], + max_length=20, + ), + ), + ] diff --git a/tjdests/apps/destinations/models.py b/tjdests/apps/destinations/models.py index 548ee8e..1eb238f 100644 --- a/tjdests/apps/destinations/models.py +++ b/tjdests/apps/destinations/models.py @@ -43,6 +43,7 @@ class Decision(models.Model): WAITLIST = "WAITLIST" DEFER_ADMIT = "DEFER_ADMIT" DEFER_DENY = "DEFER_DENY" + DEFER_WL = "DEFER_WAITLIST" DEFER_WL_A = "DEFER_WAITLIST_ADMIT" DEFER_WL_D = "DEFER_WAITLIST_DENY" DEFER = "DEFER" @@ -56,6 +57,7 @@ class Decision(models.Model): (DEFER, "Deferred"), (DEFER_ADMIT, "Deferred-Admitted"), (DEFER_DENY, "Deferred-Denied"), + (DEFER_WL, "Deferred-Waitlisted"), (DEFER_WL_A, "Deferred-Waitlisted-Admitted"), (DEFER_WL_D, "Deferred-Waitlisted-Denied"), (DENY, "Denied"), diff --git a/tjdests/apps/destinations/tests.py b/tjdests/apps/destinations/tests.py index 127a5ef..5771401 100644 --- a/tjdests/apps/destinations/tests.py +++ b/tjdests/apps/destinations/tests.py @@ -188,6 +188,9 @@ class DestinationsTest(TJDestsTestCase): self.assertEqual(0, response.context["object_list"][0].count_defer) self.assertEqual(0, response.context["object_list"][0].count_defer_admit) self.assertEqual(0, response.context["object_list"][0].count_defer_deny) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl_admit) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl_deny) self.assertEqual(0, response.context["object_list"][0].count_deny) # Add another decision under a different user but the same college @@ -217,6 +220,9 @@ class DestinationsTest(TJDestsTestCase): self.assertEqual(0, response.context["object_list"][0].count_defer) self.assertEqual(0, response.context["object_list"][0].count_defer_admit) self.assertEqual(0, response.context["object_list"][0].count_defer_deny) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl_admit) + self.assertEqual(0, response.context["object_list"][0].count_defer_wl_deny) self.assertEqual(0, response.context["object_list"][0].count_deny) # Add another decision for user2 under a different college diff --git a/tjdests/apps/destinations/views.py b/tjdests/apps/destinations/views.py index 19c76cb..2c485bd 100644 --- a/tjdests/apps/destinations/views.py +++ b/tjdests/apps/destinations/views.py @@ -125,6 +125,13 @@ class CollegeDestinationListView( decision__user__publish_data=True, ), ), + count_defer_wl=Count( + "decision", + filter=Q( + decision__admission_status=Decision.DEFER_WL, + decision__user__publish_data=True, + ), + ), count_defer_wl_admit=Count( "decision", filter=Q( diff --git a/tjdests/templates/destinations/college_list.html b/tjdests/templates/destinations/college_list.html index 9764c0e..584cfe3 100644 --- a/tjdests/templates/destinations/college_list.html +++ b/tjdests/templates/destinations/college_list.html @@ -40,6 +40,7 @@