Skip to content

Commit

Permalink
Merge pull request #368 from ucb-rit/issue_361
Browse files Browse the repository at this point in the history 
Issue 361 - request hub
  • Loading branch information
@matthew-li
matthew-li authored Mar 7, 2022
2 parents c3bfec5 + 8a37e67 commit 574f8be
Show file tree
Hide file tree
Showing 25 changed files with 1,886 additions and 597 deletions.
135 changes: 4 additions & 131 deletions coldfront/core/allocation/templates/allocation/allocation_cluster_account_request_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,136 +82,9 @@ <h1>Cluster Access Requests</h1>

{% if cluster_account_list %}
<div class="table-responsive">
<table class="table table-sm">
<thead>
<tr>
<th scope="col">
#
<a href="?order_by=id&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=id&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Date Requested/<br>Last Modified
<a href="?order_by=created&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=created&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
User Email
<a href="?order_by=allocation_user__user__email&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation_user__user__email&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Cluster Username
<a href="?order_by=allocation_user__user__username&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation_user__user__username&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Project
<a href="?order_by=allocation__project__name&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation__project__name=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Allocation
</th>
<th scope="col">
Status
</th>
{% if user.is_superuser and request_filter == 'pending' %}
<th scope="col">
Allocation Actions
</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for cluster_account in cluster_account_list %}
<tr>
<td>{{ cluster_account.pk }}</td>
<td>{{ cluster_account.modified|date:"M. d, Y" }}</td>
<td>{{ cluster_account.allocation_user.user.email }}</td>
<td>
{% if cluster_account.allocation_user.user.userprofile.cluster_uid %}
{{ cluster_account.allocation_user.user.username }}
{% else %}
<span class="badge badge-danger">
No cluster account.
</span>
{% endif %}
</td>
<td>
<a href="{% url 'project-detail' cluster_account.allocation.project.pk %}">
{{ cluster_account.allocation.project.name }}
</a>
</td>
<td>
<a href="{% url 'allocation-detail' cluster_account.allocation.pk %}">
<span class="accessibility-link-text">Allocation {{ allocation.pk }}</span>
{{ cluster_account.allocation.pk }}
</a>
</td>
<td>
{% with status=cluster_account.value %}
{% if status == "Pending - Add" %}
<span class="badge badge-warning">Pending</span>
{% elif status == "Processing" %}
<span class="badge badge-warning">{{ status }}</span>
{% elif status == "Active" %}
<span class="badge badge-success">{{ status }}</span>
{% elif status == "Denied" %}
<span class="badge badge-danger">{{ status }}</span>
{% endif %}
{% endwith %}
</td>
{% if user.is_superuser and request_filter == 'pending' %}
<td class="text-nowrap">
{% if cluster_account.value == "Pending - Add" %}
<a href="{% url 'allocation-cluster-account-update-status' cluster_account.pk %}" class="btn btn-success mr-1">
Activate
</a>
{% else %}
<a href="{% url 'allocation-cluster-account-activate-request' cluster_account.pk %}" class="btn btn-success mr-1">
Activate
</a>
{% endif %}
<div class="modal fade" id="denial{{ cluster_account.pk }}Modal" tabindex="-1" role="dialog" aria-labelledby="denial{{ cluster_account.pk }}ModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<form action="{% url 'allocation-cluster-account-deny-request' cluster_account.pk %}" method="get" id="denial{{ cluster_account.pk }}Form">
{% csrf_token %}
<div class="modal-content">
<div class="modal-header">
<p class="modal-title">Deny Request</p>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

<div class="modal-body">
<label>Are You Sure?</label>

<br><b>User:</b> {{ cluster_account.allocation_user.user.email }}
<br><b>Project:</b> {{ cluster_account.allocation.project.name }}
<br><b>Allocation:</b> {{ cluster_account.allocation.pk }}
</div>

<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button class="btn btn-danger mr-1" type="submit">
Yes, deny this request.
</button>
</div>
</div>
</form>
</div>
</div>
<button class="btn btn-danger mr-1" data-toggle="modal" data-target="#denial{{ cluster_account.pk }}Modal">
Deny
</button>
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
{% with queryset=cluster_account_list actions_visible=actions_visible %}
{% include 'allocation/allocation_cluster_account_request_list_table.html' %}
{% endwith %}
{% if is_paginated %} Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}
<ul class="pagination float-right mr-3">
{% if page_obj.has_previous %}
Expand All @@ -229,7 +102,7 @@ <h1>Cluster Access Requests</h1>
</div>
{% else %}
<div class="alert alert-info">
No new or pending cluster account requests!
No new or pending cluster access requests!
</div>
{% endif %}

