Sort completed HR apps by create date (most recent first) (#930)

This commit is contained in:
ghoti 2017-12-20 18:03:27 -05:00 committed by Adarnof
parent 1fe9d18a1a
commit 2c98cbd020

View File

@ -30,13 +30,14 @@ def hr_application_management_view(request):
base_app_query = Application.objects.select_related('user', 'form', 'form__corp') base_app_query = Application.objects.select_related('user', 'form', 'form__corp')
if request.user.is_superuser: if request.user.is_superuser:
corp_applications = base_app_query.filter(approved=None) corp_applications = base_app_query.filter(approved=None).order_by('-created')
finished_corp_applications = base_app_query.exclude(approved=None) finished_corp_applications = base_app_query.exclude(approved=None).order_by('-created')
elif request.user.has_perm('auth.human_resources') and main_char: elif request.user.has_perm('auth.human_resources') and main_char:
if ApplicationForm.objects.filter(corp__corporation_id=main_char.corporation_id).exists(): if ApplicationForm.objects.filter(corp__corporation_id=main_char.corporation_id).exists():
app_form = ApplicationForm.objects.get(corp__corporation_id=main_char.corporation_id) app_form = ApplicationForm.objects.get(corp__corporation_id=main_char.corporation_id)
corp_applications = base_app_query.filter(form=app_form).filter(approved=None) corp_applications = base_app_query.filter(form=app_form).filter(approved=None).order_by('-created')
finished_corp_applications = base_app_query.filter(form=app_form).filter(approved__in=[True, False]) finished_corp_applications = base_app_query.filter(form=app_form).filter(
approved__in=[True, False]).order_by('-created')
logger.debug("Retrieved %s personal, %s corp applications for %s" % ( logger.debug("Retrieved %s personal, %s corp applications for %s" % (
len(request.user.applications.all()), len(corp_applications), request.user)) len(request.user.applications.all()), len(corp_applications), request.user))
context = { context = {