Changeset 34ae23b

Timestamp:

Oct 17, 2011, 12:05:07 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

eabc6ee

Parents:

b04e142 (diff), ca21c49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (10/17/11 12:05:07)

git-committer:

Alex Dehnert <adehnert@…> (10/17/11 12:05:07)

Message:

Merge branch 'master' into new-db

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/migrations/0007_fix_fields_community.py (added)
• forms/migrations/0008_add_email_preface.py (added)
• forms/migrations/0009_add_confirmation_cycle.py (added)
• forms/migrations/0010_move_people_to_cycles.py (added)
• forms/models.py (modified) (1 diff)
• forms/update_validations.py (added)
• forms/views.py (modified) (2 diffs)
• settings/local_settings.dev-template.py (added)
• template/groups/groups_signatories.html (modified) (1 diff)
• template/membership/anti-hazing.txt (added)
• template/membership/confirm.html (added)
• template/membership/submit-confirm-email.txt (added)
• template/membership/submitted.html (added)
• template/membership/thanks.html (added)
• template/membership/update.html (added)
• urls.py (modified) (1 diff)
• groups/diffs.py (added)
• groups/urls.py (modified) (1 diff)
• groups/views.py (modified) (7 diffs)
• media/style/style.css (modified) (1 diff)
• template/groups/diffs/asa-update-mail.txt (added)
• template/groups/diffs/new-group-accounts.txt (added)
• template/groups/diffs/new-group-announce.txt (added)
• template/groups/diffs/sao-update-mail.txt (added)
• template/groups/group_create.html (added)
• util/emails.py (added)

asadb/forms/admin.py

@@ -22 +22 @@
 admin.site.register(forms.models.FYSM, FYSMAdmin)
 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 = (
+        'pk',
+        'group',
+        'update_time',
+        'updater_name',
+        'updater_title',
+        'num_undergrads',
+        'num_grads',
+        'num_alum',
+        'num_other_affiliate',
+        'num_other',
+    )
+    list_display_links = ('pk', 'group', )
+    search_fields = ('group__name', 'group__abbreviation', 'updater_name', )
+admin.site.register(forms.models.GroupMembershipUpdate, Admin_GroupMembershipUpdate)
+
+class Admin_PersonMembershipUpdate(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'username',
+        'cycle',
+        'update_time',
+        'deleted',
+        'valid',
+    )
+    list_filter = ('valid', 'groups', )
+    list_display_links = ('pk', 'username', 'cycle', )
+admin.site.register(forms.models.PersonMembershipUpdate, Admin_PersonMembershipUpdate)

asadb/forms/models.py

@@ -135 +135 @@
             preview.update_time = cls.never_updated
             preview.save()
+
+
+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))
+    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_alum = models.IntegerField()
+    num_other_affiliate = models.IntegerField()
+    num_other = models.IntegerField()
+
+    membership_list = models.TextField(help_text="Member emails on separate lines (Athena usernames where applicable)")
+
+    email_preface = models.TextField(blank=True, help_text="If you would like, you may add text here that will preface the text of the policies when it is sent out to the group membership list provided above.")
+
+    hazing_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 have provided the appropriate address or will otherwise 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=hazing_statement)
+
+    discrimination_statement = "By checking this, I hereby affirm that I have read and understand the MIT Non-Discrimination Policy.  I furthermore attest that our organization, group, or team agrees to not discriminate against individuals on the basis of race, color, sex, sexual orientation, gender identity, religion, disability, age, genetic information, veteran status, ancestry, or national or ethnic origin."
+    no_discrimination = models.BooleanField(help_text=discrimination_statement)
+
+    def __unicode__(self, ):
+        return "GroupMembershipUpdate for %s" % (self.group, )
+
+
+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>")
+
+    def __unicode__(self, ):
+        return "PersonMembershipUpdate for %s" % (self.username, )

asadb/forms/views.py

@@ -1 +1 @@
 import forms.models
 import groups.models
+import groups.views
 import settings
 
