--- a/sdi/views.py Mon Jul 26 17:44:26 2010 +0530
+++ b/sdi/views.py Mon Jul 26 17:46:36 2010 +0530
@@ -183,7 +183,7 @@
not_selected_ppl = Registrant.objects.filter(registrantinfo__status_of_attending_sagedays ="3",
registrantinfo__status_of_accomodation="1")
- user_choices = list(rejected_ppl) + list(selected_not_confirmed_ppl) + list(not_selected_ppl)
+ user_choices = list(rejected_ppl) + list(selected_ppl) + list(not_selected_ppl)
form = UserSelectForm(user_choices, request.POST)
if request.method == "POST" and form.is_valid():
@@ -196,8 +196,7 @@
return render_to_response("sent_acco_confirm.html", {"selected_users":selected_users})
else:
return render_to_response("send_acco_cnf.html", {"rejected": rejected_ppl,
- "selected_not_confirmed":selected_not_confirmed_ppl,
- "selected_confirmed":selected_confirmed_ppl,
+ "selected":selected_ppl,
"not_selected":not_selected_ppl,
})
--- a/templates/send_acco_cnf.html Mon Jul 26 17:44:26 2010 +0530
+++ b/templates/send_acco_cnf.html Mon Jul 26 17:46:36 2010 +0530
@@ -17,18 +17,6 @@
{% endfor %}
</table>
<br />
-Selected but not Confirmed Ppl: {{selected_not_confirmed.count}}<br />
-<table cellspacing=2 cellpadding=2>
-{% for m in selected_not_confirmed %}
-<tr>
-<td> <input type="checkbox" name="selected_users" value="{{m.id}}" id="id_selected_users_0" /> </td>
-<td> {{m}} </td>
-<td> {{m.gender}} </td>
-<td> {{m.profession}}</td>
-<td> {{m.affiliated_to}} </td>
-</tr>
-{% endfor %}
-</table>
Rejected Ppl: {{rejected.count}}<br />
<table cellspacing=2 cellpadding=2>
@@ -46,9 +34,9 @@
<input type=submit value="Send confirmation email" />
</form>
<br /><br />
-Selected and confirmed Ppl: {{selected_confirmed.count}}<br />
+Selected Ppl: {{selected_confirmed.count}}<br />
<table cellspacing=2 cellpadding=2>
-{% for m in selected_confirmed %}
+{% for m in selected %}
<tr>
<td> {{m}} </td>
<td> {{m.gender}} </td>