Changeset 6ff04b1

Timestamp:

Mar 12, 2012, 6:55:19 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

0a0a96c

Parents:

a86a924

git-author:

Alex Dehnert <adehnert@…> (02/09/12 11:52:38)

git-committer:

Alex Dehnert <adehnert@…> (03/12/12 06:55:19)

Message:

Office access: allow viewing access

Location:

asadb

Files:

• groups/urls.py (modified) (2 diffs)
• space/models.py (modified) (3 diffs)
• space/views.py (modified) (1 diff)
• template/space/view-access.html (added)

asadb/groups/urls.py

@@ -2 +2 @@
 
 import groups.views
+import space.views
 
 group_patterns = patterns('',
@@ -8 +9 @@
     url(r'^edit/officers$', groups.views.manage_officers, name='group-manage-officers', ),
     url(r'^history/$', groups.views.GroupHistoryView.as_view(), name='group-manage-history', ),
+    url(r'^space/view/$', space.views.view_access, name='group-space-access', ),
 )
 

asadb/space/models.py

@@ -22 +22 @@
 reversion.register(Space)
 
+
+class CurrentAssignmentManager(models.Manager):
+    def get_query_set(self, ):
+        return super(CurrentAssignmentManager, self).get_query_set().filter(
+            start__lte=datetime.date.today,
+            end__gte=datetime.date.today,
+        )
+
 class SpaceAssignment(models.Model):
     END_NEVER       = datetime.datetime.max
@@ -33 +41 @@
     locker_num = models.CharField(max_length=10, blank=True, help_text='Locker number. If set, will use the "locker-access" OfficerRole to maintain access. If unset/blank, uses "office-access" and SpaceAccessListEntry for access.')
 
+    objects = models.Manager()
+    current = CurrentAssignmentManager()
+
     def expire(self, ):
         self.end_time = datetime.datetime.now()-self.EXPIRE_OFFSET
         self.save()
+
+    def is_locker(self, ):
+        return bool(self.locker_num)
+
+    def __unicode__(self, ):
+        return u"<SpaceAssignment group=%s space=%s locker=%s start=%s end=%s>" % (
+            self.group,
+            self.space,
+            self.locker_num,
+            self.start,
+            self.end,
+        )
+
+
+class CurrentACLEntryManager(models.Manager):
+    def get_query_set(self, ):
+        return super(CurrentACLEntryManager, self).get_query_set().filter(
+            start__lte=datetime.datetime.now,
+            end__gte=datetime.datetime.now,
+        )
 
 class SpaceAccessListEntry(models.Model):
@@ -48 +79 @@
     card_number = models.CharField(max_length=20)
 
+    objects = models.Manager()
+    current = CurrentACLEntryManager()
+
     def expire(self, ):
         self.end_time = datetime.datetime.now()-self.EXPIRE_OFFSET
         self.save()
+
+    def format_name(self, ):
+        return u"%s (%s)" % (self.name, self.card_number, )
+
+    def __unicode__(self, ):
+        return u"<SpaceAccessListEntry group=%s space=%s name=%s start=%s end=%s>" % (
+            self.group,
+            self.space,
+            self.name,
+            self.start,
+            self.end,
+        )

asadb/space/views.py

@@ -1 +1 @@
 # Create your views here.
+from django.contrib.auth.decorators import user_passes_test, login_required, permission_required
+from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.template import RequestContext, Context, Template
+from django.http import Http404, HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from django.core.mail import EmailMessage, mail_admins
+from django import forms
+from django.forms import ValidationError
+from django.db import connection
+from django.db.models import Q
+from django.utils.safestring import mark_safe
+
+import django_filters
+
+import groups.models
+import space.models
+
+def view_access(request, pk, ):
+    group = get_object_or_404(groups.models.Group, pk=pk)
+    if not request.user.has_perm('groups.admin_group', group):
+        raise PermissionDenied
+    office_access = group.officers(role='office-access')
+    locker_access = group.officers(role='locker-access')
+    assignments = space.models.SpaceAssignment.current.filter(group=group)
+    office_pairs = []
+    locker_pairs = []
+    for assignment in assignments:
+        entries = space.models.SpaceAccessListEntry.current.filter(group=group, space=assignment.space)
+        pair = (assignment, entries)
+        if assignment.is_locker():
+            locker_pairs.append(pair)
+        else:
+            office_pairs.append(pair)
+    context = {
+        'group': group,
+        'office': office_access,
+        'locker': locker_access,
+        'office_pairs': office_pairs,
+        'locker_pairs': locker_pairs,
+        'pagename':'group',
+    }
+    return render_to_response('space/view-access.html', context, context_instance=RequestContext(request), )