-from django.contrib.auth.decorators import user_passes_test, login_required
-from django.views.generic import list_detail
+from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
+from django.views.generic import list_detail, ListView, DetailView
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.template import Context, Template
 from django.template.loader import get_template
-from django.http import Http404, HttpResponseRedirect
+from django.http import Http404, HttpResponseRedirect, HttpResponse
 from django.core.urlresolvers import reverse
 from django.core.mail import EmailMessage, mail_admins
 from django.forms import Form
 from django.forms import ModelForm
-from django.forms import ModelChoiceField
-from django.db.models import Q
-
+from django.forms import ModelChoiceField, ModelMultipleChoiceField
+from django.db import connection
+from django.db.models import Q, Count
+
+import csv
 import datetime
+import StringIO
 
 #################
@@ -220 +224 @@
     }
     return render_to_response('fysm/thanks.html', context, context_instance=RequestContext(request), )
+
+#####################
+# Membership update #
+#####################
+
+class Form_GroupMembershipUpdate(ModelForm):
+    group = ModelChoiceField(queryset=groups.models.Group.active_groups.all())
+
+    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',
+            'email_preface',
+            'no_hazing',
+            'no_discrimination',
+            'membership_definition',
+            'num_undergrads',
+            'num_grads',
+            'num_alum',
+            'num_other_affiliate',
+            '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='Anti-Hazing and Non-Discrimination 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):
+    groups = ModelMultipleChoiceField(queryset=groups.models.Group.active_groups.all())
+    class Meta:
+        model = forms.models.PersonMembershipUpdate
+        fields = [
+            'groups',
+        ]
+
+@login_required
+def person_membership_update(request, ):
+    year = datetime.date.today().year
+
+    initial = {
+    }
+    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
+
+    update_obj.save()
+
+    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 = ""
+    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
+
+        if form.is_valid(): # All validation rules pass
+            request_obj = form.save()
+            message = "Update saved"
+
+    else:
+        form = Form_PersonMembershipUpdate(initial=initial, instance=update_obj, ) # An unbound form
+
+    context = {
+        'form':form,
+        'filter':filterset,
+        'show_filtered_groups':show_filtered_groups,
+        'filtered_groups':filtered_groups,
+        'member_groups':selected_groups,
+        'message': message,
+        'message_type': message_type,
+        'pagename':'groups',
+    }
+    return render_to_response('membership/confirm.html', context, context_instance=RequestContext(request), )
+
+
+class View_GroupMembershipList(ListView):
+    context_object_name = "group_list"
+    template_name = "membership/submitted.html"
+
+    def get_queryset(self):
+        group_updates = forms.models.GroupMembershipUpdate.objects.all()
+        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
+
+
+@permission_required('groups.view_group_private_info')
+def group_confirmation_issues(request, ):
+    active_groups = groups.models.Group.active_groups
+    group_updates = forms.models.GroupMembershipUpdate.objects.all()
+    people_confirmations = forms.models.PersonMembershipUpdate.objects.filter(
+        deleted__isnull=True,
+        valid__gt=0,
+    )
+
+    buf = StringIO.StringIO()
+    output = csv.writer(buf)
+    output.writerow(['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ])
+
+    q_present = Q(id__in=group_updates.values('group'))
+    missing_groups = active_groups.filter(~q_present)
+    #print len(list(group_updates))
+    for group in missing_groups:
+        num_confirms = len(people_confirmations.filter(groups=group))
+        output.writerow([
+            group.id,
+            group.name,
+            'unsubmitted',
+            num_confirms,
+            group.officer_email,
+        ])
+
+    for group_update in group_updates:
+        group = group_update.group
+        num_confirms = len(people_confirmations.filter(groups=group))
+        if num_confirms < 5:
+            output.writerow([
+                group.id,
+                group.name,
+                'confirmations',
+                num_confirms,
+                group.officer_email,
+            ])
+
+
+    return HttpResponse(buf.getvalue(), mimetype='text/plain', )

asadb/template/groups/groups_signatories.html

@@ -16 +16 @@
 
 <h2>The Groups</h2>
-
-{% if changes %}
-<table class='pretty-table'>
-<tr>
-    <th>Action</th>
-    <th>Person</th>
-    <th>Role</th>
-</tr>
-{% for verb, color, person, role in changes %}
-    <tr><td style='background-color: {{color}}; color: black'>{{verb}}</td><td>{{person}}</td><td>{{role.display_name}}</td></tr>
-{% endfor %}
-</table>
-{% endif %}
-
-{%if edited %}
-<p>Untouched were {{kept}} filled people/role combinations and {{kept_not}} unfilled combinations.</p>
-{% endif %}
 
 <table class='pretty-table'>

asadb/urls.py

@@ -29 +29 @@
     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',
+    ),
+    url(r'^membership/submitted/$', forms.views.View_GroupMembershipList.as_view(), name='membership-submitted', ),
+    url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
+
     # Group list
     (r'^groups/', include(groups.urls.urls(), ), ),

asadb/groups/urls.py

@@ -13 +13 @@
     (r'^(?P<pk>\d+)/', include(group_patterns, ), ),
     url(r'^$', groups.views.GroupListView.as_view(), name='list', ),
+    url(r'^create/(?P<status>\w+)?$', groups.views.create_group, name='create', ),
     url(r'^search/$', groups.views.search_groups, name='search', ),
     url(r'^recent_changes/$', groups.views.GroupHistoryView.as_view(), name='manage-history', ),

asadb/groups/views.py

@@ -17 +17 @@
 from django.core.urlresolvers import reverse
 from django.core.mail import EmailMessage, mail_admins
-from django.forms import Form
-from django.forms import ModelForm
-from django.forms import ModelChoiceField
+from django.forms import CharField, ModelChoiceField, MultipleChoiceField
+from django.forms import Form, ModelForm
+from django.forms import ValidationError
 from django.db import connection
 from django.db.models import Q
@@ -28 +28 @@
 
 from util.db_form_utils import StaticWidget
-
+from util.emails import email_from_template
+
+
+
+############
+# Homepage #
+############
 
 def view_homepage(request, ):
@@ -56 +62 @@
     }
     return render_to_response('index.html', context, context_instance=RequestContext(request), )
