Implement additional requests in #305

This commit is contained in:
Adarnof
2016-03-23 03:47:24 +00:00
parent eaa44c0254
commit a425d32405
4 changed files with 184 additions and 58 deletions

View File

@@ -12,13 +12,11 @@
{% if not perms.auth.member %}
<h1 class="page-header text-center">Personal Applications
<div class="text-right">
<a href="{% url 'auth_hrapplication_create_view' %}">
{% if personal_app %}
<button type="button" class="btn btn-success" disabled>Create Application</button>
{% else %}
<button type="button" class="btn btn-success">Create Application</button>
{% endif %}
</a>
{% if create %}
<a href="{% url 'auth_hrapplication_create_view' %}"><button type="button" class="btn btn-success">Create Application</button></a>
{% else %}
<button type="button" class="btn btn-success" disabled>Create Application</button>
{% endif %}
</div>
</h1>
<table class="table table-bordered table-condensed">
@@ -67,40 +65,93 @@
</button>
</div>
</h1>
<div class="container-fluid">
<table class="table table-bordered">
<tr>
<th class="text-center">Application ID</th>
<th class="text-center">Username</th>
<th class="text-center">Main Character</th>
<th class="text-center">Corporation</th>
<th class="text-center">Status</th>
<th class="text-center">Actions</th>
</tr>
{% for app in applications %}
<tr>
<td class="text-center">{{ app.id }}</td>
<td class="text-center">{{ app.user.username }}</td>
<td class="text-center">{{ app.main_character }}</td>
<td class="text-center">{{ app.form.corp.corporation_name }}</td>
<td class="text-center">
{% if app.approved_denied == None %}
<div class="panel panel-warning" role="alert">Pending</div>
{% elif app.approved_denied == True %}
<div class="panel panel-success" role="alert">Approved</div>
{% else %}
<div class="panel panel-danger" role="alert">Rejected</div>
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
</a>
</td>
</tr>
{% endfor %}
</table>
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#pending">Pending</a></li>
<li><a data-toggle="tab" href="#reviewed">Reviewed</a></li>
</ul>
<div class="tab-content">
<div id="pending" class="tab-pane fade in active">
<div class="panel-body">
<table class="table">
<tr>
<th class="text-center">Date</th>
<th class="text-center">Username</th>
<th class="text-center">Main Character</th>
<th class="text-center">Corporation</th>
<th class="text-center">Status</th>
<th class="text-center">Actions</th>
</tr>
{% for app in applications %}
<tr>
<td class="text-center">{{ app.created }}</td>
<td class="text-center">{{ app.user.username }}</td>
<td class="text-center">{{ app.main_character }}</td>
<td class="text-center">{{ app.form.corp.corporation_name }}</td>
<td class="text-center">
{% if app.approved_denied == None %}
{% if app.reviewer_str %}
<div class="label label-info">Reviewer: {{ app.reviewer_str }}</div>
{% else %}
<div class="label label-warning">Pending</div>
{% endif %}
{% elif app.approved_denied == True %}
<div class="label label-success">Approved</div>
{% else %}
<div class="label label-danger">Rejected</div>
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
</a>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<div id="reviewed" class="tab-pane fade">
<div class="panel-body">
<table class="table">
<tr>
<th class="text-center">Date</th>
<th class="text-center">Username</th>
<th class="text-center">Main Character</th>
<th class="text-center">Corporation</th>
<th class="text-center">Status</th>
<th class="text-center">Actions</th>
</tr>
{% for app in finished_applications %}
<tr>
<td class="text-center">{{ app.created }}</td>
<td class="text-center">{{ app.user.username }}</td>
<td class="text-center">{{ app.main_character }}</td>
<td class="text-center">{{ app.form.corp.corporation_name }}</td>
<td class="text-center">
{% if app.approved_denied == None %}
{% if app.reviewer_str %}
<div class="label label-info">Reviewer: {{ app.reviewer_str }}</div>
{% else %}
<div class="label label-warning">Pending</div>
{% endif %}
{% elif app.approved_denied == True %}
<div class="label label-success">Approved</div>
{% else %}
<div class="label label-danger">Rejected</div>
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
</a>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
</div>
{% endif %}
</div>

View File

@@ -21,14 +21,53 @@
{% if app.reviewer_str %}
<div class="alert alert-info">Reviewer: {{ app.reviewer_str }}</div>
{% endif %}
{% for response in responses %}
<div class="panel panel-default">
<div class="panel-heading">{{ response.question.title }}</div>
<div class="alert">{{ response.answer }}</div>
</div>
{% endfor %}
</div>
<div class="row">
<div class="panel panel-info">
<div class="panel-heading">Applicant</div>
<table class="table">
<tr>
<th class="text-center">User</th>
<th class="text-center">Main Character</th>
</tr>
<tr>
<td class="text-center">{{ app.user }}</td>
<td class="text-center">{{ app.main_character }}</td>
</tr>
</table>
</div>
<div class="panel panel-info">
<div class="panel-heading">Characters</div>
<table class="table">
<tr>
<th class="text-center"></th>
<th class="text-center">Name</th>
<th class="text-center">Corp</th>
<th class="text-center">Alliance</th>
</tr>
{% for char in app.characters %}
<tr>
<td class="text-center">
<img class="ra-avatar img-responsive" src="https://image.eveonline.com/Character/{{ char.character_id }}_32.jpg">
</td>
<td class="text-center">{{ char.character_name }}</td>
<td class="text-center">{{ char.corporation_name }}</td>
<td class="text-center">{{ char.alliance_name }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<div class="row">
{% for response in responses %}
<div class="panel panel-default">
<div class="panel-heading">{{ response.question.title }}</div>
<div class="alert">{{ response.answer }}</div>
</div>
{% endfor %}
</div>
{% if buttons %}
<div class="row">
{% if perms.auth.human_resources %}
<div class="panel panel-primary">
<div class="panel-heading">Actions</div>
@@ -83,6 +122,7 @@
</div>
</div>
{% endif %}
</div>
{% endif %}
</div>
</div>