Changeset 2919697

Timestamp:

Oct 23, 2011, 3:36:38 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

86d9174

Parents:

96c5790

git-author:

Alex Dehnert <adehnert@…> (10/23/11 05:59:20)

git-committer:

Alex Dehnert <adehnert@…> (10/23/11 15:36:38)

Message:

More work on group recognition forms

Location:

asadb

Files:

• groups/admin.py (modified) (1 diff)
• groups/migrations/0012_group_startup.py (added)
• groups/models.py (modified) (1 diff)
• groups/urls.py (modified) (1 diff)
• groups/views.py (modified) (8 diffs)
• template/groups/create/err.not-applying.html (added)
• template/groups/create/nge.html (added)
• template/groups/create/startup.html (added)
• template/groups/create/startup_review.html (added)
• template/groups/create/startup_thanks.html (added)
• template/groups/diffs/new-group-accounts.txt (modified) (1 diff)
• template/groups/group_create.html (deleted)
• template/groups/groupstartup_list.html (added)

asadb/groups/admin.py

@@ -27 +27 @@
 admin.site.register(groups.models.Group, GroupAdmin)
 
+
+class Admin_GroupStartup(VersionAdmin):
+    list_display = (
+        'id',
+        'group',
+        'stage',
+        'president_kerberos',
+        'create_officer_list',
+        'create_group_list',
+        'create_athena_locker',
+    )
+    list_display_links = ('id', 'group', )
+    search_fields = [ 'group__name', 'group__abbreviation', 'president_kerberos', ]
+admin.site.register(groups.models.GroupStartup, Admin_GroupStartup)
 
 class Admin_GroupNote(VersionAdmin):

asadb/groups/models.py

@@ -99 +99 @@
 
 
+GROUP_STARTUP_STAGE_SUBMITTED = 10
+GROUP_STARTUP_STAGE_APPROVED = 20
+GROUP_STARTUP_STAGE_REJECTED = -10
+GROUP_STARTUP_STAGE = (
+    (GROUP_STARTUP_STAGE_SUBMITTED,     'submitted'),
+    (GROUP_STARTUP_STAGE_APPROVED,      'approved'),
+    (GROUP_STARTUP_STAGE_REJECTED,      'rejected'),
+)
+
+class GroupStartup(models.Model):
+    group = models.ForeignKey(Group)
+    stage = models.IntegerField(choices=GROUP_STARTUP_STAGE)
+    create_officer_list = models.BooleanField()
+    create_group_list = models.BooleanField()
+    create_athena_locker = models.BooleanField()
+    president_name = models.CharField(max_length=50)
+    president_kerberos = models.CharField(max_length=8)
+    treasurer_name = models.CharField(max_length=50)
+    treasurer_kerberos = models.CharField(max_length=8)
+
+
 class GroupNote(models.Model):
     author = models.CharField(max_length=30, ) # match Django username field

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'^startup/$', groups.views.startup_form, name='startup', ),
+    url(r'^startup/review/$', groups.views.GroupStartupListView.as_view(), name='startup-list', ),
+    url(r'^startup/review/(?P<pk>\d+)$', groups.views.recognize_normal_group, name='startup-recognize', ),
+    url(r'^recognize/nge/$', groups.views.recognize_nge, name='recognize-nge', ),
     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 CharField, ModelChoiceField, MultipleChoiceField
-from django.forms import Form, ModelForm
+from django import forms
 from django.forms import ValidationError
 from django.db import connection
@@ -189 +188 @@
     return render_to_response('groups/group_change_main.html', context, context_instance=RequestContext(request), )
 
+
+##################
+# GROUP CREATION #
+##################
+
 def validate_athena(username, student=False, ):
     try:
@@ -197 +201 @@
         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, )
+    create_officer_list = forms.BooleanField(required=False)
+    create_group_list = forms.BooleanField(required=False)
+    create_athena_locker = forms.BooleanField(required=False)
+
+    president_name = forms.CharField(max_length=50, )
+    president_kerberos = forms.CharField(min_length=3, max_length=8, )
+    treasurer_name = forms.CharField(max_length=50)
+    treasurer_kerberos = forms.CharField(min_length=3, max_length=8, )
     def clean_president(self, ):
