Changeset 89165c1

Timestamp:

Sep 15, 2013, 7:05:10 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

00ec3e4

Parents:

645ab74

git-author:

Alex Dehnert <adehnert@…> (09/15/13 06:42:50)

git-committer:

Alex Dehnert <adehnert@…> (09/15/13 07:05:10)

Message:

Track student status with moira "affiliation"

Moira recently added an "affiliation" field with information about whether a
person is student, staff, etc.. This changes the ASA DB to use that field by
default to determine student status. For some people with suppressed directory
information ("secret people"), however, affiliation will be "affiliate" but
should be "student". Those people can have their record changed to use a "loose
student" algorithm that considers somebody a student if their affiliation or
account class indicate that they're a student.

Location:

asadb

Files:

• groups/admin.py (modified) (2 diffs)
• groups/load_people.py (modified) (1 diff)
• groups/migrations/0029_athena_affiliation.py (added)
• groups/models.py (modified) (4 diffs)
• groups/views.py (modified) (1 diff)
• template/groups/reporting/non-students.html (modified) (1 diff)

asadb/groups/admin.py

@@ -203 +203 @@
         'last_name',
         'account_class',
+        'affiliation_basic',
+        'loose_student',
         'mutable',
         'add_date',
@@ -210 +212 @@
     list_display_links = ( 'id', 'username', )
     search_fields = ( 'username', 'mit_id', 'first_name', 'last_name', 'account_class', )
-    list_filter = ( 'account_class', 'mutable', )
+    list_filter = (
+        'account_class',
+        'affiliation_basic', 'affiliation_detailed',
+        'loose_student',
+        'mutable',
+    )
 admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)

asadb/groups/load_people.py

@@ -26 +26 @@
     'last_name',
     'account_class',
+    'affiliation_basic',
+    'affiliation_detailed',
 ]
 

asadb/groups/models.py

@@ -12 +12 @@
 from django.conf import settings
 from django.db import models
+from django.db.models import Q
 from django.core.validators import RegexValidator
 from django.contrib.auth.models import User
@@ -525 +526 @@
         return super(AthenaMoiraAccount_ActiveManager, self).get_query_set().filter(del_date=None)
 
+def student_account_classes():
+    year = datetime.datetime.now().year
+    return ["G"] + [str(yr) for yr in range(year-5, year+10)]
+
 class AthenaMoiraAccount(models.Model):
     username = models.CharField(max_length=8, unique=True, )
@@ -531 +536 @@
     last_name       = models.CharField(max_length=45)
     account_class   = models.CharField(max_length=10)
+    affiliation_basic       = models.CharField(max_length=10)
+    affiliation_detailed    = models.CharField(max_length=40)
+    loose_student   = models.BooleanField(default=False, help_text='Whether to use loose or strict determination of student status. Loose means that either the account class or the affiliation should indicate student status; strict means that the affiliation must be student. In general, we use strict; for some people ("secret people") directory information is suppressed and the affiliation will be misleading.')
     mutable         = models.BooleanField(default=True)
     add_date        = models.DateField(help_text="Date when this person was added to the dump.", )
@@ -540 +548 @@
 
     def is_student(self, ):
-        # XXX: Is this... right?
-        return self.account_class == 'G' or self.account_class.isdigit()
+        student_affiliation = (self.affiliation_basic == 'student')
+        student_class = (self.account_class in student_account_classes())
+        return student_affiliation or (student_class and self.loose_student)
+
+    @staticmethod
+    def student_q():
+        q_affiliation = Q(affiliation_basic='student')
+        q_class = Q(account_class__in=student_account_classes())
+        return q_affiliation | (q_class & Q(loose_student=True))
 
     def format(self, ):

asadb/groups/views.py

@@ -1294 +1294 @@
 def show_nonstudent_officers(request, ):
     student_roles  = groups.models.OfficerRole.objects.filter(require_student=True, )
-    year = datetime.datetime.now().year
-    account_classes = ["G"] + [str(yr) for yr in range(year-5, year+10)]
-    students = groups.models.AthenaMoiraAccount.active_accounts.filter(account_class__in=account_classes)
+    student_q = groups.models.AthenaMoiraAccount.student_q()
+    students = groups.models.AthenaMoiraAccount.active_accounts.filter(student_q)
     office_holders = groups.models.OfficeHolder.current_holders.order_by('group__name', 'role', )
     office_holders = office_holders.filter(role__in=student_roles)

asadb/template/groups/reporting/non-students.html

@@ -44 +44 @@
     <td>{{holder.group.group_status}}</td>
     <td>{{holder.role.display_name}}</td>
-    <td>{{holder.person}}</td>
+    <td>{% if perms.groups.change_athenamoiraaccount %}<a href='{% url admin:groups_athenamoiraaccount_changelist %}?username={{holder.person}}'>{{holder.person}}</a>{% else %}{{holder.person}}{% endif %}</td>
 </tr>
 {% endfor %}