Changeset 56e8cb8

Timestamp:

Oct 12, 2011, 10:54:21 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

8dfd3db

Parents:

ce7fd92

git-author:

Alex Dehnert <adehnert@…> (10/12/11 22:54:21)

git-committer:

Alex Dehnert <adehnert@…> (10/12/11 22:54:21)

Message:

Better participant membership UI (Trac: #26)

Location:

asadb

Files:

• forms/views.py (modified) (3 diffs)
• template/membership/confirm.html (modified) (3 diffs)

asadb/forms/views.py

@@ -1 +1 @@
 import forms.models
 import groups.models
+import groups.views
 import settings
 
@@ -367 +368 @@
         update_obj.valid = forms.models.VALID_AUTOREJECTED
 
+    qs = groups.models.Group.active_groups
+    filterset = groups.views.GroupFilter(request.GET, qs)
+    filtered_groups = filterset.qs.all()
+    show_filtered_groups = ('search' in request.GET)
+
     message = ""
-    if request.method == 'POST': # If the form has been submitted...
+    message_type = "info"
+
+    if request.method == 'POST' and 'add-remove' in request.POST:
+        group = groups.models.Group.objects.get(id=request.POST['group'])
+        if request.POST['action'] == 'remove':
+            if group in update_obj.groups.all():
+                update_obj.groups.remove(group)
+                message = "You have been successfully removed from %s." % (group, )
+            else:
+                message = "Sorry, but you're not in %s." % (group, )
+                message_type = "warn"
+        elif request.POST['action'] == 'add':
+            if group in update_obj.groups.all():
+                message = "Sorry, but you're already in %s." % (group, )
+                message_type = "warn"
+            else:
+                update_obj.groups.add(group)
+                message = "You have been successfully added to %s." % (group, )
+        else:
+            message = "Uh, somehow you tried to do something besides adding and removing..."
+            message_type = "alert"
+
+    if request.method == 'POST' and 'list' in request.POST: # If the form has been submitted...
         form = Form_PersonMembershipUpdate(request.POST, request.FILES, instance=update_obj) # A form bound to the POST data
 
@@ -380 +408 @@
     context = {
         'form':form,
-        'groups':selected_groups,
+        'filter':filterset,
+        'show_filtered_groups':show_filtered_groups,
+        'filtered_groups':filtered_groups,
+        'member_groups':selected_groups,
         'message': message,
+        'message_type': message_type,
         'pagename':'groups',
     }

asadb/template/membership/confirm.html

@@ -7 +7 @@
 
 {% if message %}
-<div class='messagebox infobox'>
+<div class='messagebox {{message_type}}box'>
 <p>{{message}}</p>
 </div>
@@ -17 +17 @@
 </p>
 
-<p>
-Please select below the groups that you consider yourself a member of. If you
-come back to this form again, you'll be able to see all the groups you
-previously submitted, and add new groups. However, you should be careful not to
-deselect any groups.
-</p>
+<p>We ask you to help with that process by indicating what groups you consider yourself a member of.</p>
+
+<h3>Groups you currently say you're a member of:</h3>
+{% if member_groups %}
+<ul>
+{% for group in member_groups %}
+    <li>{{group}}</li>
+{% endfor %}
+</ul>
+{% else %}
+<p>You are not currently indicating membership in any groups.</p>
+{% endif %}
+
+<h3>Option 1: Add or remove groups one at a time</h3>
+
+<form action="" method="get">
+    <table class='pretty-table'>
+    {{ filter.form.as_table }}
+    </table>
+    <input type="submit" name='search' value="Search" />
+    <input type="submit" name='stop-search' value="Stop searching" />
+</form>
+
+{% if show_filtered_groups %}
+<table class='pretty-table'>
+<thead>
+    <tr>
+        <th>Name</th>
+        <th>Website</th>
+        <th>ASA DB</th>
+        <th>Description</th>
+        <th>Add/Remove</th>
+    </tr>
+</thead>
+<tbody>
+{% for group in filtered_groups %}
+    <tr>
+        <th>{{group.name}}</th>
+        <td>{% if group.website_url %}<a href='{{group.website_url}}'>Website</a>{%endif%}</td>
+        <td><a href='{% url groups:group-detail group.pk %}'>DB Entry</a></td>
+        <td>{{group.description}}</td>
+        <td>
+            <form action="" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="group" value="{{group.pk}}">
+            {% if group in member_groups %}
+            <input type="hidden" name="action" value="remove">
+            <input type="submit" name="add-remove" value="Remove">
+            {% else %}
+            <input type="hidden" name="action" value="add">
+            <input type="submit" name="add-remove" value="Add">
+            {% endif %}
+            </form>
+        </td>
+    </tr>
+{% endfor %}
+</tbody>
+</table>
+{% else %}
+<p>Hit "search" to see matching groups.</p>
+{% endif %}
+
+
+<h3>Option 2: Select all your groups at once</h3>
+
+<p>Below is a list of all recognized groups. You can go through picking out the groups you are a member of. However, you should be careful not to deselect any groups (unless you aren't a member of them, of course).</p>
 
 <form enctype="multipart/form-data" method="post" action="">
@@ -28 +88 @@
 <table class='pretty-table'>
 {{ form.as_table }}
-<tr><th colspan='2'><input type='submit' value='Confirm membership' /></th></tr>
+<tr><th colspan='2'><input type='submit' name='list' value='Update list of groups' /></th></tr>
 </table>
 </form>
 
-{% if groups %}
-<h3>Groups saved</h3>
-<ul>
-{% for group in groups %}
-    <li>{{group}}</li>
-{% endfor %}
-</ul>
-{% endif %}
-
 {% endblock %}