-        username = self.cleaned_data['president']
+        username = self.cleaned_data['president_kerberos']
         validate_athena(username, True, )
         return username
 
     def clean_treasurer(self, ):
-        username = self.cleaned_data['treasurer']
+        username = self.cleaned_data['treasurer_kerberos']
         validate_athena(username, True, )
         return username
@@ -222 +225 @@
             ('basic', {
                 'legend': 'Basic Information',
-                'fields': ['name', 'abbreviation', 'activity_category', 'description', ],
+                'fields': ['name', 'abbreviation', 'description', ],
             }),
             ('officers', {
                 'legend': 'Officers',
-                'fields': ['president', 'treasurer', ],
+                'fields': ['president_name', 'president_kerberos', 'treasurer_name', 'treasurer_kerberos', ],
+            }),
+            ('type', {
+                'legend': 'Type',
+                'fields': ['activity_category', 'group_class', 'group_funding', ],
             }),
             ('technical', {
                 'legend': 'Technical Information',
-                'fields': ['officer_email', 'group_email', 'athena_locker', 'create_which', ],
-            }),
-            ('Category', {
-                'legend': 'Category',
-                'fields': ['group_status', 'group_class', ],
+                'fields': [
+                    'officer_email', 'create_officer_list',
+                    'group_email', 'create_group_list',
+                    'athena_locker', 'create_athena_locker',
+                ],
             }),
             ('financial', {
                 'legend': 'Financial Information',
-                'fields': ['group_funding', 'main_account_id', 'funding_account_id', ],
-            }),
-            ('more-info', {
-                'legend': 'Additional Information',
+                'fields': ['main_account_id', 'funding_account_id', ],
+            }),
+            ('constitution', {
+                'legend': 'Constitution',
                 'fields': ['constitution_url', ],
             }),
@@ -248 +255 @@
 
 
+class GroupCreateNgeForm(GroupCreateForm):
+    def __init__(self, *args, **kwargs):
+        super(GroupCreateNgeForm, self).__init__(*args, **kwargs)
+        self.fields['treasurer_name'].required = False
+        self.fields['treasurer_kerberos'].required = False
+
+    class Meta(GroupCreateForm.Meta):
+        fieldsets = filter(
+            lambda fieldset: fieldset[0] not in ['financial', ],
+            GroupCreateForm.Meta.fieldsets
+        )
+
+
+class GroupCreateStartupForm(GroupCreateForm):
+    def __init__(self, *args, **kwargs):
+        super(GroupCreateStartupForm, self).__init__(*args, **kwargs)
+        self.fields['activity_category'].required = True
+        self.fields['constitution_url'].required = True
+        self.fields['constitution_url'].help_text = "Please put a copy of your finalized constitution on a publicly-accessible website (e.g. your group's, or your own, Public folder), and link to it in the box above."
+
+    class Meta(GroupCreateForm.Meta):
+        fieldsets = filter(
+            lambda fieldset: fieldset[0] not in ['financial', ],
+            GroupCreateForm.Meta.fieldsets
+        )
+
+def create_group_get_emails(group, group_startup, officer_emails, ):
+    # Figure out all the accounts mail parameters
+    accounts_count = 0
+    create_officer_list = False
+    if group_startup.create_officer_list and group.officer_email:
+        create_officer_list = True
+        accounts_count += 1
+    create_group_list = False
+    if group_startup.create_group_list and group.group_email:
+        create_group_list = True
+        accounts_count += 1
+    create_athena_locker = False
+    if group_startup.create_athena_locker and group.athena_locker:
+        create_athena_locker = True
+        accounts_count += 1
+    officer_list, _, officer_domain = group.officer_email.partition('@')
+    group_list, _, group_domain = group.group_email.partition('@')
+
+    # Fill out the Context
+    mail_context = Context({
+        'group': group,
+        'group_startup': group_startup,
+        'create_officer_list': create_officer_list,
+        'create_group_list': create_group_list,
+        'create_athena_locker': create_athena_locker,
+        'officer_list': officer_list,
+        'group_list': group_list,
+        'officer_emails': officer_emails,
+    })
+
+    # Welcome mail
+    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',
+    )
+
+    # Accounts mail
+    if accounts_count > 0:
+        accounts_mail = 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',
+        )
+        # XXX: Handle this better
+        if officer_domain != 'mit.edu' or (create_group_list and group_domain != 'mit.edu'):
+            accounts_mail.to = ['asa-groups@mit.edu']
+            accounts_mail.cc = ['asa-db@mit.edu']
+            accounts_mail.subject = "ERROR: " + accounts_mail.subject
+            accounts_mail.body = "Bad domain on officer or group list\n\n" + accounts_mail.body
+
+    else:
+        accounts_mail = None
+    return welcome_mail, accounts_mail
+
+def create_group_officers(group, formdata, ):
+    officer_emails = [ ]
+    for officer in ('president', 'treasurer', ):
+        username = formdata[officer+'_kerberos']
+        if username:
+            groups.models.OfficeHolder(
+                person=username,
+                role=groups.models.OfficerRole.objects.get(slug=officer),
+                group=group,
+            ).save()
+            officer_emails.append('%s@mit.edu' % (formdata[officer+'_kerberos'], ))
+    return officer_emails
+
 @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)
