From 45d4ee926a79fdda9192383c102772082ff3564e Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 24 Feb 2011 17:14:33 +0000 Subject: [PATCH] Added "Flagged for Review" status --- hr/app_defines.py | 2 ++ templates/hr/applications/view.html | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hr/app_defines.py b/hr/app_defines.py index 041cb93..1576380 100644 --- a/hr/app_defines.py +++ b/hr/app_defines.py @@ -10,6 +10,7 @@ APPLICATION_STATUS_REJECTED = 2 APPLICATION_STATUS_ACCEPTED = 3 APPLICATION_STATUS_QUERY = 4 APPLICATION_STATUS_COMPLETED = 5 +APPLICATION_STATUS_FLAGGED = 6 APPLICATION_STATUS_CHOICES = ( (APPLICATION_STATUS_NOTSUBMITTED, 'Not Submitted'), @@ -18,6 +19,7 @@ APPLICATION_STATUS_CHOICES = ( (APPLICATION_STATUS_ACCEPTED, 'Accepted'), (APPLICATION_STATUS_QUERY, 'In Query'), (APPLICATION_STATUS_COMPLETED, 'Completed'), + (APPLICATION_STATUS_FLAGGED, 'Flagged For Review'), ) # Audit Event Type Codes diff --git a/templates/hr/applications/view.html b/templates/hr/applications/view.html index bfb00e9..735b6ce 100644 --- a/templates/hr/applications/view.html +++ b/templates/hr/applications/view.html @@ -29,7 +29,7 @@ Add Message {% if hrstaff %} Add Staff Note -{% if app.status < 2 or app.status = 4 %} +{% if app.status < 2 or app.status = 4 or app.status = 6 %} Reject Application {% ifequal app.blacklisted 0 %} Accept Application @@ -37,6 +37,9 @@ {% ifnotequal app.status 4 %} Mark as In Query {% endifnotequal %} +{% ifnotequal app.status 6 %} +Flag for Review +{% endifnotequal %} {% endif %} {% ifequal app.status 3 %} Mark as Complete