Changeset ef118cf

.gitignore

r7ef7143	r7d7801f
7	7	asadb/media/fysm/slides/
8	8	asadb/media/page-previews/fysm/
	9	asadb/media/midway/maps/
9	10	asadb/util/saved-data/
10	11	asadb/util/static-data/

asadb/forms/admin.py

-                      rbda4d86
+                      r26826c9
+from django.contrib import admin
 import forms.models
-from django.contrib import admin
 class FYSMAdmin(admin.ModelAdmin):
 …
     search_fields = ('username', 'groups__officer_email', 'groups__name', 'groups__abbreviation', )
 admin.site.register(forms.models.PersonMembershipUpdate, Admin_PersonMembershipUpdate)
+class Admin_Midway(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'name',
+        'slug',
+        'date',
+    )
+    list_display_links = list_display
+    search_fields = ('name', )
+    prepopulated_fields = {"slug": ("name",)}
+admin.site.register(forms.models.Midway, Admin_Midway)
+class Admin_MidwayAssignment(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'midway',
+        'location',
+        'group',
+    )
+    list_display_links = list_display
+    list_filter = ('midway', )
+    search_fields = ('location', 'group__name', )
+admin.site.register(forms.models.MidwayAssignment, Admin_MidwayAssignment)

asadb/forms/models.py

-                      rafc5348
+                      r86986f5
+import datetime
+import errno
+import json
+import os
+import re
+import ldap
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.db import models
-import datetime
-import os, errno
 import groups.models
 …
     description = models.TextField(help_text="Explain, in no more than 400 characters (including spaces), what your group does and why incoming students should get involved.")
     logo = models.ImageField(upload_to='fysm/logos', blank=True, help_text="Upload a logo (JPG, GIF, or PNG) to display on the main FYSM page as well as the group detail page. This will be scaled to be 100px wide.")
     slide = models.ImageField(upload_to='fysm/slides', default="", help_text="Upload a slide (JPG, GIF, or PNG) to display on the group detail page. This will be scaled to be at most 600x600 pixels. We recommend making it exactly that size.")
+    slide = models.ImageField(upload_to='fysm/slides', blank=True, default="", help_text="Upload a slide (JPG, GIF, or PNG) to display on the group detail page. This will be scaled to be at most 600x600 pixels. We recommend making it exactly that size.")
     tags = models.CharField(max_length=100, blank=True, help_text="Specify some free-form, comma-delimited tags for your group", )
     categories = models.ManyToManyField('FYSMCategory', blank=True, help_text="Put your group into whichever of our categories seem applicable.", )
 …
     num_other = models.IntegerField(verbose_name="Num non-MIT")
     membership_list = models.TextField(help_text="Member emails on separate lines (Athena usernames where applicable)")
+    membership_list = models.TextField(blank=True, 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.)"
+    hazing_statement = "By checking this, I hereby affirm that I have read and understand <a href='http://web.mit.edu/asa/rules/ma-hazing-law.html'>Chapter 269: Sections 17, 18, and 19 of Massachusetts Law</a>. 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."
+    discrimination_statement = "By checking this, I hereby affirm that I have read and understand the <a href='http://web.mit.edu/referencepubs/nondiscrimination/'>MIT Non-Discrimination Policy</a>.  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 "PersonMembershipUpdate for %s" % (self.username, )
+class PeopleStatusLookup(models.Model):
+    people = models.TextField(help_text="Enter some usernames or email addresses, separated by newlines, to look up here.")
+    requestor = models.ForeignKey(User, null=True, blank=True, )
+    referer = models.URLField(blank=True)
+    time = models.DateTimeField(default=datetime.datetime.now)
+    classified_people_json = models.TextField()
+    _classified_people = None
+    def ldap_classify(self, usernames, ):
+        con = ldap.open('ldap-too.mit.edu')
+        con.simple_bind_s("", "")
+        dn = "ou=users,ou=moira,dc=mit,dc=edu"
+        fields = ['uid', 'eduPersonAffiliation', 'mitDirStudentYear']
+        chunk_size = 100
+        username_chunks = []
+        ends = range(chunk_size, len(usernames), chunk_size)
+        start = 0
+        end = 0
+        for end in ends:
+            username_chunks.append(usernames[start:end])
+            start = end
+        extra = usernames[end:]
+        if extra:
+            username_chunks.append(extra)
+        results = []
+        for chunk in username_chunks:
+            filters = [ldap.filter.filter_format('(uid=%s)', [u]) for u in chunk]
+            userfilter = "(|%s)" % (''.join(filters), )
+            batch_results = con.search_s(dn, ldap.SCOPE_SUBTREE, userfilter, fields)
+            results.extend(batch_results)
+        left = set([u.lower() for u in usernames])
+        undergrads = []
+        grads = []
+        staff = []
+        secret = []
+        other = []
+        info = {
+            'undergrads': undergrads,
+            'grads': grads,
+            'staff': staff,
+            'secret': secret,
+            'affiliate': other,
+        }
+        for result in results:
+            username = result[1]['uid'][0]
+            left.remove(username.lower())
+            affiliation = result[1].get('eduPersonAffiliation', ['secret'])[0]
+            if affiliation == 'student':
+                year = result[1].get('mitDirStudentYear', [None])[0]
+                if year == 'G':
+                    grads.append((username, None))
+                elif year.isdigit():
+                    undergrads.append((username, year))
+                else:
+                    other.append((username, year))
+            else:
+                info[affiliation].append((username, None, ))
+        info['unknown'] = [(u, None) for u in left]
+        return info
+    def classify_people(self, people):
+        mit_usernames = []
+        alum_addresses = []
+        other_mit_addresses = []
+        nonmit_addresses = []
+        for name in people:
+            local, at, domain = name.partition('@')
+            if domain.lower() == 'mit.edu' or domain == '':
+                mit_usernames.append(local)
+            elif domain.lower() == 'alum.mit.edu':
+                alum_addresses.append((name, None))
+            elif domain.endswith('.mit.edu'):
+                other_mit_addresses.append((name, None))
+            else:
+                nonmit_addresses.append((name, None))
+        results = self.ldap_classify(mit_usernames)
+        results['alum'] = alum_addresses
+        results['other-mit'] = other_mit_addresses
+        results['non-mit'] = nonmit_addresses
+        return results
+    def split_people(self):
+        splitted = re.split(r'[\n,]+', self.people)
+        people = []
+        for name in splitted:
+            name = name.strip()
+            if len(name) > 2 and (name[0] == '(') and (name[-1] == ')'):
+                name = name[1:-1]
+            name = name.replace(' at ', '@')
+            if name:
+                people.append(name)
+        return people
+    def update_classified_people(self):
+        people = self.split_people()
+        self._classified_people = self.classify_people(people)
+        self.classified_people_json = json.dumps(self._classified_people)
+        return self._classified_people
+    @property
+    def classified_people(self):
+        if self._classified_people is None:
+            self._classified_people = json.loads(self.classified_people_json)
+        return self._classified_people
+    def classifications_with_descriptions(self):
+        descriptions = {
+            'undergrads':   'Undergraduate students (class year in parentheses)',
+            'grads':        'Graduate students',
+            'alum':         "Alumni Association addresses",
+            'staff':        'MIT Staff (including faculty)',
+            'affiliate':    'This includes some alumni, group members with Athena accounts sponsored through SAO, and many others.',
+            'secret':       'People with directory information suppressed. These people have Athena accounts, but they could have any MIT affiliation, including just being a student group member.',
+            'unknown':      "While this looks like an Athena account, we couldn't find it. This could be a deactivated account, or it might never have existed.",
+            'other-mit':    ".mit.edu addresses that aren't @mit.edu or @alum.mit.edu.",
+            'non-mit':      "Non-MIT addresses, including outside addresses of MIT students.",
+        }
+        names = (
+            ('undergrads', 'Undergrads', ),
+            ('grads', 'Grad students', ),
+            ('alum', 'Alumni', ),
+            ('staff', 'Staff', ),
+            ('affiliate', 'Affiliates', ),
+            ('secret', 'Secret', ),
+            ('unknown', 'Unknown', ),
+            ('other-mit', 'Other MIT addresses', ),
+            ('non-mit', 'Non-MIT addresses', ),
+        )
+        classifications = self.classified_people
+        sorted_results = []
+        for k, label in names:
+            sorted_results.append({
+                'label': label,
+                'description': descriptions[k],
+                'people': sorted(classifications[k]),
+            })
+        return sorted_results
+##########
+# MIDWAY #
+##########
+class Midway(models.Model):
+    name = models.CharField(max_length=50)
+    slug = models.SlugField()
+    date = models.DateTimeField()
+    table_map = models.ImageField(upload_to='midway/maps')
+    def __str__(self, ):
+        return "%s" % (self.name, )
+class MidwayAssignment(models.Model):
+    midway = models.ForeignKey(Midway)
+    location = models.CharField(max_length=20)
+    group = models.ForeignKey(groups.models.Group)
+    def __str__(self, ):
+        return "<MidwayAssignment: %s at %s at %s>" % (self.group, self.location, self.midway, )

asadb/forms/views.py

-                      rafc5348
+                      r9605a6a
 import forms.models
 import groups.models
 import groups.views
 import util.emails
+import collections
+import csv
+import datetime
+import StringIO
 from django.conf import settings
 …
 from django.core.urlresolvers import reverse
 from django.core.mail import EmailMessage, mail_admins
