Changeset 3c1b20b

Timestamp:

Jun 4, 2013, 3:40:41 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

6aa3517

Parents:

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

git-author:

Alex Dehnert <adehnert@…> (06/04/13 03:40:41)

git-committer:

Alex Dehnert <adehnert@…> (06/04/13 03:40:41)

Message:

Merge branch 'master' into space-access

• master: (43 commits) Color NGEs differently from inactive groups Don't add NGEs to asa-official (ASA-#231) Take is_active out of str(GroupStatus?) (ASA-#230) Add group status to account lookup (ASA-#203) Add help text about Athena lockername selection Sort the "Update people" page (partial ASA-#232) Sort the signatories page (partial ASA-#232) Sort the officers of a group (partial ASA-#232) Validate P/T usernames in group creation form Remove spurious slash in new group email (ASA-#217) Use absolute path to templates (ASA-#211) Show group status on the non-student officers page Prevent 500'ing while uploading midway assignments "Upload table assignments" link (ASA-#225) Add midway tab Add midway list page (ASA-#226) Handle duplicate groups Fix spelling of midway permission Add the midway permissions to the asa-ebm group Allow running diff_static_data from any directory ...

Conflicts:

asadb/space/admin.py

Files:

• .gitignore (modified) (1 diff)
• asadb/forms/admin.py (modified) (2 diffs)
• asadb/forms/migrations/0014_midway.py (added)
• asadb/forms/migrations/0015_midway_perms.py (added)
• asadb/forms/models.py (modified) (2 diffs)
• asadb/forms/views.py (modified) (4 diffs)
• asadb/groups/admin.py (modified) (4 diffs)
• asadb/groups/diffs.py (modified) (3 diffs)
• asadb/groups/listdiff.py (added)
• asadb/groups/models.py (modified) (5 diffs)
• asadb/groups/views.py (modified) (20 diffs)
• asadb/media/style/style.css (modified) (2 diffs)
• asadb/settings.py (modified) (1 diff)
• asadb/settings/local_settings.scripts.py (added)
• asadb/settings/local_settings_after.scripts.py (added)
• asadb/space/admin.py (modified) (4 diffs)
• asadb/template/base.html (modified) (1 diff)
• asadb/template/groups/account_lookup.html (modified) (2 diffs)
• asadb/template/groups/create/startup_review.html (modified) (1 diff)
• asadb/template/groups/diffs/new-group-announce.txt (modified) (1 diff)
• asadb/template/groups/group_change_main.html (modified) (1 diff)
• asadb/template/groups/group_list.html (modified) (1 diff)
• asadb/template/groups/reporting.html (modified) (2 diffs)
• asadb/template/groups/reporting/non-students.html (modified) (2 diffs)
• asadb/template/index.html (modified) (1 diff)
• asadb/template/midway/map.html (added)
• asadb/template/midway/upload.html (added)
• asadb/urls.py (modified) (3 diffs)
• asadb/util/admin.py (added)
• asadb/util/db_filters.py (added)
• asadb/util/diff_static_data.sh (modified) (1 diff)
• docs/install-on-scripts.txt (added)
• asadb/space/diffs.py (modified) (7 diffs)
• asadb/space/fixtures/LockTypes.xml (added)
• asadb/space/migrations/0005_add_lock_type.py (added)
• asadb/space/migrations/0006_lock_types_setup.py (added)
• asadb/space/models.py (modified) (1 diff)
• asadb/space/views.py (modified) (3 diffs)
• asadb/template/space/group-change-email.txt (modified) (1 diff)
• asadb/template/space/lock_types.html (added)
• asadb/template/space/manage-access.html (modified) (3 diffs)
• asadb/template/space/summary.html (modified) (2 diffs)

.gitignore

@@ -7 +7 @@
 asadb/media/fysm/slides/
 asadb/media/page-previews/fysm/
+asadb/media/midway/maps/
 asadb/util/saved-data/
 asadb/util/static-data/

asadb/forms/admin.py

@@ +1 @@
+from django.contrib import admin
+
 import forms.models
-from django.contrib import admin
 
 class FYSMAdmin(admin.ModelAdmin):
@@ -66 +67 @@
     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

@@ -1 @@
-from django.db import models
-
 import datetime
 import os, errno
 
-import settings
+from django.conf import settings
+from django.db import models
+
 import groups.models
 from util.misc import log_and_ignore_failures, mkdir_p
@@ -205 +205 @@
     def __unicode__(self, ):
         return "PersonMembershipUpdate for %s" % (self.username, )
+
+
+
+##########
+# 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

@@ -1 @@
-import forms.models
-import groups.models
-import groups.views
-import settings
-import util.emails
-
+import collections
+import csv
+import datetime
+import StringIO
+
+from django.conf import settings
 from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
 from django.core.exceptions import PermissionDenied
@@ -15 +15 @@
 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
@@ -22 +23 @@
 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
 
 #################
@@ -554 +558 @@
 
     return HttpResponse(buf.getvalue(), mimetype='text/csv', )
+
+
+
+##########
+# 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

@@ +1 @@
+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):
@@ -98 +104 @@
 
 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',
