# HG changeset patch # User nishanth # Date 1280146130 -19800 # Node ID d979d1bc1c4e13d0132922e13a6549bb3ddaa1f8 # Parent 25f8826bc6e4c2eb757e6c424ff9843ff71cce74 removed "2" from acco_choices and made corresponding change in view diff -r 25f8826bc6e4 -r d979d1bc1c4e sdi/models.py --- a/sdi/models.py Fri Jul 23 17:48:02 2010 +0530 +++ b/sdi/models.py Mon Jul 26 17:38:50 2010 +0530 @@ -56,8 +56,7 @@ ("0", "Does not need a workshop")) ACCO_CHOICES = (("4", "Has requested but request has been rejected"), - ("3", "Has been given accomodation and has confirmed the stay"), - ("2", "Has been given acco but not confirmed yet"), + ("3", "Has been given accomodation"), ("1", "Has requested for accomodation"), ("0", "Does not need acco")) diff -r 25f8826bc6e4 -r d979d1bc1c4e sdi/views.py --- a/sdi/views.py Fri Jul 23 17:48:02 2010 +0530 +++ b/sdi/views.py Mon Jul 26 17:38:50 2010 +0530 @@ -170,6 +170,7 @@ "not_selected":not_selected_ppl, }) +@login_required def send_acco_confirm(request): """ display list of confirmed participants who requested for accomodation and let the admin decide. @@ -177,9 +178,7 @@ rejected_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3", registrantinfo__status_of_accomodation="4") - selected_not_confirmed_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3", - registrantinfo__status_of_accomodation="2") - selected_confirmed_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3", + selected_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3", registrantinfo__status_of_accomodation="3") not_selected_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3", registrantinfo__status_of_accomodation="1")