Changeset c297267

Timestamp:

Oct 11, 2011, 7:41:37 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

1ed7e51

Parents:

00d201c

git-author:

Alex Dehnert <adehnert@…> (10/11/11 17:08:00)

git-committer:

Alex Dehnert <adehnert@…> (10/11/11 19:41:37)

Message:

Cycle-based system for people's confirmation

Location:

asadb

Files:

• forms/admin.py (modified) (2 diffs)
• forms/migrations/0009_add_confirmation_cycle.py (added)
• forms/migrations/0010_move_people_to_cycles.py (added)
• forms/models.py (modified) (2 diffs)
• forms/views.py (modified) (2 diffs)
• template/membership/confirm.html (modified) (3 diffs)

asadb/forms/admin.py

@@ -23 +23 @@
 admin.site.register(forms.models.FYSMCategory, FYSMCategoryAdmin)
 
+class Admin_GroupConfirmationCycle(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'name',
+        'slug',
+        'create_date',
+    )
+    list_display_links = ('pk', 'name', 'slug', )
+    prepopulated_fields = {"slug": ("name",)}
+admin.site.register(forms.models.GroupConfirmationCycle, Admin_GroupConfirmationCycle)
+
 class Admin_GroupMembershipUpdate(admin.ModelAdmin):
     list_display = (
@@ -43 +54 @@
         'pk',
         'username',
+        'cycle',
         'update_time',
+        'deleted',
+        'valid',
     )
-    list_filter = ('groups', )
-    list_display_links = ('pk', 'username', )
+    list_filter = ('valid', 'groups', )
+    list_display_links = ('pk', 'username', 'cycle', )
 admin.site.register(forms.models.PersonMembershipUpdate, Admin_PersonMembershipUpdate)

asadb/forms/models.py

@@ -137 +137 @@
 
 
+class GroupConfirmationCycle(models.Model):
+    name = models.CharField(max_length=30)
+    slug = models.SlugField()
+    create_date = models.DateTimeField(default=datetime.datetime.now)
+
+    def __unicode__(self, ):
+        return u"GroupConfirmationCycle %d: %s" % (self.id, self.name, )
+
+    @classmethod
+    def latest(cls, ):
+        return cls.objects.order_by('-create_date')[0]
+
+
 class GroupMembershipUpdate(models.Model):
     update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
@@ -167 +180 @@
 
 
+VALID_UNSET         = 0
+VALID_AUTOVALIDATED = 10
+VALID_OVERRIDDEN    = 20    # confirmed by an admin
+VALID_AUTOREJECTED      = -10
+VALID_HANDREJECTED      = -20
+VALID_CHOICES = (
+    (VALID_UNSET,           "unvalidated"),
+    (VALID_AUTOVALIDATED,   "autovalidated"),
+    (VALID_OVERRIDDEN,      "hand-validated"),
+    (VALID_AUTOREJECTED,    "autorejected"),
+    (VALID_HANDREJECTED,    "hand-rejected"),
+)
+
 class PersonMembershipUpdate(models.Model):
     update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
     username = models.CharField(max_length=30)
+    cycle = models.ForeignKey(GroupConfirmationCycle)
+    deleted = models.DateTimeField(default=None, null=True, blank=True, )
+    valid = models.IntegerField(choices=VALID_CHOICES, default=VALID_UNSET)
     groups = models.ManyToManyField(groups.models.Group, help_text="By selecting a group here, you indicate that you are an active member of the group in question.<br>If your group does not appear in the list above, then please email asa-exec@mit.edu.<br>")
 

asadb/forms/views.py

@@ -339 +339 @@
     initial = {
     }
-    update_obj = forms.models.PersonMembershipUpdate()
-    update_obj.update_time  = datetime.datetime.now()
-    update_obj.username = request.user.username
-
+    cycle = forms.models.GroupConfirmationCycle.latest()
+    try:
+        update_obj = forms.models.PersonMembershipUpdate.objects.get(
+            username=request.user.username,
+            deleted__isnull=True,
+            cycle=cycle,
+        )
+        selected_groups = update_obj.groups.all()
+        print "Got update"
+    except forms.models.PersonMembershipUpdate.DoesNotExist:
+        update_obj = forms.models.PersonMembershipUpdate()
+        update_obj.update_time  = datetime.datetime.now()
+        update_obj.username = request.user.username
+        update_obj.cycle = cycle
+        selected_groups = []
+
+    accounts = groups.models.AthenaMoiraAccount
+    try:
+        person = accounts.active_accounts.get(username=request.user.username)
+        if person.is_student():
+            update_obj.valid = forms.models.VALID_AUTOVALIDATED
+        else:
+            update_obj.valid = forms.models.VALID_AUTOREJECTED
+    except accounts.DoesNotExist:
+        pass
+        update_obj.valid = forms.models.VALID_AUTOREJECTED
+
+    message = ""
     if request.method == 'POST': # If the form has been submitted...
         form = Form_PersonMembershipUpdate(request.POST, request.FILES, instance=update_obj) # A form bound to the POST data
@@ -348 +372 @@
         if form.is_valid(): # All validation rules pass
             request_obj = form.save()
-            return HttpResponseRedirect(reverse('membership-thanks', )) # Redirect after POST
+            message = "Update saved"
 
     else:
-        form = Form_PersonMembershipUpdate(initial=initial, ) # An unbound form
+        form = Form_PersonMembershipUpdate(initial=initial, instance=update_obj, ) # An unbound form
 
     context = {
         'form':form,
+        'groups':selected_groups,
+        'message': message,
         'pagename':'groups',
     }

asadb/template/membership/confirm.html

@@ -6 +6 @@
 <h2>Membership update</h2>
 
+{% if message %}
+<div class='messagebox infobox'>
+<p>{{message}}</p>
+</div>
+{% endif %}
+
 <p>
 The ASA is attempting to verify that all currently recognized groups are active
@@ -12 +18 @@
 
 <p>
-Please select below the groups that you consider yourself a member of. (If you
-prefer, you can submit this form whenever one of your groups' leaders asks you
-to. Submitting again will not erase previous submissions.)
+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>
 
@@ -25 +32 @@
 </form>
 
+{% if groups %}
+<h3>Groups saved</h3>
+<ul>
+{% for group in groups %}
+    <li>{{group}}</li>
+{% endfor %}
+</ul>
+{% endif %}
+
 {% endblock %}