Changeset 7d7801f

Timestamp:

Mar 17, 2013, 6:58:58 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

cf509c0

Parents:

d848b98

git-author:

Alex Dehnert <adehnert@…> (03/17/13 06:58:58)

git-committer:

Alex Dehnert <adehnert@…> (03/17/13 06:58:58)

Message:

WIP: midway page

Files:

• .gitignore (modified) (1 diff)
• asadb/forms/views.py (modified) (4 diffs)
• asadb/template/midway/upload.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/views.py

@@ -23 +23 @@
 from django.db.models import Q, Count
 
+import collections
 import csv
 import datetime
@@ -576 +577 @@
         assignments = forms.models.MidwayAssignment.objects.filter(midway=midway)
         context['assignments'] = assignments
+        context['pagename'] = 'midway'
 
         return context
@@ -587 +589 @@
     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
-            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)'
+                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
@@ -598 +629 @@
         'midway':midway,
         'form':form,
+        'uploaded': uploaded,
+        'found': found,
+        'issues': dict(issues),
+        #'issues': issues,
         'pagename':'midway',
     }

asadb/template/midway/upload.html

@@ -3 +3 @@
 {% block title %}ASA: {{midway.name}}: upload assignments{% endblock %}
 {% block content %}
-<h2>{{midway.name}}: upload assignments</h2>
+<h1>{{midway.name}}: upload assignments</h1>
+
+{% if uploaded %}
+<h2>Results</h2>
+
+<h3>New entries added ({{found|length}})</h3>
+
+<table class='pretty-table'>
+<tr>
+    <th>Group</th>
+    <th>Table</th>
+</tr>
+{% for assignment in found %}
+<tr>
+    <th>{{assignment.group}}</th>
+    <td>{{assignment.location}}</td>
+</tr>
+{% endfor %}
+</table>
+
+{% for issue, cases in issues.items %}
+<h3>Issue: {{issue}} ({{cases|length}})</h3>
+<table class='pretty-table'>
+<tr>
+    <th>Name</th>
+    <th>Email</th>
+    <th>Table</th>
+</tr>
+{% for name, email, table in cases %}
+<tr>
+    <th>{{name}}</th>
+    <td>{{email}}</td>
+    <td>{{table}}</td>
+</tr>
+{% endfor %}
+</table>
+{% endfor %}
+
+<!-- end of results -->
+{% endif %}
+
+<h2>Input</h2>
 
 <form enctype="multipart/form-data" method="post" action="">