+from django.forms import FileField
 from django.forms import Form
 from django.forms import ModelForm
 …
 from django.db.models import Q, Count
+import csv
+import datetime
+import StringIO
+import django_filters
+import forms.models
+import groups.models
+import groups.views
+import util.emails
 #################
 …
             'description',
             'logo',
-            'slide',
             'tags',
             'categories',
 …
     cycle = forms.models.GroupConfirmationCycle.latest()
     users_groups = groups.models.Group.involved_groups(request.user.username)
+    users_groups = groups.models.Group.admin_groups(request.user.username)
     qs = membership_update_qs.filter(pk__in=users_groups)
 …
         queryset=qs,
         title="Submit membership update for...",
-        msg="The list below contains only groups that list you as being involved. You must be an administrator of a group to submit an update.",
+    )
 …
         super(Form_GroupMembershipUpdate, self).__init__(*args, **kwargs)
         self.fields['no_hazing'].required = True
+        help_text = "If you have a membership list, you can get help turning it into membership breakdown using our <a href='%s'>people lookup</a> tool. You'll need to copy the numbers back over, though." % (reverse('membership-people-lookup'), )
+        self.fields['num_undergrads'].help_text = help_text
     class Meta:
 …
             'num_other_affiliate',
             'num_other',
             'membership_list',
+            #'membership_list',
+        ]
 …
             role_groups[office_holder.group.pk] = (office_holder.group, set())
         role_groups[office_holder.group.pk][1].add(office_holder.role.display_name)
-    # Find groups the user searched for
-    filterset = groups.views.GroupFilter(request.GET, membership_update_qs)
-    filtered_groups = filterset.qs.all()
-    show_filtered_groups = ('search' in request.GET)
     message = ""
 …
         'role_groups':role_groups,
         'form':form,
-        'filter':filterset,
-        'show_filtered_groups':show_filtered_groups,
-        'filtered_groups':filtered_groups,
         'member_groups':selected_groups,
         'message': message,
 …
+class View_GroupConfirmationCyclesList(ListView):
+    context_object_name = "cycle_list"
+    template_name = "membership/admin.html"
+    model = forms.models.GroupConfirmationCycle
+    def get_context_data(self, **kwargs):
+        context = super(View_GroupConfirmationCyclesList, self).get_context_data(**kwargs)
+        context['pagename'] = 'groups'
+        return context
 @permission_required('groups.view_group_private_info')
 def group_confirmation_issues(request, ):
+def group_confirmation_issues(request, slug, ):
     account_numbers = ("accounts" in request.GET) and request.GET['accounts'] == "1"
+    active_groups = groups.models.Group.active_groups
+    group_updates = forms.models.GroupMembershipUpdate.objects.all()
+    check_groups = groups.models.Group.objects.filter(group_status__slug__in=('active', 'suspended', ))
+    check_groups = check_groups.select_related('group_status')
+    group_updates = forms.models.GroupMembershipUpdate.objects.filter(cycle__slug=slug, )
+    group_updates = group_updates.select_related('group', 'group__group_status')
     people_confirmations = forms.models.PersonMembershipUpdate.objects.filter(
         deleted__isnull=True,
         valid__gt=0,
+        cycle__slug=slug,
+    )
     buf = StringIO.StringIO()
     output = csv.writer(buf)
     fields = ['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ]
+    fields = ['group_id', 'group_name', 'group_status', 'recognition_date', 'issue', 'num_confirm', 'officer_email', ]
     if account_numbers: fields.append("main_account")
     output.writerow(fields)
+    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))
+    def output_issue(group, issue, num_confirms):
         fields = [
             group.id,
             group.name,
+            'unsubmitted',
+            group.group_status.slug,
+            group.recognition_date,
+            issue,
             num_confirms,
             group.officer_email,
 …
         output.writerow(fields)
+    q_present = Q(id__in=group_updates.values('group'))
+    missing_groups = check_groups.filter(~q_present)
+    #print len(list(group_updates))
+    for group in missing_groups:
+        #num_confirms = len(people_confirmations.filter(groups=group))
+        output_issue(group, 'unsubmitted', '')
     for group_update in group_updates:
         group = group_update.group
         num_confirms = len(people_confirmations.filter(groups=group))
+        num_confirms = people_confirmations.filter(groups=group).count()
         problems = []
 …
         for problem in problems:
+            fields = [
+                group.id,
+                group.name,
+                problem,
+                num_confirms,
+                group.officer_email,
+            ]
+            if account_numbers: fields.append(group.main_account_id)
+            output.writerow(fields)
+            output_issue(group, problem, num_confirms)
     return HttpResponse(buf.getvalue(), mimetype='text/csv', )
+class PeopleStatusLookupForm(ModelForm):
+    class Meta:
+        model = forms.models.PeopleStatusLookup
+        fields = ('people', )
+def people_status_lookup(request, pk=None, ):
+    if pk is None:
+        if request.method == 'POST':
+            form = PeopleStatusLookupForm(request.POST, request.FILES, )
+            if form.is_valid(): # All validation rules pass
+                lookup = form.save(commit=False)
+                lookup.requestor = request.user
+                lookup.referer = request.META['HTTP_REFERER']
+                lookup.update_classified_people()
+                results = lookup.classifications_with_descriptions()
+                lookup.save()
+        else:
+            form = PeopleStatusLookupForm()
+            results = None
+    else:
+        if request.user.has_perm('forms.view_peoplestatusupdate'):
+            lookup = get_object_or_404(forms.models.PeopleStatusLookup, pk=int(pk))
+            results = lookup.classifications_with_descriptions()
+            form = None
+        else:
+            raise PermissionDenied("You don't have permission to view old lookup requests.")
+    context = {
+        'form': form,
+        'results': results,
+    }
+    return render_to_response('membership/people-lookup.html', context, context_instance=RequestContext(request), )
+##########
+# Midway #
+##########
+class View_Midways(ListView):
+    context_object_name = "midway_list"
+    template_name = "midway/midway_list.html"
+    def get_queryset(self):
+        midways = forms.models.Midway.objects.order_by('date')
+        return midways
+    def get_context_data(self, **kwargs):
+        context = super(View_Midways, self).get_context_data(**kwargs)
+        context['pagename'] = 'midway'
+        return context
+def midway_map_latest(request, ):
+    midways = forms.models.Midway.objects.order_by('-date')[:1]
+    if len(midways) == 0:
+        raise Http404("No midways found.")
+    else:
+        url = reverse('midway-map', args=(midways[0].slug, ))
+        return HttpResponseRedirect(url)
+class MidwayAssignmentFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(name='group__name', lookup_type='icontains', label="Name contains")
+    abbreviation = django_filters.CharFilter(name='group__abbreviation', lookup_type='iexact', label="Abbreviation is")
+    activity_category = django_filters.ModelChoiceFilter(
+        label='Activity category',
+        name='group__activity_category',
+        queryset=groups.models.ActivityCategory.objects,
+    )
+    class Meta:
+        model = forms.models.MidwayAssignment
+        fields = [
+            'name',
+            'abbreviation',
+            'activity_category',
+        ]
+        order_by = (
+            ('group__name', 'Name', ),
+            ('group__abbreviation', 'Abbreviation', ),
+            ('group__activity_category__name', 'Activity category', ),
+            ('location', 'Location', ),
+        )
+class MidwayMapView(DetailView):
+    context_object_name = "midway"
+    model = forms.models.Midway
+    template_name = 'midway/map.html'
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super(MidwayMapView, self).get_context_data(**kwargs)
+        filterset = MidwayAssignmentFilter(self.request.GET)
+        context['assignments'] = filterset.qs
+        context['filter'] = filterset
+        context['pagename'] = 'midway'
+        return context
+class MidwayAssignmentsUploadForm(Form):
+    def validate_csv_fields(upload_file):
+        reader = csv.reader(upload_file)
+        row = reader.next()
+        for col in ('Group', 'officers', 'Table', ):
+            if col not in row:
+                raise ValidationError('Please upload a CSV file with (at least) columns "Group", "officers", and "Table". (Missing at least "%s".)' % (col, ))
+    assignments = FileField(validators=[validate_csv_fields])
+@permission_required('forms.add_midwayassignment')
+def midway_assignment_upload(request, slug, ):
+    midway = get_object_or_404(forms.models.Midway, slug=slug, )
+    uploaded = False
+    found = []
+    issues = collections.defaultdict(list)
+    if request.method == 'POST': # If the form has been submitted...
+        form = MidwayAssignmentsUploadForm(request.POST, request.FILES, ) # A form bound to the POST data
+        if form.is_valid(): # All validation rules pass
+            uploaded = True
+            reader = csv.DictReader(request.FILES['assignments'])
+            for row in reader:
+                group_name = row['Group']
+                group_officers = row['officers']
+                table = row['Table']
+                issue = False
+                try:
+                    group = groups.models.Group.objects.get(name=group_name)
+                    assignment = forms.models.MidwayAssignment(
+                        midway=midway,
+                        location=table,
+                        group=group,
+                    )
+                    assignment.save()
+                    found.append(assignment)
+                    status = group.group_status.slug
+                    if status != 'active':
+                        issue = 'status=%s (added anyway)' % (status, )
+                except groups.models.Group.DoesNotExist:
+                    issue = 'unknown group (ignored)'
+                except groups.models.Group.MultipleObjectsReturned:
+                    issue = 'multiple groups found (ignored)'
+                if issue:
+                    issues[issue].append((group_name, group_officers, table))
+            for issue in issues:
+                issues[issue] = sorted(issues[issue], key=lambda x: x[0])
+    else:
+        form = MidwayAssignmentsUploadForm() # An unbound form
+    context = {
+        'midway':midway,
+        'form':form,
+        'uploaded': uploaded,
+        'found': found,
+        'issues': dict(issues),
+        'pagename':'midway',
+    }
+    return render_to_response('midway/upload.html', context, context_instance=RequestContext(request), )

asadb/groups/admin.py

-                      rcbffe98
+                      r89165c1
+import datetime
+from django.contrib import admin
+from django.utils.translation import ugettext_lazy
+from reversion.admin import VersionAdmin
 import groups.models
+from django.contrib import admin
+from reversion.admin import VersionAdmin
+import util.admin
 class GroupAdmin(VersionAdmin):
 …
 class OfficeHolderAdmin(VersionAdmin):
+    class OfficeHolderPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start_time'
+        end_field = 'end_time'
+    def expire_holders(self, request, queryset):
+        rows_updated = queryset.update(end_time=datetime.datetime.now())
+        if rows_updated == 1:
+            message_bit = "1 entry was"
+        else:
+            message_bit = "%s entries were" % rows_updated
+        self.message_user(request, "%s successfully expired." % message_bit)
+    expire_holders.short_description = ugettext_lazy("Expire selected %(verbose_name_plural)s")
+    actions = ['expire_holders']
     list_display = (
         'id',
 …
     list_filter = [
         'role',
+        OfficeHolderPeriodFilter,
+    ]
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
 …
         'last_name',
         'account_class',
+        'affiliation_basic',
+        'loose_student',
         'mutable',
         'add_date',
 …
     list_display_links = ( 'id', 'username', )
     search_fields = ( 'username', 'mit_id', 'first_name', 'last_name', 'account_class', )
+    list_filter = (
+        'account_class',
+        'affiliation_basic', 'affiliation_detailed',
+        'loose_student',
+        'mutable',
+    )
 admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)

asadb/groups/diffs.py

rafc5348	r9af1bb4
244	244
245	245	def default_active_pred():
246		status_objs = groups.models.GroupStatus.objects.filter(slug__in=['active', 'suspended', ~~'nge'~~])
	246	status_objs = groups.models.GroupStatus.objects.filter(slug__in=['active', 'suspended', ])
247	247	status_pks = [status.pk for status in status_objs]
248	248	def pred(version, fields):

asadb/groups/load_people.py

r161ce5f	r89165c1
26	26	'last_name',
27	27	'account_class',
	28	'affiliation_basic',
	29	'affiliation_detailed',
28	30	]
29	31

