Changeset de2f0ac

Timestamp:

Jan 2, 2013, 4:19:57 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

edb47bb

Parents:

c80e9a2

git-author:

Alex Dehnert <adehnert@…> (01/02/13 04:19:57)

git-committer:

Alex Dehnert <adehnert@…> (01/02/13 04:19:57)

Message:

Add space summary page (ASA-#119)

Location:

asadb

Files:

• space/views.py (modified) (1 diff)
• template/index.html (modified) (1 diff)
• template/space/summary.html (added)
• urls.py (modified) (1 diff)

asadb/space/views.py

@@ -106 +106 @@
     space.dump_office_access.print_info(response)
     return response
+
+def summary(request, ):
+    assignments = space.models.SpaceAssignment.current.order_by(
+        'space__number',
+        'locker_num',
+        'group__name',
+    ).select_related('space', 'group')
+    office_assignments = assignments.filter(locker_num='')
+
+    locker_assignments = assignments.exclude(locker_num='')
+    locker_rooms = []
+    room = None
+    for assignment in locker_assignments:
+        if room != assignment.space:
+            room = assignment.space
+            locker_rooms.append((room, []))
+        locker_rooms[-1][1].append(assignment)
+
+    context = {
+        'offices': office_assignments,
+        'lockers': locker_rooms,
+        'pagename':'group',
+    }
+    return render_to_response('space/summary.html', context, context_instance=RequestContext(request), )

asadb/template/index.html

@@ -56 +56 @@
         {%if perms.groups.recognize_nge %}<li><a href='{% url groups:recognize-nge %}'>Recognize Non-Group Entity</a></li>{%endif%}
     </ul></li>
-    {% if perms.groups.view_group_private_info %}<li>Space access<ul>
+    <li><a href='{% url space-summary %}'>Space assignments</a>
+        {% 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>
-    </ul></li>{% endif %}
+        </ul>
+        {% endif %}
+    </li>
     <li><a href='{% url about %}'>About the ASA Database</a><ul>
         <li><a href='{% url about-data %}'>Use of Data</a></li>

asadb/urls.py

@@ -80 +80 @@
     url(r'^space/dump/locker-access.csv$', space.views.dump_locker_access, name='space-dump-locker-access', ),
     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', ),
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs'