Removed unneeded lookups

hr/app_defines.py

@@ -1,4 +1,4 @@
-
+# Application Status Codes
 APPLICATION_STATUS_NOTSUBMITTED = 0
 APPLICATION_STATUS_AWAITINGREVIEW = 1
 APPLICATION_STATUS_REJECTED = 2
@@ -15,15 +15,7 @@ APPLICATION_STATUS_CHOICES = (
     (APPLICATION_STATUS_COMPLETED, 'Completed'),
 )
 
-APPLICATION_STATUS_LOOKUP = {
-    APPLICATION_STATUS_NOTSUBMITTED: 'Not Submitted',
-    APPLICATION_STATUS_AWAITINGREVIEW: 'Submitted',
-    APPLICATION_STATUS_REJECTED: 'Rejected',
-    APPLICATION_STATUS_ACCEPTED: 'Accepted',
-    APPLICATION_STATUS_QUERY: 'In Query',
-    APPLICATION_STATUS_COMPLETED: 'Completed',
-}    
-
+# Audit Event Type Codes
 AUDIT_EVENT_STATUSCHANGE = 0
 AUDIT_EVENT_NOTE = 1
 AUDIT_EVENT_REJECTION = 2
@@ -38,14 +30,7 @@ AUDIT_EVENT_CHOICES = (
     (AUDIT_EVENT_MESSAGE, 'Message to User'),
 )
 
-AUDIT_EVENT_LOOKUP = {
-    AUDIT_EVENT_STATUSCHANGE: 'Status Change',
-    AUDIT_EVENT_NOTE: 'Staff Note',
-    AUDIT_EVENT_REJECTION: 'Rejection Reason',
-    AUDIT_EVENT_ACCEPTED: 'Accepted',
-    AUDIT_EVENT_MESSAGE: 'Message to User',
-}
-
+# Blacklist Type Codes
 BLACKLIST_TYPE_REDDIT = 0
 BLACKLIST_TYPE_CHARACTER = 1
 BLACKLIST_TYPE_CORPORATION = 2

hr/models.py

@@ -111,8 +111,6 @@ class Audit(models.Model):
 
     date = models.DateTimeField(auto_now_add=True, verbose_name="Event Date")
 
-    def event_description(self):
-        return AUDIT_EVENT_LOOKUP[self.event]
 
 class Blacklist(models.Model):
     type = models.IntegerField(choices=BLACKLIST_TYPE_CHOICES,

templates/hr/applications/view.html

@@ -45,7 +45,7 @@
 <table>
 <tr><th>Event Type</th><th>Changed By</th><th>Changed Date</th><th>Event Details</th></tr>
 {% for a in audit %}
-<tr><td>{{ a.event_description }}</td><td>{{ a.user }}</td><td>{{ a.date }}</td><td>{{ a.text }}</td></tr>
+<tr><td>{{ a.get_event_display }}</td><td>{{ a.user }}</td><td>{{ a.date }}</td><td>{{ a.text }}</td></tr>
 {% endfor %}
 </table>
 {% endif %}