asadb/groups/models.py

-                      r62f73df
+                      ref118cf
 # -*- coding: utf8 -*-
+from django.conf import settings
+from django.db import models
+from django.core.exceptions import ValidationError
+from django.core.validators import RegexValidator
+from django.contrib.auth.models import User
+from django.template.defaultfilters import slugify
+import reversion
+import collections
 import datetime
 import filecmp
 …
 import urllib2
+from django.conf import settings
+from django.db import models
+from django.db.models import Q
+from django.core.exceptions import ValidationError
+from django.core.validators import RegexValidator
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
+from django.template.defaultfilters import slugify
+import reversion
 import mit
 …
+        )
 locker_validator = RegexValidator(regex=r'^[-A-Za-z0-9_.]+$', message='Enter a valid Athena locker.')
+locker_validator = RegexValidator(regex=r'^[-A-Za-z0-9_.]+$', message='Enter a valid Athena locker. This should be the single "word" that appears in "/mit/word/" or "web.mit.edu/word/", with no slashes, spaces, etc..')
 class Group(models.Model):
 …
             if as_of == "now": as_of = datetime.datetime.now()
             office_holders = office_holders.filter(start_time__lte=as_of, end_time__gte=as_of)
+        office_holders = office_holders.order_by('role', 'person')
         return office_holders
 …
         current_officers = OfficeHolder.current_holders.filter(person=username)
         users_groups = Group.objects.filter(officeholder__in=current_officers).distinct()
+    @staticmethod
+    def admin_groups(username, codename='admin_group'):
+        holders = OfficeHolder.current_holders.filter_perm(codename=codename).filter(person=username)
+        users_groups = Group.objects.filter(officeholder__in=holders).distinct()
         return users_groups
 …
     @classmethod
+    def getRolesGrantingPerm(cls, perm=None, model=Group, codename=None, ):
+        """Get all OfficerRole objects granting a permission
+        Either `perm` or `codename` must be supplied, but not both. If
+        `codename` is provided (and `perm` is None), then `perm` the
+        permission corresponding to `model` (default: `Group`) and `codename`
+        will be found and used."""
+        if perm is None:
+            ct = ContentType.objects.get_for_model(model)
+            print ct
+            print Permission.objects.filter(content_type=ct)
+            perm = Permission.objects.get(content_type=ct, codename=codename)
+        Q_user = Q(user_permissions=perm)
+        Q_group = Q(groups__permissions=perm)
+        users = User.objects.filter(Q_user|Q_group)
+        roles = cls.objects.filter(grant_user__in=users)
+        return roles
+    @classmethod
     def retrieve(cls, slug, ):
         return cls.objects.get(slug=slug)
 reversion.register(OfficerRole)
 …
+        )
+    def filter_perm(self, perm=None, model=Group, codename=None, ):
+        roles = OfficerRole.getRolesGrantingPerm(perm=perm, model=model, codename=codename)
+        return self.get_query_set().filter(role__in=roles)
 class OfficeHolder(models.Model):
     EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
     END_NEVER       = datetime.datetime.max
     person = models.CharField(max_length=30, db_index=True, )
+    person = models.CharField(max_length=30, db_index=True, help_text='Athena username')
     role = models.ForeignKey('OfficerRole', db_index=True, )
     group = models.ForeignKey('Group', db_index=True, )
 …
     def __repr__(self, ):
         return str(self)
 reversion.register(OfficeHolder)
 …
     def __str__(self, ):
+        active = ""
+        if not self.is_active:
+            active = " (inactive)"
+        return "%s%s" % (self.name, active, )
+        return self.name
     class Meta:
 …
     def get_query_set(self, ):
         return super(AthenaMoiraAccount_ActiveManager, self).get_query_set().filter(del_date=None)
+def student_account_classes():
+    year = datetime.datetime.now().year
+    return ["G"] + [str(yr) for yr in range(year-5, year+10)]
 class AthenaMoiraAccount(models.Model):
 …
     last_name       = models.CharField(max_length=45)
     account_class   = models.CharField(max_length=10)
+    affiliation_basic       = models.CharField(max_length=10)
+    affiliation_detailed    = models.CharField(max_length=40)
+    loose_student   = models.BooleanField(default=False, help_text='Whether to use loose or strict determination of student status. Loose means that either the account class or the affiliation should indicate student status; strict means that the affiliation must be student. In general, we use strict; for some people ("secret people") directory information is suppressed and the affiliation will be misleading.')
     mutable         = models.BooleanField(default=True)
     add_date        = models.DateField(help_text="Date when this person was added to the dump.", )
 …
     def is_student(self, ):
+        # XXX: Is this... right?
+        return self.account_class == 'G' or self.account_class.isdigit()
+        student_affiliation = (self.affiliation_basic == 'student')
+        student_class = (self.account_class in student_account_classes())
+        return student_affiliation or (student_class and self.loose_student)
+    @staticmethod
+    def student_q():
+        q_affiliation = Q(affiliation_basic='student')
+        q_class = Q(account_class__in=student_account_classes())
+        return q_affiliation | (q_class & Q(loose_student=True))
     def format(self, ):

asadb/groups/urls.py

-                      r532a8e9
+                      ra7c08e4
 from django.conf.urls.defaults import *
+import django.shortcuts
 import groups.views
 import space.views