+
+
+
+################
+# Single group #
+################
+
+class GroupDetailView(DetailView):
+    context_object_name = "group"
+    model = groups.models.Group
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super(GroupDetailView, self).get_context_data(**kwargs)
+        group = context['group']
+
+        # Indicate whether this person should be able to see "private" info
+        context['viewpriv'] = self.request.user.has_perm('groups.view_group_private_info', group)
+        context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
+        context['notes'] = group.viewable_notes(self.request.user)
+
+        # People involved in the group
+        just_roles = groups.models.OfficerRole.objects.all()
+        if context['viewpriv'] or self.request.user.has_perm('groups.view_signatories'):
+            # Can see the non-public stuff
+            pass
+        else:
+            just_roles = just_roles.filter(publicly_visible=True)
+        roles = []
+        for role in just_roles:
+            roles.append((role.display_name, role, group.officers(role=role), ))
+        context['roles'] = roles
+
+        return context
 
 
@@ -136 +175 @@
             request_obj.save()
             form.save_m2m()
-
-            # Send email
-            #tmpl = get_template('fysm/update_email.txt')
-            #ctx = Context({
-            #    'group': group_obj,
-            #    'fysm': fysm_obj,
-            #    'view_uri': view_uri,
-            #    'submitter': request.user,
-            #    'request': request,
-            #    'sender': "ASA FYSM team",
-            #})
-            #body = tmpl.render(ctx)
-            #email = EmailMessage(
-            #    subject='FYSM entry for "%s" updated by "%s"' % (
-            #        group_obj.name,
-            #        request.user,
-            #    ),
-            #    body=body,
-            #    from_email='asa-fysm@mit.edu',
-            #    to=[group_obj.officer_email, request.user.email, ],
-            #    bcc=['asa-fysm-submissions@mit.edu', ]
-            #)
-            #email.send()
             msg = "Thanks for editing!"
         else:
@@ -173 +189 @@
     return render_to_response('groups/group_change_main.html', context, context_instance=RequestContext(request), )
 
