Changeset f6982d4

Timestamp:

Jan 29, 2013, 8:15:17 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

1484698

Parents:

e2ceffa

git-author:

Alex Dehnert <adehnert@…> (01/29/13 20:14:13)

git-committer:

Alex Dehnert <adehnert@…> (01/29/13 20:15:17)

Message:

Describe the lock types and list on space summary

• Create a page that displays the list of lock types, their descriptions, whether the DB handles them, etc.
• List the lock type next to each office on the space assignments page
• Link the lock types list from the homepage and the space assignments page

Location:

asadb

Files:

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

asadb/space/views.py

@@ -112 +112 @@
         'locker_num',
         'group__name',
-    ).select_related('space', 'group')
+    ).select_related('space', 'space__lock_type', 'group')
     office_assignments = assignments.filter(locker_num='')
 
@@ -130 +130 @@
     }
     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/index.html

@@ -57 +57 @@
     </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/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>

asadb/urls.py

@@ -81 +81 @@
     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'