+def redirect_view(to):
+    def _redirect_view(request, **kwargs):
+        return django.shortcuts.redirect(to, **kwargs)
+    return _redirect_view
 group_patterns = patterns('',
     url(r'^$', groups.views.GroupDetailView.as_view(), name='group-detail', ),
     url(r'^edit/main$', groups.views.manage_main, name='group-manage-main', ),
+    url(r'^edit/officers$', groups.views.manage_officers, name='group-manage-officers', ),
+    url(r'^edit/people$', groups.views.manage_officers, name='group-manage-officers', ),
+    url(r'^edit/officers$', redirect_view('groups:group-manage-officers'), ),
     url(r'^history/$', groups.views.GroupHistoryView.as_view(), name='group-manage-history', ),
     url(r'^space/$', space.views.manage_access, name='group-space-access', ),

asadb/groups/views.py

-                      rd7557b8
+                      ref118cf
 import csv
 import datetime
-import groups.models
 from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
 …
 import django_filters
+import groups.models
 from util.db_form_utils import StaticWidget
+import util.db_filters
 from util.emails import email_from_template
 …
         for field in self.force_required:
             self.fields[field].required = True
         self.fields['constitution_url'].help_text = mark_safe("""Please put your current constitution URL or AFS path.<br>If you don't currently know where your constitution is, put "http://mit.edu/asa/start/constitution-req.html" and draft a constitution soon.""")
+        self.fields['constitution_url'].help_text = mark_safe("Please put your current constitution URL or AFS path.")
     exec_only_fields = [
 …
 def manage_officers_load_officers(group, ):
     officers = group.officers()
     people = list(set([ officer.person for officer in officers ]))
+    people = sorted(set([ officer.person for officer in officers ]))
     roles  = groups.models.OfficerRole.objects.all()
 …
     treasurer_name = forms.CharField(max_length=50)
     treasurer_kerberos = forms.CharField(min_length=3, max_length=8, )
     def clean_president(self, ):
+    def clean_president_kerberos(self, ):
         username = self.cleaned_data['president_kerberos']
         validate_athena(username, True, )
         return username
     def clean_treasurer(self, ):
+    def clean_treasurer_kerberos(self, ):
         username = self.cleaned_data['treasurer_kerberos']
         validate_athena(username, 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."
+        self.fields['group_email'].required = True
         self.fields['athena_locker'].required = True
+        self.fields['athena_locker'].help_text = "In general, this is limited to twelve characters. You should stick to letters, numbers, and hyphens. (Underscores and dots are also acceptable, but may cause problems in some situations.)"
+        # Specifically, if the group ends up wanting to use scripts.mit.edu,
+        # they will currently be assigned locker.scripts.mit.edu. If they try
+        # to use foo.bar, then https://foo.bar.scripts.mit.edu/ will produce a
+        # certificate name mismatch. Officially, underscores are not allowed in
+        # hostnames, so foo_.scripts.mit.edu may fail with some software.
     class Meta(GroupCreateForm.Meta):
 …
             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:
 …
     return render_to_response('groups/create/startup.html', context, context_instance=RequestContext(request), )
+def review_group_check_warnings(group_startup, group, ):
+    warnings = []
+    if group.name.startswith("MIT "):
+        warnings.append('Group name starts with "MIT". Generally, we prefer "Foo, MIT" instead.')
+    if "mit" in group.athena_locker.lower():
+        warnings.append('Athena locker name contains "mit", which may be redundant with paths like "http://web.mit.edu/mitfoo" or "/mit/foo/".')
+    if group_startup.president_kerberos == group_startup.treasurer_kerberos:
+        warnings.append('President matches Treasurer.')
+    if "%s@mit.edu" % (group_startup.president_kerberos, ) in (group.officer_email, group.group_email):
+        warnings.append('President email matches officer and/or group email.')
+    if group.officer_email == group.group_email:
+        warnings.append('Officer email matches group email.')
+    if '@mit.edu' not in group.officer_email or '@mit.edu' not in group.group_email:
+        warnings.append('Officer and/or group email are non-MIT. Ensure that they are not requesting the addresses be created, and consider suggesting they use an MIT list instead.')
+    if '.' in group.athena_locker:
+        warnings.append('Athena locker contains a ".". This is not compatible with scripts.mit.edu\'s wildcard certificate, and may cause other problems.')
+    if '_' in group.athena_locker:
+        warnings.append('Athena locker contains a "_". If this locker name gets used in a URL (for example, locker.scripts.mit.edu), it will technically violate the hostname specification and may not work in some clients.')
+    if len(group.athena_locker) > 12:
+        warnings.append('Athena locker is more than twelve characters long. In general, twelve characters is the longest Athena locker an ASA-recognized group can get.')
+    return warnings
 @permission_required('groups.recognize_group')
 def recognize_normal_group(request, pk, ):
 …
         return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+    context['warnings'] = review_group_check_warnings(group_startup, group)
     context['msg'] = ""
     if request.method == 'POST':
 …
             group_startup.save()
             group.group_status = groups.models.GroupStatus.objects.get(slug='active')
+            group.group_status = groups.models.GroupStatus.objects.get(slug='suspended')
             group.constitution_url = ""
             group.recognition_date = datetime.datetime.now()
             group.set_updater(request.user)
+            note = groups.models.GroupNote(
+                author=request.user.username,
+                body="Approved group for recognition.",
+                acl_read_group=True,
+                acl_read_offices=True,
+                group=group,
+            ).save()
             group.save()
 …
     name = django_filters.CharFilter(lookup_type='icontains', label="Name contains")
     abbreviation = django_filters.CharFilter(lookup_type='iexact', label="Abbreviation is")
+    officer_email = django_filters.CharFilter(lookup_type='icontains', label="Officers' list contains")
+    account_filter = util.db_filters.MultiNumberFilter(
+        lookup_type='exact', label="Account number",
+        names=('main_account_id', 'funding_account_id', ),
+    )
     class Meta:
 …
             'name',
             'abbreviation',
+            'officer_email',
             'activity_category',
             'group_class',
             'group_status',
             'group_funding',
+            'account_filter',
+        ]
 …
     groups_filterset = GroupFilter(request.GET, the_groups)
     the_groups = groups_filterset.qs
     officers = groups.models.OfficeHolder.objects.filter(start_time__lte=datetime.datetime.now(), end_time__gte=datetime.datetime.now())
     officers = officers.filter(group__in=the_groups)
     officers = officers.select_related(depth=1)
     role_slugs = ['president', 'treasurer', 'financial', 'reservation']
     roles = groups.models.OfficerRole.objects.filter(slug__in=role_slugs)
     roles = sorted(roles, key=lambda r: role_slugs.index(r.slug))
     officers_map = collections.defaultdict(lambda: collections.defaultdict(set))
     for officer in officers:
 …
         role_list = []
         for role in roles:
             role_list.append(officers_map[group][role])
+            role_list.append(sorted(officers_map[group][role]))
         officers_data.append((group, role_list))
 …
         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)
+            history_entries = reversion.get_for_object(group)
         else:
             history_entries = reversion.models.Version.objects.all()
 …
 def show_nonstudent_officers(request, ):
     student_roles  = groups.models.OfficerRole.objects.filter(require_student=True, )
+    year = datetime.datetime.now().year
+    account_classes = ["G"] + [str(yr) for yr in range(year-5, year+10)]
+    students = groups.models.AthenaMoiraAccount.active_accounts.filter(account_class__in=account_classes)
+    student_q = groups.models.AthenaMoiraAccount.student_q()
+    students = groups.models.AthenaMoiraAccount.active_accounts.filter(student_q)
     office_holders = groups.models.OfficeHolder.current_holders.order_by('group__name', 'role', )
     office_holders = office_holders.filter(role__in=student_roles)
     office_holders = office_holders.exclude(person__in=students.values('username'))
     office_holders = office_holders.select_related('group', 'role')
+    office_holders = office_holders.select_related('group', 'group__group_status', 'role')
     msg = None
 …
     if 'sort' in request.GET:
         if request.GET['sort'] == 'group':
+            office_holders = office_holders.order_by('group__name', 'role', 'person', )
+            office_holders = office_holders.order_by('group__name', 'group__group_status', 'role', 'person', )
+        elif request.GET['sort'] == 'status':
+            office_holders = office_holders.order_by('group__group_status', 'group__name', 'role', 'person', )
         elif request.GET['sort'] == 'role':
             office_holders = office_holders.order_by('role', 'group__name', 'person', )
+            office_holders = office_holders.order_by('role', 'group__group_status', 'group__name', 'person', )
         elif request.GET['sort'] == 'person':
             office_holders = office_holders.order_by('person', 'group__name', 'role', )
+            office_holders = office_holders.order_by('person', 'group__group_status', 'group__name', 'role', )
         else:
             msg = 'Unknown sort key "%s".' % (request.GET['sort'], )

asadb/media/style/style.css

-                      rd6f8984
+                      r53e624e
 .group-detail-page.group-status-active h1          { color: black; }
 .group-detail-page.group-status-applying h1        { color: red; }
 .group-detail-page.group-status-nge h1             { color: yellow; }
+.group-detail-page.group-status-nge h1             { color: #00ffff; }
 .group-detail-page.group-status-provisional h1     { color: yellow; }
 .group-detail-page.group-status-derecognized h1    { color: red; }
 …
     color: black;
+}
+.group-list-page tr.group-status-nge td.group-status
+{
+    background-color: #00ffff;
+    color: black;
+}
 …
+}
 table.group-change-officers-change td
+table.group-update-people-change td
+{
     text-align: center;

asadb/mit/init.py

rd0c7563	r8c0a2ff
130	130	def scripts_login(request, **kwargs):
131	131	host = request.META['HTTP_HOST'].split(':')[0]
132		if host ~~== 'localhost'~~:
	132	if host in ('localhost', '127.0.0.1'):
133	133	return login(request, **kwargs)
134	134	elif request.META['SERVER_PORT'] == '444':

asadb/settings.py

red5797d	rb4cc0cc
121	121	# Always use forward slashes, even on Windows.
122	122	# Don't forget to use absolute paths, not relative paths.
123		~~'template'~~,
	123	os.path.join(SITE_ROOT, 'template'),
124	124	)
125	125

asadb/space/admin.py

-                      r465eb7a
+                      r3c1b20b
+from django.contrib import admin
+from reversion.admin import VersionAdmin
 import space.models
+from django.contrib import admin
+from reversion.admin import VersionAdmin
+import util.admin
+class Admin_LockType(VersionAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'info_addr',
+        'info_url',
+        'db_update',
+    )
+    list_display_links = ( 'id', 'name', 'slug', )
+    search_fields = ('name', 'slug', 'info_addr', 'info_url', 'db_update', )
+admin.site.register(space.models.LockType, Admin_LockType)
 class Admin_Space(VersionAdmin):
 …
         'number',
         'asa_owned',
+        'lock_type',
         'merged_acl',
+    )
     list_display_links = ( 'id', 'number', )
