Changeset 5b834ab

Timestamp:

Sep 8, 2011, 1:31:12 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

aa31d18

Parents:

bb674c2

git-author:

Alex Dehnert <adehnert@…> (09/08/11 00:51:05)

git-committer:

Alex Dehnert <adehnert@…> (09/08/11 01:31:12)

Message:

Support basic start-of-year form

• Anti-hazing acknowledgement
• Group membership information
• Group membership confirmation

Location:

asadb

Files:

• forms/admin.py (modified) (1 diff)
• forms/migrations/0005_group_membership_update.py (added)
• forms/migrations/0006_person_membership_update.py (added)
• forms/models.py (modified) (1 diff)
• forms/views.py (modified) (1 diff)
• template/membership/anti-hazing.txt (added)
• template/membership/confirm.html (added)
• template/membership/submit-confirm-email.txt (added)
• template/membership/thanks.html (added)
• template/membership/update.html (added)
• urls.py (modified) (1 diff)

asadb/forms/admin.py

@@ -22 +22 @@
 admin.site.register(forms.models.FYSM, FYSMAdmin)
 admin.site.register(forms.models.FYSMCategory, FYSMCategoryAdmin)
+
+class Admin_GroupMembershipUpdate(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'group',
+        'update_time',
+        'updater_name',
+        'updater_title',
+        'num_undergrads',
+        'num_grads',
+        'num_community',
+        'num_other',
+    )
+    list_display_links = ('pk', 'group', )
+admin.site.register(forms.models.GroupMembershipUpdate, Admin_GroupMembershipUpdate)
+
+class Admin_PersonMembershipUpdate(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'username',
+        'update_time',
+    )
+    list_display_links = ('pk', 'username', )
+admin.site.register(forms.models.PersonMembershipUpdate, Admin_PersonMembershipUpdate)

asadb/forms/models.py

@@ -135 +135 @@
             preview.update_time = cls.never_updated
             preview.save()
+
+
+class GroupMembershipUpdate(models.Model):
+    update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
+    updater_name = models.CharField(max_length=30)
+    updater_title = models.CharField(max_length=30, help_text="You need not hold any particular title in the group, but we like to know who is completing the form.")
+    
+    group = models.ForeignKey(groups.models.Group, help_text="If your group does not appear in the list above, then please email asa-exec@mit.edu.")
+    group_email = models.EmailField(help_text="The text of the law will be automatically distributed to your members via this list, in order to comply with the law.")
+    officer_email = models.EmailField()
+
+    membership_definition = models.TextField()
+    num_undergrads = models.IntegerField()
+    num_grads = models.IntegerField()
+    num_community = models.IntegerField()
+    num_other = models.IntegerField()
+
+    membership_list = models.TextField(help_text="Member emails on separate lines (Athena usernames where applicable)")
+
+    compliance_statement = "By checking this, I hereby affirm that I have read and understand Chapter 269: Sections 17, 18, and 19 of Massachusetts Law. I furthermore attest that I will distribute to group members, pledges, and/or applicants, copies of Massachusetts Law 269: 17, 18, 19 and that our organization, group, or team agrees to comply with the provisions of that law. (See below for text.)"
+    no_hazing = models.BooleanField(help_text=compliance_statement)
+
+
+class PersonMembershipUpdate(models.Model):
+    update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
+    username = models.CharField(max_length=30)
+    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

@@ -220 +220 @@
     }
     return render_to_response('fysm/thanks.html', context, context_instance=RequestContext(request), )