+def validate_athena(username, student=False, ):
+    try:
+        person = groups.models.AthenaMoiraAccount.active_accounts.get(username=username)
+        if student and not person.is_student():
+            raise ValidationError('This must be a current student.')
+    except groups.models.AthenaMoiraAccount.DoesNotExist:
+        raise ValidationError('This must be a valid Athena username.')
+
+class GroupCreateForm(form_utils.forms.BetterModelForm):
+    create_which = MultipleChoiceField(
+        choices=[
+            ('officer_email', 'officer list', ),
+            ('group_email', 'group list', ),
+            ('athena_locker', 'Athena locker', ),
+        ],
+    )
+
+    president = CharField(min_length=3, max_length=8, )
+    treasurer = CharField(min_length=3, max_length=8, )
+    def clean_president(self, ):
+        username = self.cleaned_data['president']
+        validate_athena(username, True, )
+        return username
+
+    def clean_treasurer(self, ):
+        username = self.cleaned_data['treasurer']
+        validate_athena(username, True, )
+        return username
+
+    class Meta:
+        fieldsets = [
+            ('basic', {
+                'legend': 'Basic Information',
+                'fields': ['name', 'abbreviation', 'activity_category', 'description', ],
+            }),
+            ('officers', {
+                'legend': 'Officers',
+                'fields': ['president', 'treasurer', ],
+            }),
+            ('technical', {
+                'legend': 'Technical Information',
+                'fields': ['officer_email', 'group_email', 'athena_locker', 'create_which', ],
+            }),
+            ('Category', {
+                'legend': 'Category',
+                'fields': ['group_status', 'group_class', ],
+            }),
+            ('financial', {
+                'legend': 'Financial Information',
+                'fields': ['group_funding', 'main_account_id', 'funding_account_id', ],
+            }),
+            ('more-info', {
+                'legend': 'Additional Information',
+                'fields': ['constitution_url', ],
+            }),
+        ]
+        model = groups.models.Group
+
+
+@permission_required('groups.add_group')
+def create_group(request, status=None,):
+    if not status: status = 'active'
+    groupstatus = get_object_or_404(groups.models.GroupStatus, slug=status)
+    
+    msg = None
+
+    initial = {
+        'create_which': ['officer_email', 'group_email', 'athena_locker', ],
+    }
+    group = groups.models.Group()
+    group.group_status = groupstatus
+    group.recognition_date  = datetime.datetime.now()
+    if request.method == 'POST': # If the form has been submitted...
+        # A form bound to the POST data
+        form = GroupCreateForm(
+            request.POST, request.FILES,
+            initial=initial,
+            instance=group,
+        )
+
+        if form.is_valid(): # All validation rules pass
+            # Basic setup
+            group.set_updater(request.user)
+            form.save()
+
+            # Officers
+            groups.models.OfficeHolder(
+                person=form.cleaned_data['president'],
+                role=groups.models.OfficerRole.objects.get(slug='president'),
+                group=group,
+            ).save()
+            groups.models.OfficeHolder(
+                person=form.cleaned_data['treasurer'],
+                role=groups.models.OfficerRole.objects.get(slug='treasurer'),
+                group=group,
+            ).save()
+            officer_emails = [
+                '%s@mit.edu' % (form.cleaned_data['president'], ),
+                '%s@mit.edu' % (form.cleaned_data['treasurer'], ),
+            ]
+
+            # Sending mail
+            mail_context = Context({
+                'group': group,
+                'formdata': form.cleaned_data,
+            })
+
+            # Welcome mail
+            email_from_template(
+                tmpl='groups/diffs/new-group-announce.txt',
+                context=mail_context,
+                subject='ASA Group Recognition: %s' % (group.name, ),
+                to=officer_emails,
+                cc=['asa-new-group-announce@mit.edu'],
+                from_email='asa-exec@mit.edu',
+            ).send()
+            if len(form.cleaned_data['create_which']) > 0:
+                email_from_template(
+                    tmpl='groups/diffs/new-group-accounts.txt',
+                    context=mail_context,
+                    subject='New Student Activity: %s' % (group.name, ),
+                    to=['accounts@mit.edu'],
+                    cc=officer_emails+['asa-admin@mit.edu'],
+                    from_email='asa-admin@mit.edu',
+                ).send()
+
+
+            return redirect(reverse('groups:group-detail', args=[group.pk]))
+        else:
+            msg = "Validation failed. See below for details."
+
+    else:
+        form = GroupCreateForm(initial=initial, instance=group, ) # An unbound form
+
+    context = {
+        'form':  form,
+        'msg':   msg,
+        'pagename':   'groups',
+    }
+    return render_to_response('groups/group_create.html', context, context_instance=RequestContext(request), )
+
+##################
+# Multiple group #
+##################
 
 class GroupFilter(django_filters.FilterSet):