+    list_filter = ('lock_type', )
     search_fields = ('number', )
 admin.site.register(space.models.Space, Admin_Space)
 class Admin_SpaceAssignment(admin.ModelAdmin):
+    class AssignmentPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start'
+        end_field = 'end'
     list_max_show_all = 500
     list_display = (
 …
+    )
     list_display_links = list_display
     list_filter = ('space', )
+    list_filter = (AssignmentPeriodFilter, 'space', )
     search_fields = ( 'group__name', 'group__officer_email', 'space__number', )
 admin.site.register(space.models.SpaceAssignment, Admin_SpaceAssignment)
 class Admin_SpaceAccessListEntry(admin.ModelAdmin):
+    class AccessPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start'
+        end_field = 'end'
     list_display = (
         'group',
 …
+    )
     list_display_links = list_display
+    list_filter = (AccessPeriodFilter, 'space', )
     search_fields = (
         'group__name', 'group__officer_email',

asadb/space/diffs.py

-                      rc8f4eea
+                      r27e09a9
     cur_file = os.path.abspath(__file__)
     django_dir = os.path.abspath(os.path.join(os.path.dirname(cur_file), '..'))
+    django_dir_parent = os.path.abspath(os.path.join(os.path.dirname(cur_file), '../..'))
     sys.path.append(django_dir)
+    sys.path.append(django_dir_parent)
     os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 from django.core.mail import EmailMessage
+from django.core.urlresolvers import reverse
 from django.db import connection
 from django.db.models import Q
 …
     def list_office_changes(self, ):
+        cac_lines = []
+        systems_lines = {
+            'cac-card': [],
+            'none': [],
+        }
         group_lines = []
-        def append_change(mit_id, verb, name):
-            cac_lines.append("%s:\t%s:\t%s" % (mit_id, verb, name))
-            group_lines.append("%s:\t%s" % (verb, name))
         for space_pk, space_data in self.offices.items():
+            lock_type = all_spaces[space_pk].lock_type
+            system_lines = systems_lines[lock_type.db_update]
+            def append_change(mit_id, verb, name):
+                system_lines.append("%s:\t%s:\t%s" % (mit_id, verb, name))
+                group_lines.append("%s:\t%s" % (verb, name))
             line = "Changes in %s:" % (all_spaces[space_pk].number, )
             cac_lines.append(line)
+            system_lines.append(line)
             group_lines.append(line)
+            if lock_type.db_update == 'none':
+                tmpl =  'Warning: You submitted changes affecting this space, but this space is ' + \
+                        'a "%s" space, and is not managed through the ASA DB. See ' + \
+                        'https://asa.mit.edu%s for details on how to update spaces of this type.'
+                line = tmpl % (lock_type.name, reverse('space-lock-type'), )
+                group_lines.append(line)
             for mit_id, (old_names, new_names) in space_data.items():
                 if mit_id is None: mit_id = "ID unknown"
 …
                         else:
                             append_change(mit_id, "Add", name)
             cac_lines.append("")
+            system_lines.append("")
             group_lines.append("")
+        cac_msg = "\n".join(cac_lines)
+        systems_msg = dict([
+            (system, '\n'.join(lines), ) for (system, lines) in systems_lines.items()
+        ])
         group_msg = "\n".join(group_lines)
         return cac_msg, group_msg
+        return systems_msg, group_msg
     def add_locker_signatories(self, space_access, time):
 …
 def safe_add_change_real(change_by_name, change):
+    """Add a new change to our dict of pending changes.
+    If a different change has already been added for this person (eg, "Remove"
+    instead of "Keep", or with a different list of groups), error.  This should
+    always succeed; if it doesn't, the code is buggy. We worry about this
+    because we want to be really sure that the email that goes to just CAC is
+    compatible with the emails that go to each groups. Since we iterate over
+    the changes once per group, we want to be sure that for each group
+    iteration we're building compatible information.
+    """
     name = change.name
     if name in change_by_name:
 …
         print "ID=%s (%s):\n\t%s\t(%s)\n\t%s\t(%s)\n" % (mit_id, unchanged, old_by_names, old_by_group, new_by_names, new_by_group, ),
         for group_pk in joint_keys(old_by_group, new_by_group):
+            # TODO: Do we need to do an iteration for each group? This seems
+            # slightly questionable. Can we just loop over all known names?
             old_names = old_by_group[group_pk]
             new_names = new_by_group[group_pk]
 …
     cac_locker_msgs = []
     process_spaces =  space.models.Space.objects.all()
+    process_spaces =  space.models.Space.objects.all().select_related('lock_type')
     for the_space in process_spaces:
         new_cac_msgs = space_specific_access(the_space, group_data, old_time, new_time)
 …
     changed_groups = []
+    cac_chars = 0
     for group_pk, group_info in group_data.items():
         group_info.add_office_signatories(old_time, new_time)
         cac_changes, group_office_changes = group_info.list_office_changes()
+        systems_changes, group_office_changes = group_info.list_office_changes()
         if group_info.changes:
+            changed_groups.append((group_info.group, cac_changes, group_office_changes, group_info.locker_messages, ))
+            cac_chars += len(systems_changes['cac-card'])
+            changed_groups.append((group_info.group, systems_changes['cac-card'], group_office_changes, group_info.locker_messages, ))
     asa_rcpts = ['asa-space@mit.edu', 'asa-db@mit.edu', ]
     if changed_groups:
+    if cac_chars > 0 or cac_locker_msgs:
         util.emails.email_from_template(
             tmpl='space/cac-change-email.txt',

asadb/space/models.py

-                      r2563230
+                      ref118cf
 EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
+LOCK_DB_UPDATE_NONE = 'none'
+LOCK_DB_UPDATE_CAC_CARD = 'cac-card'
+lock_db_update_choices = (
+    (LOCK_DB_UPDATE_NONE, "No database management"),
+    (LOCK_DB_UPDATE_CAC_CARD, "CAC-managed card-based access"),
+)
+class LockType(models.Model):
+    name = models.CharField(max_length=50)
+    slug = models.SlugField(unique=True, )
+    description = models.TextField()
+    info_addr = models.EmailField(default='asa-exec@mit.edu', help_text='Address groups should email to get more information about managing access through this lock type.')
+    info_url = models.URLField(blank=True, help_text='URL that groups can visit to get more information about this lock type.')
+    db_update = models.CharField(max_length=20, default='none', choices=lock_db_update_choices)
+    def __unicode__(self, ):
+        return self.name
 class Space(models.Model):
     number = models.CharField(max_length=20, unique=True, )
     asa_owned = models.BooleanField(default=True, )
+    lock_type = models.ForeignKey(LockType)
     merged_acl = models.BooleanField(default=False, help_text="Does this room have a single merged ACL, that combines all groups together, or CAC maintain a separate ACL per-group? Generally, the shared storage offices get a merged ACL and everything else doesn't.")
     notes = models.TextField(blank=True, )

asadb/space/views.py

-                      rde2f0ac
+                      rf6982d4
         'allow_edit': allow_edit,
         'extras_indices': extras_indices,
         'pagename':'group',
+        'pagename':'groups',
+    }
     return render_to_response('space/manage-access.html', context, context_instance=RequestContext(request), )
 …
         'locker_num',
         'group__name',
     ).select_related('space', 'group')
+    ).select_related('space', 'space__lock_type', 'group')
     office_assignments = assignments.filter(locker_num='')
 …
         'offices': office_assignments,
         'lockers': locker_rooms,
         'pagename':'group',
+        'pagename':'groups',
+    }
     return render_to_response('space/summary.html', context, context_instance=RequestContext(request), )
+def lock_types(request, ):
+    lock_types = space.models.LockType.objects.order_by('name')
+    context = {
+        'lock_types': lock_types,
+        'pagename': 'groups',
+    }
+    return render_to_response('space/lock_types.html', context, context_instance=RequestContext(request), )

asadb/template/base.html

-                      rcec082b
+                      r5560f6d
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/style.css" />
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/page-frame.css" />
+    {% block extrahead %}
+    {% endblock %}
   </head>
 …
         <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url groups:list %}">Groups</a></li>
         <li{% ifequal pagename "fysm"     %} class='selected'{% endifequal %}><a href="{% url fysm       %}">FYSM</a></li>
+        <li{% ifequal pagename "midway"     %} class='selected'{% endifequal %}><a href="{% url midway-list %}">Midway</a></li>
         <li{% ifequal pagename "about"    %} class='selected'{% endifequal %}><a href="{% url about %}">Help &amp; About</a></li>
         {% if user.is_staff %}<li><a href='{% url admin:index %}'>Admin</a></li>{% endif %}

asadb/template/fysm/fysm_listing.html

-                      rbd2bc21
+                      r21ab6b3
 <p>Hello incoming MIT students!</p>
 <p>Student activities play an important role in student life at MIT &mdash; they're a
+<p>Student activities play an important role in student life at MIT &ndash; they're a
 great place to meet people, practice old skills and learn new ones, have fun,
 and give back to the community.  Undergraduate and graduate students, along
 …
 {% for fysm in fysm_list %}
 <div class='single-fysm-entry'>
+    <h3><a href='{% url fysm-view year fysm.pk %}'>{{fysm.display_name}}</a></h3>
+    {% comment %}
+    If we were cooler, years when we had slides would still link them here.
+    We're not that cool, though, so we just always link the join page.
+    {% endcomment %}
+    <h3><a href='{% url fysm-link year "join" fysm.pk %}'>{{fysm.display_name}}</a></h3>
     <div class='fysm-body'>
     <div class='logo'>
 …
     </div>
     <p class='data'>{{fysm.description}}</p>
     <p class='join'><a href='{% url fysm-link year "join" fysm.pk %}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
