Changeset b8172c8

Timestamp:

Mar 28, 2013, 6:16:41 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

870992c

Parents:

5260840 (diff), c3a5618 (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@…> (03/28/13 06:16:41)

git-committer:

Alex Dehnert <adehnert@…> (03/28/13 06:16:41)

Message:

Merge branch 'midway'

• midway: 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 Add Midway map link to front page Allow sorting and filtering the midway page Sort imports more Basic list of groups at the midway WIP: midway page WIP: Midway

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/models.py (modified) (2 diffs)
• asadb/groups/views.py (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) (1 diff)
• asadb/util/diff_static_data.sh (modified) (1 diff)
• asadb/template/groups/create/startup_review.html (modified) (1 diff)

.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 @@
+import datetime
+import os, errno
+
 from django.conf import settings
 from django.db import models
-
-import datetime
-import os, errno
 
 import groups.models
@@ -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 util.emails
+import collections
+import csv
+import datetime
+import StringIO
 
 from django.conf import settings
@@ -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 #
+##########
+
+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):
+    assignments = FileField()
+
+@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/models.py

@@ -1 @@
-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 datetime
 import filecmp
@@ -16 +9 @@
 import urllib
 import urllib2
+
+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

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

asadb/template/index.html

@@ -44 +44 @@
         <li><a href='{%url fysm-select%}'>Submit an entry</a></li>
     </ul></li>
+    <li>Midway assignments: <a href='{% url midway-map-latest %}'>map</a></li>
     <li>Membership updates<ul>
         <li><a href='{%url membership-update-cycle %}'>Group update</a></li>

asadb/urls.py

@@ -73 +73 @@
     url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
 
+    # Midway
+    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/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>