@@ -208 +368 @@
         context['pagename'] = 'groups'
         context['filter'] = self.filterset
-        return context
-
-
-class GroupDetailView(DetailView):
-    context_object_name = "group"
-    model = groups.models.Group
-    def get_context_data(self, **kwargs):
-        # Call the base implementation first to get a context
-        context = super(GroupDetailView, self).get_context_data(**kwargs)
-        group = context['group']
-
-        # Indicate whether this person should be able to see "private" info
-        context['viewpriv'] = self.request.user.has_perm('groups.view_group_private_info', group)
-        context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
-        context['notes'] = group.viewable_notes(self.request.user)
-
-        # People involved in the group
-        just_roles = groups.models.OfficerRole.objects.all()
-        if context['viewpriv'] or self.request.user.has_perm('groups.view_signatories'):
-            # Can see the non-public stuff
-            pass
-        else:
-            just_roles = just_roles.filter(publicly_visible=True)
-        roles = []
-        for role in just_roles:
-            roles.append((role.display_name, role, group.officers(role=role), ))
-        context['roles'] = roles
-
-        return context
-
-
-class GroupHistoryView(ListView):
-    context_object_name = "version_list"
-    template_name = "groups/group_version.html"
-
-    def get_queryset(self):
-        history_entries = None
-        if 'pk' in self.kwargs:
-            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
-            history_entries = reversion.models.Version.objects.get_for_object(group)
-        else:
-            history_entries = reversion.models.Version.objects.all()
-            group_content_type = ContentType.objects.get_for_model(groups.models.Group)
-            history_entries = history_entries.filter(content_type=group_content_type)
-        length = len(history_entries)
-        if length > 150:
-            history_entries = history_entries[length-100:]
-        return history_entries
-
-    def get_context_data(self, **kwargs):
-        context = super(GroupHistoryView, self).get_context_data(**kwargs)
-        if 'pk' in self.kwargs:
-            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
-            context['title'] = "History for %s" % (group.name, )
-        else:
-            context['title'] = "Recent Changes"
         return context
 
@@ -439 +543 @@
         }
         return render_to_response('groups/group_search.html', context, context_instance=RequestContext(request), )
+
+
+class GroupHistoryView(ListView):
+    context_object_name = "version_list"
+    template_name = "groups/group_version.html"
+
+    def get_queryset(self):
+        history_entries = None
+        if 'pk' in self.kwargs:
+            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
+            history_entries = reversion.models.Version.objects.get_for_object(group)
+        else:
+            history_entries = reversion.models.Version.objects.all()
+            group_content_type = ContentType.objects.get_for_model(groups.models.Group)
+            history_entries = history_entries.filter(content_type=group_content_type)
+        length = len(history_entries)
+        if length > 150:
+            history_entries = history_entries[length-100:]
+        return history_entries
+
+    def get_context_data(self, **kwargs):
+        context = super(GroupHistoryView, self).get_context_data(**kwargs)
+        if 'pk' in self.kwargs:
+            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
+            context['title'] = "History for %s" % (group.name, )
+        else:
+            context['title'] = "Recent Changes"
+        return context

asadb/media/style/style.css

@@ -236 +236 @@
     text-align: center;
 }
+
+/*********
+ * FORMS *
+ *********/
+
+form table tr.optional th
+{
+    font-weight: normal;
+    font-style: italic;
+}