Expand Down
130 changes: 130 additions & 0 deletions ...t/core/allocation/templates/allocation/allocation_cluster_account_request_list_table.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<table class="table table-sm">
<thead>
<tr>
<th scope="col">
#
<a href="?order_by=id&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=id&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Date Requested/<br>Last Modified
<a href="?order_by=created&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=created&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
User Email
<a href="?order_by=allocation_user__user__email&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation_user__user__email&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Cluster Username
<a href="?order_by=allocation_user__user__username&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation_user__user__username&direction=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Project
<a href="?order_by=allocation__project__name&direction=asc&{{filter_parameters}}"><i class="fas fa-sort-up"></i></a>
<a href="?order_by=allocation__project__name=des&{{filter_parameters}}"><i class="fas fa-sort-down"></i></a>
</th>
<th scope="col">
Allocation
</th>
<th scope="col">
Status
</th>
{% if user.is_superuser and actions_visible %}
<th scope="col">
Allocation Actions
</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for cluster_account in queryset %}
<tr>
<td>{{ cluster_account.pk }}</td>
<td>{{ cluster_account.modified|date:"M. d, Y" }}</td>
<td>{{ cluster_account.allocation_user.user.email }}</td>
<td>
{% if cluster_account.allocation_user.user.userprofile.cluster_uid %}
{{ cluster_account.allocation_user.user.username }}
{% else %}
<span class="badge badge-danger">
No cluster account.
</span>
{% endif %}
</td>
<td>
<a href="{% url 'project-detail' cluster_account.allocation.project.pk %}">
{{ cluster_account.allocation.project.name }}
</a>
</td>
<td>
<a href="{% url 'allocation-detail' cluster_account.allocation.pk %}">
<span class="accessibility-link-text">Allocation {{ allocation.pk }}</span>
{{ cluster_account.allocation.pk }}
</a>
</td>
<td>
{% with status=cluster_account.value %}
{% if status == "Pending - Add" %}
<span class="badge badge-warning">Pending</span>
{% elif status == "Processing" %}
<span class="badge badge-warning">{{ status }}</span>
{% elif status == "Active" %}
<span class="badge badge-success">{{ status }}</span>
{% elif status == "Denied" %}
<span class="badge badge-danger">{{ status }}</span>
{% endif %}
{% endwith %}
</td>
{% if user.is_superuser and actions_visible %}
<td class="text-nowrap">
{% if cluster_account.value == "Pending - Add" %}
<a href="{% url 'allocation-cluster-account-update-status' cluster_account.pk %}" class="btn btn-success mr-1">
Activate
</a>
{% else %}
<a href="{% url 'allocation-cluster-account-activate-request' cluster_account.pk %}" class="btn btn-success mr-1">
Activate
</a>
{% endif %}
<div class="modal fade" id="denial{{ cluster_account.pk }}Modal" tabindex="-1" role="dialog" aria-labelledby="denial{{ cluster_account.pk }}ModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<form action="{% url 'allocation-cluster-account-deny-request' cluster_account.pk %}" method="get" id="denial{{ cluster_account.pk }}Form">
{% csrf_token %}
<div class="modal-content">
<div class="modal-header">
<p class="modal-title">Deny Request</p>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>

<div class="modal-body">
<label>Are You Sure?</label>

<br><b>User:</b> {{ cluster_account.allocation_user.user.email }}
<br><b>Project:</b> {{ cluster_account.allocation.project.name }}
<br><b>Allocation:</b> {{ cluster_account.allocation.pk }}
</div>

<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button class="btn btn-danger mr-1" type="submit">
Yes, deny this request.
</button>
</div>
</div>
</form>
</div>
</div>
<button class="btn btn-danger mr-1" data-toggle="modal" data-target="#denial{{ cluster_account.pk }}Modal">
Deny
</button>
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
2 changes: 2 additions & 0 deletions coldfront/core/allocation/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,8 @@ def get_context_data(self, **kwargs):

context['cluster_account_list'] = cluster_accounts

context['actions_visible'] = not self.completed

return context


Expand Down
76 changes: 3 additions & 73 deletions coldfront/core/project/templates/project/project_allocation_addition/request_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,79 +36,9 @@ <h1>{{ request_filter|title }} Service Units Purchase Requests</h1>

{% if addition_request_list %}
<div class="table-responsive">
<table class="table table-sm">
<thead>
<tr>
<th scope="col">
#
<a href="?order_by=id&direction=asc&{{filter_parameters}}">
<i class="fas fa-sort-up"></i>
</a>
<a href="?order_by=id&direction=des&{{filter_parameters}}">
<i class="fas fa-sort-down"></i>
</a>
</th>
<th scope="col">
Date Requested/<br>Last Modified
<a href="?order_by=modified&direction=asc&{{filter_parameters}}">
<i class="fas fa-sort-up"></i>
</a>
<a href="?order_by=modified&direction=des&{{filter_parameters}}">
<i class="fas fa-sort-down"></i>
</a>
</th>
<th scope="col">
Requester Email
<a href="?order_by=requester__email&direction=asc&{{filter_parameters}}">
<i class="fas fa-sort-up"></i>
</a>
<a href="?order_by=requester__email&direction=des&{{filter_parameters}}">
<i class="fas fa-sort-down"></i>
</a>
</th>
<th scope="col">
Project
<a href="?order_by=project&direction=asc&{{filter_parameters}}">
<i class="fas fa-sort-up"></i>
</a>
<a href="?order_by=project&direction=des&{{filter_parameters}}">
<i class="fas fa-sort-down"></i>
</a>
</th>
<th scope="col">Number of Service Units</th>
<th scope="col">Status</th>
</tr>
</thead>
<tbody>
{% for addition_request in addition_request_list %}
<tr>
<td>
<a href="{% url 'service-units-purchase-request-detail' addition_request.pk %}">
<span class="accessibility-link-text">
Request {{ addition_request.pk }}
</span>
{{ addition_request.pk }}
</a>
</td>
<td>{{ addition_request.modified|date:"M. d, Y" }}</td>
<td>{{ addition_request.requester.email }}</td>
<td>{{ addition_request.project.name }}</td>
<td>{{ addition_request.num_service_units }}</td>
<td>
{% with status=addition_request.status.name %}
{% if status == 'Under Review' %}
<span class="badge badge-warning">{{ status }}</span>
{% elif status == 'Complete' %}
<span class="badge badge-success">{{ status }}</span>
{% else %}
<span class="badge badge-danger">{{ status }}</span>
{% endif %}
{% endwith %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% with queryset=addition_request_list %}
{% include 'project/project_allocation_addition/request_list_table.html' %}
{% endwith %}
</div>
{% else %}
<div class="alert alert-info">
Expand Down
Loading

0 comments on commit 574f8be

Please sign in to comment.