@@ -121 +142 @@
     list_filter = [
         'role',
+        OfficeHolderPeriodFilter,
     ]
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
@@ -188 +210 @@
     list_display_links = ( 'id', 'username', )
     search_fields = ( 'username', 'mit_id', 'first_name', 'last_name', 'account_class', )
+    list_filter = ( 'account_class', 'mutable', )
 admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)

asadb/groups/diffs.py

@@ -11 +11 @@
     os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.mail import EmailMessage, mail_admins
@@ -21 +22 @@
 
 import groups.models
-import settings
 import util.emails
 import util.mailinglist
@@ -244 +244 @@
 
 def default_active_pred():
-    status_objs = groups.models.GroupStatus.objects.filter(slug__in=['active', 'suspended', 'nge'])
+    status_objs = groups.models.GroupStatus.objects.filter(slug__in=['active', 'suspended', ])
     status_pks = [status.pk for status in status_objs]
     def pred(version, fields):

asadb/groups/models.py

@@ -1 @@
-from django.db import models
-from django.core.validators import RegexValidator
-from django.contrib.auth.models import User
-from django.template.defaultfilters import slugify
-import reversion
-
 import datetime
 import filecmp
@@ -16 +10 @@
 import urllib2
 
-import settings
+from django.conf import settings
+from django.db import models
+from django.core.validators import RegexValidator
+from django.contrib.auth.models import User
+from django.template.defaultfilters import slugify
+
+import reversion
 
 import mit
@@ -28 +28 @@
         )
 
-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):
@@ -98 +98 @@
             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
 
@@ -504 +505 @@
 
     def __str__(self, ):
-        active = ""
-        if not self.is_active:
-            active = " (inactive)"
-        return "%s%s" % (self.name, active, )
+        return self.name
 
     class Meta:

asadb/groups/views.py

@@ -4 +4 @@
 import csv
 import datetime
-
-import groups.models
 
 from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
@@ -30 +28 @@
 import django_filters
 
+import groups.models
 from util.db_form_utils import StaticWidget
+import util.db_filters
 from util.emails import email_from_template
 
@@ -129 +129 @@
         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 = [
@@ -221 +221 @@
 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()
 
@@ -573 +573 @@
     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, )
@@ -631 +631 @@
         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['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):
@@ -900 +907 @@
     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:
@@ -906 +919 @@
             'name',
             'abbreviation',
+            'officer_email',
             'activity_category',
             'group_class',
             'group_status',
             'group_funding',
+            'account_filter',
         ]
 
@@ -942 +957 @@
 @permission_required('groups.view_signatories')
 def view_signatories(request, ):
-    # TODO:
-    # * limit which columns (roles) get displayed
-    # This might want to wait for the generic reporting infrastructure, since
-    # I'd imagine some of it can be reused.
-
     the_groups = groups.models.Group.objects.all()
     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)
-    roles = groups.models.OfficerRole.objects.all()
+
+    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:
@@ -961 +976 @@
         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))
 
@@ -1007 +1022 @@
         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()
@@ -1100 +1115 @@
     )
 
+    special_fields_choices = (
+        ('option_entry', '<option> entry', ),
+    )
+    special_fields = forms.fields.MultipleChoiceField(
+        choices=special_fields_choices,
+        widget=forms.CheckboxSelectMultiple,
+        required=False,
+    )
+
     _format_choices = [
         ('html/inline',     "Web (HTML)", ),
@@ -1115 +1139 @@
             ('fields', {
                 'legend': 'Data to display',
-                'fields': ['basic_fields', 'people_fields', 'show_as_emails', ],
+                'fields': ['basic_fields', 'people_fields', 'show_as_emails', 'special_fields', ],
             }),
             ('final', {
@@ -1155 +1179 @@
         escaped = html.escape(email)
         return mark_safe("<a href='mailto:%s'>%s</a>" % (escaped, escaped))
+
+def format_option_entry(group):
+    name = html.escape(group.name)
+    return '<option value="%s">%s</option>' % (name, name, )
 
 reporting_html_formatters = {
@@ -1195 +1223 @@
         for field in people_fields:
             col_labels.append(field.display_name)
+
+        # Set up special fields
+        special_formatters = []
+        if 'option_entry' in form.cleaned_data['special_fields']:
+            col_labels.append('option_entry')
+            special_formatters.append(format_option_entry)
 
         # Assemble data
@@ -1207 +1241 @@
                 val = formatters[field](val)
             return val
+
         for group in qs:
             group_data = [fetch_item(group, field) for field in basic_fields]
@@ -1213 +1248 @@
                 if show_as_emails: people = ["%s@mit.edu" % p for p in people]
                 group_data.append(", ".join(people))
+
+            for formatter in special_formatters:
+                group_data.append(formatter(group))
 
             report_groups.append(group_data)
@@ -1228 +1266 @@
             writer = csv.writer(response)
             writer.writerow(col_labels)
-            for row in report_groups: writer.writerow(row)
+            for row in report_groups:
+                utf8_row = [unicode(cell).encode("utf-8") for cell in row]
+                writer.writerow(utf8_row)
             return response
 
@@ -1251 +1291 @@
     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
@@ -1257 +1297 @@
     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

@@ -234 +234 @@
 .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; }
@@ -254 +254 @@
     color: black;
 }
+.group-list-page tr.group-status-nge td.group-status
+{
+    background-color: #00ffff;
+    color: black;
+}
 
 

asadb/settings.py

@@ -121 +121 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    'template',
+    os.path.join(SITE_ROOT, 'template'),
 )
 

asadb/space/admin.py

@@ +1 @@
+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):
@@ -30 +33 @@
 
 class Admin_SpaceAssignment(admin.ModelAdmin):