+
+#####################
+# Membership update #
+#####################
+
+class Form_GroupMembershipUpdate(ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(Form_GroupMembershipUpdate, self).__init__(*args, **kwargs)
+        self.fields['no_hazing'].required = True
+
+    class Meta:
+        model = forms.models.GroupMembershipUpdate
+        fields = [
+            'group',
+            'updater_title',
+            'group_email',
+            'officer_email',
+            'no_hazing',
+            'membership_definition',
+            'num_undergrads',
+            'num_grads',
+            'num_community',
+            'num_other',
+            'membership_list',
+        ]
+
+@login_required
+def group_membership_update(request, ):
+    year = datetime.date.today().year
+
+    initial = {
+    }
+    update_obj = forms.models.GroupMembershipUpdate()
+    update_obj.update_time  = datetime.datetime.now()
+    update_obj.updater_name = request.user.username
+
+    confirm_path = reverse('membership-confirm', )
+    confirm_uri = '%s://%s%s' % (request.is_secure() and 'https' or 'http',
+         request.get_host(), confirm_path)
+
+    if request.method == 'POST': # If the form has been submitted...
+        form = Form_GroupMembershipUpdate(request.POST, request.FILES, instance=update_obj) # A form bound to the POST data
+
+        if form.is_valid(): # All validation rules pass
+            request_obj = form.save()
+            group_obj = request_obj.group
+
+
+            # Send email
+            tmpl = get_template('membership/anti-hazing.txt')
+            ctx = Context({
+                'update': request_obj,
+                'group': group_obj,
+                'submitter': request.user,
+            })
+            body = tmpl.render(ctx)
+            email = EmailMessage(
+                subject='ASA Anti-Hazing Acknowledgement for %s' % (
+                    group_obj.name,
+                ),
+                body=body,
+                from_email=request.user.email,
+                to=[request_obj.group_email, ],
+                cc=[request_obj.officer_email, ],
+                #bcc=['asa-db-outgoing@mit.edu', ],
+            )
+            email.send()
+
+            # Send email
+            tmpl = get_template('membership/submit-confirm-email.txt')
+            ctx = Context({
+                'update': request_obj,
+                'group': group_obj,
+                'submitter': request.user,
+                'confirm_uri': confirm_uri,
+            })
+            body = tmpl.render(ctx)
+            email = EmailMessage(
+                subject='ASA Membership Information for %s' % (
+                    group_obj.name,
+                ),
+                body=body,
+                from_email=request.user.email,
+                to=[request_obj.officer_email, ],
+                #bcc=['asa-db-outgoing@mit.edu', ],
+            )
+            email.send()
+
+            return HttpResponseRedirect(reverse('membership-thanks', )) # Redirect after POST
+
+    else:
+        form = Form_GroupMembershipUpdate(initial=initial, ) # An unbound form
+
+    context = {
+        'form':form,
+        'confirm_uri': confirm_uri,
+        'pagename':'groups',
+    }
+    return render_to_response('membership/update.html', context, context_instance=RequestContext(request), )
+
+class Form_PersonMembershipUpdate(ModelForm):
+    class Meta:
+        model = forms.models.PersonMembershipUpdate
+        fields = [
+            'groups',
+        ]
+
+@login_required
+def person_membership_update(request, ):
+    year = datetime.date.today().year
+
+    initial = {
+    }
+    update_obj = forms.models.PersonMembershipUpdate()
+    update_obj.update_time  = datetime.datetime.now()
+    update_obj.username = request.user.username
+
+    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
+
+        if form.is_valid(): # All validation rules pass
+            request_obj = form.save()
+            return HttpResponseRedirect(reverse('membership-thanks', )) # Redirect after POST
+
+    else:
+        form = Form_PersonMembershipUpdate(initial=initial, ) # An unbound form
+
+    context = {
+        'form':form,
+        'pagename':'groups',
+    }
+    return render_to_response('membership/confirm.html', context, context_instance=RequestContext(request), )

asadb/urls.py

@@ -35 +35 @@
     url(r'^fysm/(?:(\d+)/)?(?:([\w-]+)/)?$', forms.views.fysm_by_years, name='fysm', ),
 
+    url(r'^membership/update/$', forms.views.group_membership_update, name='membership-update', ),
+    url(r'^membership/confirm/$', forms.views.person_membership_update, name='membership-confirm', ),
+    url(
+        r'^membership/thanks/$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'membership/thanks.html', 'extra_context': { 'pagename':'groups' }, },
+        name='membership-thanks',
+    ),
+
     # Group list
     url(