-    
+def recognize_nge(request, ):
     msg = None
 
     initial = {
-        'create_which': ['officer_email', 'group_email', 'athena_locker', ],
+        'create_officer_list': False,
+        'create_group_list': False,
+        'create_athena_locker': True,
     }
     group = groups.models.Group()
-    group.group_status = groupstatus
+    group.group_status = groups.models.GroupStatus.objects.get(slug='nge', )
     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(
+        form = GroupCreateNgeForm(
             request.POST, request.FILES,
             initial=initial,
@@ -270 +376 @@
 
         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()
-
+            officer_emails = create_group_officers(group, form.cleaned_data, )
 
             return redirect(reverse('groups:group-detail', args=[group.pk]))
@@ -321 +385 @@
 
     else:
-        form = GroupCreateForm(initial=initial, instance=group, ) # An unbound form
+        form = GroupCreateNgeForm(initial=initial, instance=group, ) # An unbound form
 
     context = {
@@ -328 +392 @@
         'pagename':   'groups',
     }
-    return render_to_response('groups/group_create.html', context, context_instance=RequestContext(request), )
+    return render_to_response('groups/create/nge.html', context, context_instance=RequestContext(request), )
+
+def startup_form(request, ):
+    msg = None
+
+    initial = {
+        'create_officer_list': True,
+        'create_group_list': True,
+        'create_athena_locker': True,
+    }
+    group = groups.models.Group()
+    group.group_status = groups.models.GroupStatus.objects.get(slug='applying', )
+    group.recognition_date  = datetime.datetime.now()
+    if request.method == 'POST': # If the form has been submitted...
+        # A form bound to the POST data
+        form = GroupCreateStartupForm(
+            request.POST, request.FILES,
+            initial=initial,
+            instance=group,
+        )
+
+        if form.is_valid(): # All validation rules pass
+            group.set_updater(request.user)
+            form.save()
+
+            group_startup = groups.models.GroupStartup()
+            group_startup.group = group
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_SUBMITTED
+
+            group_startup.create_officer_list = form.cleaned_data['create_officer_list']
+            group_startup.create_group_list = form.cleaned_data['create_group_list']
+            group_startup.create_athena_locker = form.cleaned_data['create_athena_locker']
+
+            group_startup.president_name = form.cleaned_data['president_name']
+            group_startup.president_kerberos = form.cleaned_data['president_kerberos']
+            group_startup.treasurer_name = form.cleaned_data['treasurer_name']
+            group_startup.treasurer_kerberos = form.cleaned_data['treasurer_kerberos']
+
+            group_startup.save()
+
+            context = {
+                'group':  group,
+                'pagename':   'groups',
+            }
+            return render_to_response('groups/create/startup_thanks.html', context, context_instance=RequestContext(request), )
+        else:
+            msg = "Validation failed. See below for details."
+
+    else:
+        form = GroupCreateStartupForm(initial=initial, instance=group, ) # An unbound form
+
+    context = {
+        'form':  form,
+        'msg':   msg,
+        'pagename':   'groups',
+    }
+    return render_to_response('groups/create/startup.html', context, context_instance=RequestContext(request), )
+
+class GroupRecognitionForm(forms.Form):
+    test = forms.BooleanField()
+
+@permission_required('groups.add_group')
+def recognize_normal_group(request, pk, ):
+    group_startup = get_object_or_404(groups.models.GroupStartup, pk=pk, )
+    group = group_startup.group
+
+    context = {
+        'startup': group_startup,
+        'group': group,
+        'pagename' : 'groups',
+    }
+
+    if group.group_status.slug != 'applying':
+        return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+    if group_startup.stage != groups.models.GROUP_STARTUP_STAGE_SUBMITTED:
+        return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+
+    context['msg'] = ""
+    if request.method == 'POST':
+        if 'approve' in request.POST:
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_APPROVED
+            group_startup.save()
+
+            group.group_status = groups.models.GroupStatus.objects.get(slug='active')
+            group.constitution_url = ""
+            group.recognition_date = datetime.date.today()
+            group.set_updater(request.user)
+
+            group.save()
+            officer_emails = create_group_officers(group, group_startup.__dict__, )
+            welcome_mail, accounts_mail = create_group_get_emails(group, group_startup, officer_emails, )
+            welcome_mail.send()
+            if accounts_mail:
+                accounts_mail.send()
+            context['msg'] = 'Group approved.'
+            context['msg_type'] = 'info'
+        elif 'reject' in request.POST:
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_REJECTED
+            group_startup.save()
+            group.group_status = groups.models.GroupStatus.objects.get(slug='derecognized')
+            group.save()
+            note = groups.models.GroupNote(
+                author=request.user.username,
+                body="Group rejected during recognition process.",
+                acl_read_group=True,
+                acl_read_offices=True,
+                group=group,
+            ).save()
+            context['msg'] = 'Group rejected.'
+            context['msg_type'] = 'info'
+        else:
+            context['disp_form'] = True
+    else:
+        context['disp_form'] = True
+
+    return render_to_response('groups/create/startup_review.html', context, context_instance=RequestContext(request), )
+
+class GroupStartupListView(ListView):
+    model = groups.models.GroupStartup
+    template_object_name = 'startup'
+
+    def get_queryset(self, ):
+        qs = super(GroupStartupListView, self).get_queryset()
+        qs = qs.filter(stage=groups.models.GROUP_STARTUP_STAGE_SUBMITTED)
+        qs = qs.select_related('group')
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super(GroupStartupListView, self).get_context_data(**kwargs)
+        context['pagename'] = 'groups'
+        return context
+
 
 ##################

asadb/template/groups/diffs/new-group-accounts.txt

@@ -8 +8 @@
 Please create the following resources:
 
-{% if "athena_locker" in formdata.create_which and group.athena_locker %}
+{% if create_athena_locker %}
   Activity Locker under /afs/athena/activity/: {{group.athena_locker}}
-      User owner  : {{formdata.president}}
-      Group owner : {{group.officer_email}}
+      User owner  : {{group_startup.president_kerberos}}
+      Group owner : {{officer_list}}
 
-{% endif %}{% if "officer_email" in formdata.create_which %}
-  List : {{group.officer_email}}
+{% endif %}{% if create_officer_list %}
+  List : {{officer_list}}
       Group         : Yes
       Mailing List  : Yes
       Administrator : self
-      Members       : {{formdata.president}}
+      Members       : {{group_startup.president_kerberos}}
 
-{% endif %}{% if "group_email" in formdata.create_which and group.group_email %}
-  List : {{group.group_email}}
+{% endif %}{% if create_group_list %}
+  List : {{group_list}}
       Group         : Yes
       Mailing List  : Yes
-      Administrator : {{group.officer_email}}
-      Members       : {{formdata.president}}
+      Administrator : {{officer_list}}
+      Members       : {{group_startup.president_kerberos}}
 {% endif %}
 
 Please send confirmation of the completion to
-   {{formdata.president}}
+   {{officer_emails|join:", "}}
 and
    asa-admin@mit.edu