+    class AssignmentPeriodFilter(util.admin.TimePeriodFilter):
+        start_field = 'start'
+        end_field = 'end'
+
     list_max_show_all = 500
     list_display = (
@@ -39 +46 @@
     )
     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',
@@ -52 +63 @@
     )
     list_display_links = list_display
+    list_filter = (AccessPeriodFilter, 'space', )
     search_fields = (
         'group__name', 'group__officer_email',

asadb/template/base.html

@@ -14 +14 @@
         <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/groups/account_lookup.html

@@ -17 +17 @@
     <th>Group</th>
     <td>{{group}}</td>
+</tr>
+<tr>
+    <th>Status</th>
+    <td>{{group.group_status}}</td>
 </tr>
 <tr>
@@ -46 +50 @@
 </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

@@ -14 +14 @@
 <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>

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

@@ -12 +12 @@
 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:

asadb/template/groups/group_change_main.html

@@ -9 +9 @@
 {% include "groups/group_tools.part.html" %}
 
-<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&amp;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>
+<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>
 
 {% if msg %}

asadb/template/groups/group_list.html

@@ -17 +17 @@
 
 <h2>The Groups</h2>
+
+<p>Found {{group_list|length}} groups:</p>
 
 <table class='pretty-table group-list'>

asadb/template/groups/reporting.html

@@ -7 +7 @@
 <h1>Reporting</h1>
 
-<h2>Results</h2>
+<div class='toolbox'>
+<h2>Sections</h2>
+<ul>
+<li><a href='#results'>Results</a></li>
+<li><a href='#config'>Configuration</a></li>
+</ul>
+</div>
+
+<h2><a name='results'></a>Results</h2>
 {% if run_report %}
+
+<p>Found {{report_groups|length}} groups:</p>
+
 <table class='pretty-table'>
 <thead>
@@ -27 +38 @@
 {% endif %}
 
-<h2>Configuration</h2>
+<h2><a name='config'></a>Configuration</h2>
 <form action="" method="get">
     {{ form|render }}

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

@@ -35 +35 @@
 <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>
@@ -41 +42 @@
 <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>

asadb/template/index.html

@@ -44 +44 @@
         <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>

asadb/urls.py

@@ +1 @@
+from django.conf import settings
 from django.conf.urls.defaults import *
 from django.contrib.auth.views import login, logout
@@ -6 +7 @@
 from django.contrib import admin
 admin.autodiscover()
-
-import settings
 
 import groups.urls
@@ -74 +73 @@
     url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
 
+    # 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
     (r'^groups/', include(groups.urls.urls(), ), ),

asadb/util/diff_static_data.sh

@@ -5 +5 @@
 date
 
-cd static-data
+cd "$(dirname "$0")/static-data"
 
 ../dump_group_perms.py > group-perms.py

asadb/space/diffs.py

@@ -8 +8 @@
     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
@@ -100 +103 @@
 
     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 effecting 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"
@@ -125 +142 @@
                         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):
@@ -177 +196 @@
 
 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:
@@ -200 +230 @@
         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]
@@ -267 +300 @@
     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)
@@ -274 +307 @@
 
     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

@@ -11 +11 @@
 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

@@ -90 +90 @@
         '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), )
@@ -112 +112 @@
         'locker_num',
         'group__name',
-    ).select_related('space', 'group')
+    ).select_related('space', 'space__lock_type', 'group')
     office_assignments = assignments.filter(locker_num='')
 
@@ -127 +127 @@
         '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/space/group-change-email.txt

@@ -1 +1 @@
 {% 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 [interval]. 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

@@ -1 +1 @@
 {% 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" %}
@@ -48 +48 @@
     <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>
@@ -67 +81 @@
             </tr>{% endfor %}
         </table>
+
+        {% endif %}
+        {% endwith %}
+
     </td>
 </tr>

asadb/template/space/summary.html

@@ -27 +27 @@
     <th>Room</th>
     <th>Group</th>
+    <th><a href='{% url space-lock-type %}'>Lock Type</a></th>
     <th>Access</th>
 </tr>
@@ -33 +34 @@
     <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>