+    <p class='join'><a href='{% url fysm-link year "join" fysm.pk %}'>Learn more about {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
     </div>
     {% if fysm.tags %}

asadb/template/groups/account_lookup.html

-                      rb928edc
+                      r9469a73
     <th>Group</th>
     <td>{{group}}</td>
+</tr>
+<tr>
+    <th>Status</th>
+    <td>{{group.group_status}}</td>
 </tr>
 <tr>
 …
 {% endif %}
+{% if account_number %}
+<p>You may be able to find information about account {{account_number}} in <a href='https://rolesweb.mit.edu/cgi-bin/roleauth2.pl?category=SAP+SAP-related&amp;func_name=CAN+SPEND+OR+COMMIT+FUNDS&amp;qual_code=F{{account_number}}&amp;skip_root=Y'>Roles</a>.</p>
+{% endif %}
 <table class='pretty-table'>
 <form enctype="multipart/form-data" method="get" action="">
 …
 </form>
 </table>
+<h2>Group Status</h2>
+<table class='pretty-table'>
+<tr>
+    <th>Status</th>
+    <th>Description</th>
+</tr>
+<tr>
+    <th>Active</th>
+    <td>Active groups are normal ASA groups in good standing.</td>
+</tr>
+<tr>
+    <th>Suspended and Derecognized</th>
+    <td>Suspended and derecognized groups are <strong>not</strong> in good standing, and should generally not be permitted to spend money, reserve rooms, etc..</td>
+</tr>
+<tr>
+    <th>Non-Group Entity</th>
+    <td>Non-Group Entities do not necessarily have any ASA recognition, but are included in the ASA Database as a courtesy to other MIT offices. You may assume the roles listed are authoritative. However, the ASA does not grant them any privileges.</td>
+</tr>
+</table>
 <h2>Available Roles</h2>

asadb/template/groups/create/startup_review.html

-                      rac93a0c
+                      r7dde669
 <tr><th>Description</th><td>{{group.description}}</td></tr>
 <tr><th colspan='2'>Type</th></tr>
+<tr><th colspan='2'>Officers</th></tr>
 <tr><th>President</th><td>{{startup.president_name}} ({{startup.president_kerberos}})</td></tr>
 <tr><th>Treasurer</th><td>{{startup.treasurer_name}} ({{startup.treasurer_kerberos}})</td></tr>
 …
 {% endif %}
+{% if warnings %}
+<div class='messagebox warnbox'>
+<h3>Potential issues</h3>
+<p>The following potential issues were identified with this group's startup application:</p>
+<ul>
+{% for warning in warnings %}
+    <li>{{warning}}</li>
+{%endfor%}
+</ul>
+<p>Please look over these issues. Usually, you should <strong>reach out to the group</strong> and ask them to fix (or consider fixing) each issue before you approve the group. In some cases, it may be appropriate to ignore an issue. (For example, "MIT" is a central part of some group's acronyms (like "HTGAMIT"). In these cases, confirming with the group may not be necessary.)</p>
+</div>
+{%endif%}
 {% if disp_form %}
 <form enctype="multipart/form-data" method="post" action="">
 {% csrf_token %}
+{% if warnings %}
+<input type='submit' name='approve' value='Approve DESPITE WARNINGS' />
+{% else %}
 <input type='submit' name='approve' value='Approve' />
+{% endif %}
 <input type='submit' name='reject' value='Reject' />
 </form>

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

-                      r264efa0
+                      rf38b6d0
 to the MIT community!
+The last step to finalize the group recognition is for you to finish entering the
+group's complete information into the ASA Database:
+Your group is currently *suspended*. The last step to finalize the group
+recognition is for you to finish entering the group's complete information into
+the ASA Database:
       http://web.mit.edu/asa/www/asa-db.shtml
 …
 Your group's entry is at:
       http://asa.mit.edu/{% url groups:group-detail group.pk %}
+      https://asa.mit.edu{% url groups:group-detail group.pk %}
 You should make sure to do the following:
 …
 can modify the information and that MIT personal certificates are
 required to access the group's account in the ASA Database.
+Once you have completed these steps, you must *notify asa-groups@mit.edu* to
+become an active group.
 *** Please keep this e-mail for further reference. ***

asadb/template/groups/group_change_main.html

rcb9b105	r4752b74
9	9	{% include "groups/group_tools.part.html" %}
10	10
11		<p>We're using the transition from the old ASA Database to this new one as an opportunity to verify that old information is still accurate. Thus, we have intentionally limited the amount of information we copied from the old database. While filling this out, feel free to refer to the <a href='https://sisapp2.mit.edu/asa/student_group_detail.do?action=detail&studentGroupId={{group.pk}}'>old database</a>. However, please verify that information is accurate as you copy it over. As always, if you have trouble, please <a href='mailto:asa-exec@mit.edu'>contact us</a>.</p>
	11	<p>Please make sure to keep the information about your group up-to-date. As always, if you have trouble (or need to update a field that you don't have access to), please <a href='mailto:asa-exec@mit.edu'>contact us</a>.</p>
12	12
13	13	{% if msg %}

asadb/template/groups/group_change_officers.html

-                      rbb1a40e
+                      r21ab6b3
 {% extends "base.html" %}
 {% block title %}{{group.name}}: Change people{% endblock %}
+{% block title %}{{group.name}}: Update people{% endblock %}
 {% block content %}
 <h1>{{group.name}}: Change people</h1>
+<h1>{{group.name}}: Update people</h1>
 {% include "groups/group_tools.part.html" %}
 <p>Please adjust your signatories below.</p>
+<p>Please adjust the people associated with your group below.</p>
 <h2>Available roles</h2>
 …
 {% endif %}
 <h2>Option 1: View and update signatories one at a time</h2>
+<h2>Option 1: View and update people one at a time</h2>
 <p>Please note:</p>
 <ul>
     <li>We don't track "group membership" &mdash; people will show up in the list below only if they have one of the roles listed</li>
     <li>Type only the <em>Athena username</em> to add people &mdash; do not type full names or names plus username</li>
+    <li>We don't track "group membership" &ndash; people will show up in the list below only if they have one of the roles listed</li>
+    <li>Type only the <em>Athena username</em> to add people &ndash; do not type full names or names plus username</li>
     <li>To add <em>more than four</em> new people, add four at a time and <em>submit multiple times</em></li>
 </ul>
 …
 <input type='hidden' name='opt-mode' value='table' />
 {% csrf_token %}
 <table class='pretty-table group-change-officers-change'>
+<table class='pretty-table group-update-people-change'>
 <thead>
 <tr>

asadb/template/groups/group_list.html

r8f46374	r58fe19c
17	17
18	18	<h2>The Groups</h2>
	19
	20	<p>Found {{group_list\|length}} groups:</p>
19	21
20	22	<table class='pretty-table group-list'>

asadb/template/groups/reporting.html

-                      rea8e8b6
+                      r58fe19c
 <h2><a name='results'></a>Results</h2>
 {% if run_report %}
+<p>Found {{report_groups|length}} groups:</p>
 <table class='pretty-table'>
 <thead>

asadb/template/groups/reporting/non-students.html

-                      r213dd57
+                      r89165c1
 <tr>
     <th><a href='?sort=group'>Group</a></th>
+    <th><a href='?sort=status'>Status</a></th>
     <th><a href='?sort=role'>Role</a></th>
     <th><a href='?sort=person'>Person</a></th>
 …
 <tr>
     <td><a href='{% url groups:group-detail holder.group.pk %}'>{{holder.group.name}}</a></td>
+    <td>{{holder.group.group_status}}</td>
     <td>{{holder.role.display_name}}</td>
     <td>{{holder.person}}</td>
+    <td>{% if perms.groups.change_athenamoiraaccount %}<a href='{% url admin:groups_athenamoiraaccount_changelist %}?username={{holder.person}}'>{{holder.person}}</a>{% else %}{{holder.person}}{% endif %}</td>
 </tr>
 {% endfor %}

asadb/template/index.html

-                      rde2f0ac
+                      r3c1b20b
         <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
     </ul></li>
+    <li><a href='{% url midway-list %}'>Midways</a>: <a href='{% url midway-map-latest %}'>latest map</a></li>
     <li>Membership updates<ul>
         <li><a href='{%url membership-update-cycle %}'>Group update</a></li>
 …
     </ul></li>
     <li><a href='{% url space-summary %}'>Space assignments</a>
+        <ul>
+        <li><a href='{% url space-lock-type %}'>Lock Types</a></li>
         {% if perms.groups.view_group_private_info %}
-        <ul>
         <li><a href='{% url space-dump-locker-access %}'>Locker access (CSV)</a></li>
         <li><a href='{% url space-dump-office-access %}'>Office access (CSV)</a></li>
+        {% endif %}
         </ul>
-        {% endif %}
     </li>
     <li><a href='{% url about %}'>About the ASA Database</a><ul>

asadb/template/membership/admin.html

-                      rd6f8984
+                      r21ab6b3
 {% extends "base.html" %}
 {% block title %}Membership confirmations &mdash; ASA Exec pages{% endblock %}
+{% block title %}Membership confirmations &ndash; ASA Exec pages{% endblock %}
 {% block content %}
 <h2>Membership confirmations &mdash; ASA Exec pages</h2>
+<h2>Membership confirmations &ndash; ASA Exec pages</h2>
+<p>Exec members can check the <a href='{% url membership-issues %}'>list of groups with issues</a> (or a version <a href='{% url membership-issues %}?accounts=1'>with account numbers</a>)</p>
+<p>Exec members can check the issues:</p>
+<table class='pretty-table'>
+<tr>
+    <th>Name</th>
+    <th>Create date</th>
+    <th>Issues</th>
+    <th>(with accounts)</th>
+</tr>
+{% for cycle in cycle_list %}
+<tr>
+    <th>{{cycle.name}}</th>
+    <td>{{cycle.create_date}}</td>
+    <td><a href='{% url membership-issues cycle.slug %}'>Issues</a></td>
+    <td><a href='{% url membership-issues cycle.slug %}?accounts=1'>(with accounts)</a></td>
+</tr>
+{% endfor %}
+</table>
 <p>The list includes the following types of issues:</p>
 <dl>
     <dt>unsubmitted</dt><dd>active groups ("group status" is "Active") who have not submitted an update (ever &mdash; see ASA-#191)</dd>
     <dt>confirmations</dt><dd>groups that have submitted an update (ever) but had less than five members confirm membership (again, ever &mdash; ASA-#191)</dd>
     <dt>50%</dt><dd>groups that (ever) submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>
+    <dt>unsubmitted</dt><dd>active or suspended groups who have not submitted an update
+    <dt>confirmations</dt><dd>groups that have submitted an update but had less than five members confirm membership</dd>
+    <dt>50%</dt><dd>groups that submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>
 </dl>

asadb/template/membership/anti-hazing.txt

-                      r43434f6
+                      r70a96d4
 Text of Anti-Hazing Law:
+Section 17. Hazing; organizing or participating; hazing defined: Whoever is a principal organizer or
+participant in the crime of hazing, as defined herein, shall be punished by a fine of not more than three thousand
+dollars or by imprisonment in a house of correction for not more than one year, or both such fine and imprisonment.
+Section 17. Hazing; organizing or participating; hazing defined: Whoever is a principal organizer or participant in the crime of hazing, as defined herein, shall be punished by a fine of not more than three thousand dollars or by imprisonment in a house of correction for not more than one year, or both such fine and imprisonment.
+The term hazing as used in this section and in sections eighteen and nineteen, shall mean any conduct or method of
+initiation into any student organization, whether on public or private property, which willfully or recklessly
+endangers the physical or mental health of any student or other person. Such conduct shall include whipping, beating,
+branding, forced calisthenics, exposure to the weather, forced consumption of any food, liquor, beverage, drug or
+other substance, or any other brutal treatment or forced physical activity which is likely to adversely affect the
+physical health or safety of any such student or other person, or which subjects such student or other person to
+extreme mental stress, including extended deprivation of sleep or rest or extended isolation.
+The term hazing as used in this section and in sections eighteen and nineteen, shall mean any conduct or method of initiation into any student organization, whether on public or private property, which willfully or recklessly endangers the physical or mental health of any student or other person. Such conduct shall include whipping, beating, branding, forced calisthenics, exposure to the weather, forced consumption of any food, liquor, beverage, drug or other substance, or any other brutal treatment or forced physical activity which is likely to adversely affect the physical health or safety of any such student or other person, or which subjects such student or other person to extreme mental stress, including extended deprivation of sleep or rest or extended isolation.
+Notwithstanding any other provisions of this section to the contrary, consent shall not be available as a defense to
+any prosecution under this action.
+Notwithstanding any other provisions of this section to the contrary, consent shall not be available as a defense to any prosecution under this action.
+Section 18. Failure to report hazing: Whoever knows that another person is the victim of hazing as defined in
+section seventeen and is at the scene of such crime shall, to the extent that such person can do so without danger
+or peril to himself or others, report such crime to an appropriate law enforcement official as soon as reasonably
+practicable. Whoever fails to report such crime shall be punished by a fine of not more than one thousand dollars.
+Section 18. Failure to report hazing: Whoever knows that another person is the victim of hazing as defined in section seventeen and is at the scene of such crime shall, to the extent that such person can do so without danger or peril to himself or others, report such crime to an appropriate law enforcement official as soon as reasonably practicable. Whoever fails to report such crime shall be punished by a fine of not more than one thousand dollars.
+Section 19. Copy of Secs. 17 to 19; issuance to students and student groups, teams and organizations; report:
+Each institution of secondary education and each public and private institution of post secondary education shall
+issue to every student group, student team or student organization which is part of such institution or is
+recognized by the institution or permitted by the institution to use its name or facilities or is known by the
+institution to exist as an unaffiliated student group, student team or student organization, a copy of this section
+and sections seventeen and eighteen; provided, however, that an institution's compliance with this section's
+requirements that an institution issue copies of this section and sections seventeen and eighteen to unaffiliated
+student groups, teams or organizations shall not constitute evidence of the institution's recognition or endorsement
+of said unaffiliated student groups, teams or organizations.
+Section 19. Copy of Secs. 17 to 19; issuance to students and student groups, teams and organizations; report: Each institution of secondary education and each public and private institution of post secondary education shall issue to every student group, student team or student organization which is part of such institution or is recognized by the institution or permitted by the institution to use its name or facilities or is known by the institution to exist as an unaffiliated student group, student team or student organization, a copy of this section and sections seventeen and eighteen; provided, however, that an institution's compliance with this section's requirements that an institution issue copies of this section and sections seventeen and eighteen to unaffiliated student groups, teams or organizations shall not constitute evidence of the institution's recognition or endorsement of said unaffiliated student groups, teams or organizations.
+Each such group, team or organization shall distribute a copy of this section and sections seventeen and eighteen to
+each of its members, plebes, pledges or applicants for membership. It shall be the duty of each such group, team or
+organization, acting through its designated officer, to deliver annually, to the institution [in MIT's case the
+Office of Student Life Programs (with exception of varsity teams and club sports, who will deliver attested
+acknowledgements to the Department of Athletics, Physical Education and Recreation)] an attested acknowledgement
+stating that such group, team or organization has received a copy of this section and said sections seventeen and
+eighteen, that each of its members, plebes, pledges, or applicants has received a copy of sections seventeen and
+eighteen, and that such group, team or organization understands and agrees to comply with the provisions of this
+section and sections seventeen and eighteen.
+Each such group, team or organization shall distribute a copy of this section and sections seventeen and eighteen to each of its members, plebes, pledges or applicants for membership. It shall be the duty of each such group, team or organization, acting through its designated officer, to deliver annually, to the institution [in MIT's case the Office of Student Life Programs (with exception of varsity teams and club sports, who will deliver attested acknowledgements to the Department of Athletics, Physical Education and Recreation)] an attested acknowledgement stating that such group, team or organization has received a copy of this section and said sections seventeen and eighteen, that each of its members, plebes, pledges, or applicants has received a copy of sections seventeen and eighteen, and that such group, team or organization understands and agrees to comply with the provisions of this section and sections seventeen and eighteen.
+Each institution of secondary education and each public or private institution of post secondary education shall, at
+least annually, before or at the start of enrollment, deliver to each person who enrolls as a full time student in
+such institution a copy of this section and sections seventeen and eighteen.
+Each institution of secondary education and each public or private institution of post secondary education shall, at least annually, before or at the start of enrollment, deliver to each person who enrolls as a full time student in such institution a copy of this section and sections seventeen and eighteen.
+Each institution of secondary education and each public or private institution of post secondary education shall
+file, at least annually, a report with the board of higher education and in the case of secondary institutions, the
+board of education, certifying that such institution has complied with its responsibility to inform student groups,
+teams or organizations and to notify each full time student enrolled by it of the provisions of this section and
+sections seventeen and eighteen and also certifying that said institution has adopted a disciplinary policy with
+regard to the organizers and participants of hazing, and that such policy has been set forth with appropriate
+emphasis in the student handbook or similar means of communicating the institution's policies to its students. The
+board of higher education and, in the case of secondary institutions, the board of education shall promulgate
+regulations governing the content and frequency of such reports, and shall forthwith report to the attorney general
+any such institution which fails to make such report.
+Each institution of secondary education and each public or private institution of post secondary education shall file, at least annually, a report with the board of higher education and in the case of secondary institutions, the board of education, certifying that such institution has complied with its responsibility to inform student groups, teams or organizations and to notify each full time student enrolled by it of the provisions of this section and sections seventeen and eighteen and also certifying that said institution has adopted a disciplinary policy with regard to the organizers and participants of hazing, and that such policy has been set forth with appropriate emphasis in the student handbook or similar means of communicating the institution's policies to its students. The board of higher education and, in the case of secondary institutions, the board of education shall promulgate regulations governing the content and frequency of such reports, and shall forthwith report to the attorney general any such institution which fails to make such report.

asadb/template/membership/confirm.html

-                      r11941e1
+                      r5560f6d
 {% extends "base.html" %}
+{% block extrahead %}
+<link rel="stylesheet" href="{{MEDIA_URL}}js/libs/chosen/chosen.css">
+{% endblock %}
 {% block title %}Membership update{% endblock %}
 …
 </table>
 <h3>Option 2: Add or remove groups by searching</h3>
+<h3>Option 2: Select all your groups at once</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 3: 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>
+<p>Below, you can add or remove any recognized group from the list of groups you are a member of.</p>
 <form enctype="multipart/form-data" method="post" action="">
 …
 </form>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script>
+<script src="{{MEDIA_URL}}js/libs/chosen/chosen.jquery.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $("#id_groups").chosen();
+</script>
 {% endblock %}

asadb/template/membership/thanks.html

-                      r1ed7e51
+                      r21ab6b3
 {% extends "base.html" %}
 {% block title %}Membership update &mdash; thanks{% endblock %}
+{% block title %}Membership update &ndash; thanks{% endblock %}
 {% block content %}
 <h2>Membership update &mdash; thanks</h2>
+<h2>Membership update &ndash; thanks</h2>
 <p>Thanks for confirming your group's activity. You should receive a confirmation email to your officer's list, and a copy of the anti-hazing law to your group list.</p>

asadb/template/membership/update.html

-                      r6e247d3
+                      r1a5ed66
 <h1>ASA Group Registration &amp; Anti-Hazing Form</h1>
+<h1>ASA Group Registration &amp; Anti-Hazing Form for <a href='{%url groups:group-detail group.pk%}'>{{group.name}}</a></h1>
 <p>The purpose of this electronic registration is for the ASA to determine which groups are still active and which are not. There are four components to this process:</p>
 …
 <h3><a name='components-membership'></a>3. Providing Membership Information</h3>
 <p>We are requiring that groups provide membership information &mdash; both membership numbers and a membership list. This information is important for our understanding of your group and ensuring that groups are meeting our membership standards. We will also share the membership numbers with the funding boards (GSC, UA, and LEF/ARCADE) for groups that apply to those sources. <strong>It is very important you are honest when answering these questions</strong>, even if you are concerned your membership does not meet our standards. We will provide time and support for groups to improve their student participation as needed &mdash; both in terms of number and proportion of students. Groups that are shown to be dishonest in this process, particularly with regards to meeting our standards, <strong>may have funding and space eligibility revoked or be suspended or derecognized</strong>.</p>
+<p>We are requiring that groups provide membership information &ndash; both membership definition and the corresponding numbers. This information is important for our understanding of your group and ensuring that groups are meeting our membership standards. We will also share the membership numbers with the funding boards (GSC, UA, and LEF/ARCADE) for groups that apply to those sources. <strong>It is very important you are honest when answering these questions</strong>, even if you are concerned your membership does not meet our standards. We will provide time and support for groups to improve their student participation as needed &ndash; both in terms of number and proportion of students. Groups that are shown to be dishonest in this process, particularly with regards to meeting our standards, <strong>may have funding and space eligibility revoked or be suspended or derecognized</strong>.</p>
 <dl>
 <dt>Minimum definition of member</dt><dd><p>For the purposes of this form, the minimum definition of membership you should use is people you would expect to confirm membership in your group (not that they all have to) and people that you consider to be regular or active members of your group. (You may be more stringent, based on how your group views or defines membership internally.) You must state the specific definition of membership you are using below. This does not need to be a membership definition that is in your constitution.</p></dd>
+<dt>Minimum definition of member</dt><dd><p>For the purposes of this form, the minimum definition of membership you use should include only people who (a) you would expect to confirm membership in your group (not that they all have to) if asked and (b) you consider to be regular or active members of your group. Members should satisfy both (a) and (b); you should not count members who satisfy only one or the other. (You may be more stringent, based on how your group views or defines membership internally.) You must state the specific definition of membership you are using below. This does not need to be a membership definition that is in your constitution.</p></dd>
+<dt>Privacy</dt><dd><p>The list of members you provide will not be shared. If we need to contact them we will contact your officer/exec list first &mdash; this would only be if we have concerns about the information provided or to spot-check the information provided. If feasible, we will ask your officer/exec list to contact your members directly.</p></dd>
+<dt>Recruitment</dt><dd><p>If you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers and a list soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.</p></dd>
+<dt>Recruitment</dt><dd><p>If you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.</p></dd>
 </dl>
 …
 <h3><a name='components-confirm'></a>4. Membership Confirmation</h3>
 <p>In addition to the membership info provided by you above, please have at least five student members confirm membership using the link below. You do not need to have everyone do this; we are simply looking for <em>five students'</em> confirmation. You can <a href='{% url membership-submitted %}'>see how many have confirmed already</a>.</p>
+<p>In addition to the membership info provided by you above, please have at least five student members confirm membership using the link below. You do not need to have everyone do this; we are simply looking for <em>five students'</em> confirmation. Once you submit this form, you will be able to <a href='{% url membership-submitted %}'>see how many have confirmed already</a>.</p>
 <p>Link to provide to members: <a href='{{confirm_uri}}'>{{confirm_uri}}</a>.</p>

asadb/template/space/group-change-email.txt

-                      rd768e47
+                      r72a3d90
 {% autoescape off %}Hi {{group.name}},
+    Thank you for updating space access on the ASA database today. We've forwarded the following changes on to CAC:
+Thank you for updating space access on the ASA database today. We are forwarding these changes to CAC, which generally updates access within one week. They will reply when the update has been done; if you don't get a reply, the message may have been lost and you should reply-all to this email reminding them.
+We believe you made the following changes:
 {% if office_msg %}

asadb/template/space/manage-access.html

-                      r78de8cb
+                      r1927d79
 {% extends "base.html" %}
 {% block title %}{{group.name}}: Office Access{% endblock %}
+{% block title %}{{group.name}}: Space Access{% endblock %}
 {% block content %}
 <h1>{{group.name}}: Office Access</h1>
+<h1>{{group.name}}: Space Access</h1>
 {% include "groups/group_tools.part.html" %}
 …
     <th>{{assignment.space}}</th>
     <td>
+        {% with assignment.space.lock_type as lock_type %}
+        {% if lock_type.db_update == "none" %}
+        <p><strong>Warning: Access to this office is not managed through the ASA DB.</strong></p>
+        <p><em><a href='{% url space-lock-type %}'>{{lock_type.name}}</a></em>: {{lock_type.description}}{% if lock_type.info_url %} <a href='{{lock_type.info_url}}'>Details.</a>{%endif%}</p>
+        <p>Contact <a href='mailto:{{lock_type.info_addr}}'>{{lock_type.info_addr}}</a> for more information.</p>
+        {% else %}
+        <p>We recommend managing access on the <a href='{% url groups:group-manage-officers group.id %}'>update people</a> page if possible. You should only need to use this page if:</p>
+        <ul>
+            <li>You need to grant access to somebody who does not have an Athena account, or</li>
+            <li>Your group has several offices, and somebody needs access to one or more of the offices, but should not have access to all of them</li>
+        </ul>
         <table class='pretty-table'>
             <tr>
 …
             </tr>{% endfor %}
         </table>
+        {% endif %}
+        {% endwith %}
     </td>
 </tr>

asadb/template/space/summary.html

-                      rde2f0ac
+                      rf6982d4
     <th>Room</th>
     <th>Group</th>
+    <th><a href='{% url space-lock-type %}'>Lock Type</a></th>
     <th>Access</th>
 </tr>
 …
     <td>{{office.space.number}}</td>
     <td><a href='{% url groups:group-detail office.group.pk %}'>{{office.group}}</a></td>
+    <td>{{office.space.lock_type.name}}</td>
     <td><a href='{% url groups:group-space-access office.group.pk %}'>Access</a></td>
 </tr>

asadb/urls.py

-                      rafc5348
+                      r88a856b
     ),
     url(r'^membership/submitted/$', forms.views.View_GroupMembershipList.as_view(), name='membership-submitted', ),
+    url(
+        r'^membership/admin/$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'membership/admin.html', 'extra_context': { 'pagename':'groups' }, },
+        name='membership-admin',
+    ),
+    url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
+    url(r'^membership/admin/$', forms.views.View_GroupConfirmationCyclesList.as_view(), name='membership-admin', ),
+    url(r'^membership/admin/issues/(?P<slug>[\w-]+).csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
+    url(r'^membership/people-lookup/((?P<pk>\d+)/)?$', forms.views.people_status_lookup, name='membership-people-lookup', ),
+    # Midway
+    url(r'^midway/$', forms.views.View_Midways.as_view(), name='midway-list', ),
+    url(r'^midway/latest/$', forms.views.midway_map_latest, name='midway-map-latest', ),
+    url(r'^midway/(?P<slug>[\w-]+)/$', forms.views.MidwayMapView.as_view(), name='midway-map', ),
+    url(r'^midway/(?P<slug>[\w-]+)/assign/$', forms.views.midway_assignment_upload, name='midway-assign', ),
     # Group list
 …
     url(r'^space/dump/office-access.csv$', space.views.dump_office_access, name='space-dump-office-access', ),
     url(r'^space/$', space.views.summary, name='space-summary', ),
+    url(r'^space/lock_types.html$', space.views.lock_types, name='space-lock-type', ),
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'

asadb/util/diff_static_data.sh

-                      rc060d8c
+                      r3c1b20b
 date
 cd static-data
+cd "$(dirname "$0")/static-data"
 ../dump_group_perms.py > group-perms.py
 …
 ../../manage.py dumpdata --format=xml --indent=4 groups.ActivityCategory > groups_initial_data.xml
 ../../manage.py dumpdata --format=xml --indent=4 forms.FYSMCategory > forms_initial_data.xml
+git add {groups,forms}_initial_data.xml
+../../manage.py dumpdata --format=xml --indent=4 space.LockType --format=xml --indent=4 > space_lock_types.xml
+git add {groups,forms}_initial_data.xml space_lock_types.xml
 echo

Context Navigation

Legend:

Download in other formats: