Mercurial Mercurial > sage_days / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed "2" from acco_choices and made corresponding change in view anoop
authornishanth
Mon, 26 Jul 2010 17:38:50 +0530
branchanoop
changeset 174 d979d1bc1c4e
parent 173 25f8826bc6e4
child 175 b48d4c18a0aa
removed "2" from acco_choices and made corresponding change in view
sdi/models.py file | annotate | diff | comparison | revisions
sdi/views.py file | annotate | diff | comparison | revisions 
--- 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"))
 
--- 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")
sage_days