Changeset 4260e2c

Timestamp:

Oct 12, 2011, 3:57:36 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

43434f6

Parents:

1ed7e51

git-author:

Alex Dehnert <adehnert@…> (10/12/11 15:57:36)

git-committer:

Alex Dehnert <adehnert@…> (10/12/11 15:57:36)

Message:

Fix the display of number of confirmations

Location:

asadb

Files:

• forms/views.py (modified) (2 diffs)
• template/membership/submitted.html (modified) (2 diffs)

asadb/forms/views.py

@@ -15 +15 @@
 from django.forms import ModelForm
 from django.forms import ModelChoiceField, ModelMultipleChoiceField
+from django.db import connection
 from django.db.models import Q, Count
 
@@ -392 +393 @@
     def get_queryset(self):
         group_updates = forms.models.GroupMembershipUpdate.objects.all()
-        group_updates = group_updates.annotate(num_confirms=Count('group__personmembershipupdate__username', distinct=True))
+        group_updates = group_updates.filter(
+            group__personmembershipupdate__deleted__isnull=True,
+            group__personmembershipupdate__valid__gt=0,
+        )
+        group_updates = group_updates.annotate(num_confirms=Count('group__personmembershipupdate'))
+        #print len(list(group_updates))
+        #for query in connection.queries: print query
         return group_updates
 

asadb/template/membership/submitted.html

@@ -5 +5 @@
 
 <h2>Membership Information Submissions Received</h2>
+
+<p>Your group will show up here once <em>both</em> you submit an entry for your group, and at least one person (e.g., you) confirm membership.</p>
 
 <table class='pretty-table'>
@@ -27 +29 @@
 </table>
 
-<p>* These are approximate. It counts multiple times people who submitted several times, it includes non-students (if any confirmed), and it includes people who selected all the groups. We may or may not ever correct for these. However, if you want to be sure of the correct number, please contact <a href='mailto:asa-db@mit.edu'>the ASA Database team</a> and we'll be happy to look it up for you.</p>
+<p>* These are approximate. They include people (hopefully not many) who selected all the groups. If you want to be sure of the correct number, please contact <a href='mailto:asa-db@mit.edu'>the ASA Database team</a> and we'll be happy to look it up for you.</p>
 
 {% endblock %}