Changeset 1d85006

Timestamp:

Jul 31, 2011, 4:21:48 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

ee679c6

Parents:

3ffb210

git-author:

Alex Dehnert <adehnert@…> (07/31/11 04:08:48)

git-committer:

Alex Dehnert <adehnert@…> (07/31/11 04:21:48)

Message:

Add support for officers

Location:

asadb/groups

Files:

• admin.py (modified) (2 diffs)
• migrations/0002_add_officers.py (added)
• models.py (modified) (3 diffs)

asadb/groups/admin.py

@@ -19 +19 @@
     search_fields = [ 'id', 'name', 'abbreviation', 'officer_email', 'athena_locker', ]
 
+class OfficerRoleAdmin(VersionAdmin):
+    list_display = (
+        'id',
+        'display_name',
+        'slug',
+        'max_count',
+    )
+    list_display_links = ('id', 'display_name', 'slug', )
+    prepopulated_fields = {"slug": ("display_name",)}
+
+class OfficeHolderAdmin(VersionAdmin):
+    list_display = (
+        'id',
+        'person',
+        'role',
+        'group',
+        'start_time', 'end_time',
+    )
+    list_display_links = (
+        'id',
+        'person',
+        'role',
+        'group',
+        'start_time', 'end_time',
+    )
+    search_fields = (
+        'id',
+        'person',
+        'role__display_name', 'role__slug',
+        'group__name', 'group__abbreviation',
+        'start_time', 'end_time',
+    )
+
 class ActivityCategoryAdmin(admin.ModelAdmin):
     list_display = (
@@ -28 +61 @@
 admin.site.register(groups.models.Group, GroupAdmin)
 admin.site.register(groups.models.ActivityCategory, ActivityCategoryAdmin)
+admin.site.register(groups.models.OfficerRole, OfficerRoleAdmin)
+admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)

asadb/groups/models.py

@@ -1 +1 @@
 from django.db import models
+
+import datetime
 
 # Create your models here.
@@ -24 +26 @@
     updater = models.CharField(max_length=30) # match Django username field
 
+    def officers(self, role=None, person=None, as_of="now",):
+        """Get the set of people holding some office.
+
+        If None is passed for role, person, or as_of, that field will not
+        be constrained. If as_of is "now" (default) the status will be
+        required to be current. If any of the three parameters are set
+        to another value, the corresponding filter will be applied.
+        """
+        office_holders = OfficeHolder.objects.filter(group=self,)
+        if role:
+            if isinstance(role, str):
+                office_holders = office_holders.filter(role__slug=role)
+            else:
+                office_holders = office_holders.filter(role=role)
+        if person:
+            office_holders = office_holders.filter(person=person)
+        if as_of:
+            if as_of == "now": as_of = datetime.datetime.now()
+            office_holders = office_holders.filter(start_time__lte=as_of, end_time__gte=as_of)
+        return office_holders
+
     def __str__(self, ):
         return self.name
@@ -29 +52 @@
     class Meta:
         ordering = ('name', )
+
+
+class OfficerRole(models.Model):
+    UNLIMITED = 10000
+
+    display_name = models.CharField(max_length=50)
+    slug = models.SlugField()
+    description = models.TextField()
+    max_count = models.IntegerField(default=UNLIMITED, help_text='Maximum number of holders of this role. Use %d for no limit.' % UNLIMITED)
+
+    def __str__(self, ):
+        return self.display_name
+
+    @classmethod
+    def retrieve(cls, slug, ):
+        return cls.objects.get(slug=slug)
+
+
+class OfficeHolder(models.Model):
+    person = models.CharField(max_length=30)
+    role = models.ForeignKey('OfficerRole')
+    group = models.ForeignKey('Group')
+    start_time = models.DateTimeField(default=datetime.datetime.now)
+    end_time = models.DateTimeField(default=datetime.datetime.max)
+
+    def __str__(self, ):
+        return "<OfficeHolder: person=%s, role=%s, group=%s, start_time=%s, end_time=%s>" % (
+            self.person, self.role, self.group, self.start_time, self.end_time, )
+
+    def __repr__(self, ):
+        return str(self)
+
 
 class ActivityCategory(models.Model):