Skip to content

Commit

Permalink
Merge pull request #346 from brisco17/#341-update-allocation-request-…
Browse files Browse the repository at this point in the history 
…flow

Ported Allocation Change Request features to Allocation Requests
  • Loading branch information
@aebruno
aebruno authored Jan 11, 2022
2 parents ffc13bc + cdc9575 commit 01e244a
Show file tree
Hide file tree
Showing 8 changed files with 178 additions and 36 deletions.
1 change: 1 addition & 0 deletions coldfront/core/allocation/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class AllocationUpdateForm(forms.Form):
description = forms.CharField(max_length=512,
label='Description',
required=False)
is_locked = forms.BooleanField(required=False)
is_changeable = forms.BooleanField(required=False)

def clean(self):
Expand Down
8 changes: 4 additions & 4 deletions coldfront/core/allocation/templates/allocation/allocation_change_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ <h3 class="d-inline"><i class="fas fa-list" aria-hidden="true"></i> Allocation I
<td>{{ allocation_change.allocation.description }}</td>
</tr>
<tr>
<th scope="row" class="text-nowrap">Created:</th>
<td>{{ allocation_change.allocation.created|date:"M. d, Y" }}</td>
<th scope="row" class="text-nowrap">Change Requested:</th>
<td>{{ allocation_change.created|date:"M. d, Y" }}</td>
</tr>
<tr>
<th scope="row" class="text-nowrap">Last Modified:</th>
<td>{{ allocation_change.allocation.modified|date:"M. d, Y" }}</td>
<th scope="row" class="text-nowrap">Change Last Modified:</th>
<td>{{ allocation_change.modified|date:"M. d, Y" }}</td>
</tr>
<tr>
{% if allocation_change.allocation.is_locked %}
Expand Down
10 changes: 9 additions & 1 deletion coldfront/core/allocation/templates/allocation/allocation_change_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
{% block content %}
<h2>Allocation Change Requests</h2>

<hr>

<p class="text-justify">
For each allocation change request below, there is the option to activate the allocation request and to view the allocation change's detail page.
If a change request is only for an extension to the allocation, they can be approved on this page. However if the change request includes changes to
the allocation's attributes, the request must be reviewed and acted upon in its detail page.
</p>

{% if allocation_change_list %}
<div class="table-responsive">
<table class="table table-sm">
Expand All @@ -30,7 +38,7 @@ <h2>Allocation Change Requests</h2>
{% for change in allocation_change_list %}
<tr>
<td>{{change.pk}}</td>
<td>{{ change.modified|date:"M. d, Y" }}</td>
<td>{{ change.created|date:"M. d, Y" }}</td>
<td><a href="{% url 'project-detail' change.allocation.project.pk %}">{{change.allocation.project.title|truncatechars:50}}</a></td>
<td>{{change.allocation.project.pi.first_name}} {{change.allocation.project.pi.last_name}}
({{change.allocation.project.pi.username}})</td>
Expand Down
48 changes: 40 additions & 8 deletions coldfront/core/allocation/templates/allocation/allocation_detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,24 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
<td>{{ allocation.modified|date:"M. d, Y" }}</td>
</tr>
<tr>
{% if allocation.is_locked %}
<th scope="row" class="text-nowrap">Locked</th>
<td><i class="fas fa-lock" aria-hidden="true"></i></td>
{% if request.user.is_superuser or request.user.is_staff %}
<th scope="row" class="text-nowrap">Lock/Unlock Allocation:</th>
<td>
{{ form.is_locked }}
</td>
{% else %}
<th scope="row" class="text-nowrap">Unlocked</th>
<td><i class="fas fa-lock-open" aria-hidden="true"></i></td>
{% if allocation.is_locked %}
<th scope="row" class="text-nowrap">Locked</th>
<td><i class="fas fa-lock" aria-hidden="true"></i></td>
{% else %}
<th scope="row" class="text-nowrap">Unlocked</th>
<td><i class="fas fa-lock-open" aria-hidden="true"></i></td>
{% endif %}
{% endif %}
</tr>
{% if request.user.is_superuser or request.user.is_staff %}
<tr>
<th scope="row" class="text-nowrap">Allow Change Requests</th>
<th scope="row" class="text-nowrap">Allow Change Requests:</th>
<td>
{{ form.is_changeable }}
</td>
Expand All @@ -146,8 +153,14 @@ <h3><i class="fas fa-list" aria-hidden="true"></i> Allocation Information</h3>
</table>
</div>
{% if request.user.is_superuser %}
<button type="submit" class="btn btn-success float-right"><i class="fas fa-sync" aria-hidden="true"></i> Update</button>
<div class="float-right">
{% if allocation.status.name == 'New' or allocation.status.name == 'Renewal Requested' %}
<a href="{% url 'allocation-activate-request' allocation.pk %}" class="btn btn-success mr-1 confirm-activate">Approve</a>
<a href="{% url 'allocation-deny-request' allocation.pk %}" class="btn btn-danger mr-1 confirm-deny">Deny</a>
{% endif %}
<button type="submit" class="btn btn-primary"><i class="fas fa-sync" aria-hidden="true"></i> Update</button>
{% endif %}
</div>
</form>
</div>
</div>
Expand Down Expand Up @@ -234,7 +247,7 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Alloc
<tbody>
{% for change_request in allocation_changes %}
<tr>
<td>{{ change_request.modified|date:"M. d, Y" }}</td>
<td>{{ change_request.created|date:"M. d, Y" }}</td>
{% if change_request.status.name == 'Approved' %}
<td class="text-success">{{ change_request.status.name }}</td>
{% elif change_request.status.name == 'Denied' %}
Expand Down Expand Up @@ -318,6 +331,13 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Users in Al
<div class="card-header">
<h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Notifications</h3>
<span class="badge badge-secondary">{{notes.count}}</span>
<div class="float-right">
{% if request.user.is_superuser %}
<a class="btn btn-success" href="{% url 'allocation-note-add' allocation.pk %}" role="button">
<i class="fas fa-plus" aria-hidden="true"></i> Add Notification
</a>
{% endif %}
</div>
</div>
<div class="card-body">
{% if notes %}
Expand Down Expand Up @@ -382,5 +402,17 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Notificatio
}
}
$(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' });
$(document).on('click', '.confirm-activate', function(){
var attributes_num = {{ attributes | length }};
if (attributes_num == 0) {
return confirm('Are you sure you want to activate this allocation request without setting any allocation attributes?');
}
})
$(document).on('click', '.confirm-deny', function(){
var notes_num = {{ notes | length }};
if (notes_num == 0) {
return confirm('Are you sure you want to deny this allocation request without setting a notification?');
}
})
</script>
{% endblock %}
23 changes: 23 additions & 0 deletions coldfront/core/allocation/templates/allocation/allocation_note_create.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "common/base.html" %}
{% load crispy_forms_tags %}
{% load common_tags %}
{% load static %}


{% block title %}
Add Allocation Notification
{% endblock %}


{% block content %}
<h2>Adding notification to {{allocation.get_parent_resource}} for PI {{ allocation.project.pi.first_name }}
{{ allocation.project.pi.last_name }} ({{ allocation.project.pi.username }})</h2>

<form method="post">
{% csrf_token %}
{{form |crispy}}
<input class="btn btn-success" type="submit" value="Add" />
<a class="btn btn-secondary" href="{% url 'allocation-detail' allocation.pk %}" role="button">Back to
Allocation</a><br>
</form>
{% endblock %}
30 changes: 24 additions & 6 deletions coldfront/core/allocation/templates/allocation/allocation_request_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,38 @@
{% block content %}
<h2>Allocation Requests</h2>

<hr>

<p class="text-justify">
For each allocation request below, there is the option to activate the allocation request and to view the allocation's detail page.
</p>

<p class="text-justify">
By default, activating an allocation will make it active for {{ ALLOCATION_DEFAULT_ALLOCATION_LENGTH }} days.
</p>

{% if allocation_list %}
<div class="table-responsive">
<table class="table table-sm">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Date Requested/<br>Last Modified</th>
<th scope="col">Requested</th>
<th scope="col">Project Title</th>
<th scope="col">PI</th>
<th scope="col">Resource</th>
{% if PROJECT_ENABLE_PROJECT_REVIEW %}
<th scope="col" class="text-nowrap">Project Review Status</th>
{% endif %}
<th scope="col">Status</th>
<th scope="col">Allocation Actions</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
{% for allocation in allocation_list %}
<tr>
<td><a href="{% url 'allocation-detail' allocation.pk %}">{{allocation.pk}}</a></td>
<td>{{ allocation.modified|date:"M. d, Y" }}</td>
<td>{{allocation.pk}}</td>
<td>{{ allocation.created|date:"M. d, Y" }}</td>
<td><a href="{% url 'project-detail' allocation.project.pk %}">{{allocation.project.title|truncatechars:50}}</a></td>
<td>{{allocation.project.pi.first_name}} {{allocation.project.pi.last_name}}
({{allocation.project.pi.username}})</td>
Expand All @@ -43,8 +53,13 @@ <h2>Allocation Requests</h2>
{% endif %}
<td>{{allocation.status}}</td>
<td class="text-nowrap">
<a href="{% url 'allocation-activate-request' allocation.pk %}" class="btn btn-success mr-1">Activate</a>
<a href="{% url 'allocation-deny-request' allocation.pk %}" class="btn btn-danger mr-1">Deny</a>
{% if allocation.get_information == '' %}
<a href="{% url 'allocation-activate-request' allocation.pk %}" class="btn btn-success mr-1 confirm-activate" aria-disabled="true">Approve</a>
<a href="{% url 'allocation-detail' allocation.pk %}" class="btn btn-primary mr-1">Details</a>
{% else %}
<a href="{% url 'allocation-activate-request' allocation.pk %}" class="btn btn-success mr-1">Activate</a>
<a href="{% url 'allocation-detail' allocation.pk %}" class="btn btn-primary mr-1">Details</a>
{% endif %}
</td>
</tr>
{% endfor %}
Expand All @@ -61,5 +76,8 @@ <h2>Allocation Requests</h2>
$("#navbar-main > ul > li.active").removeClass("active");
$("#navbar-admin").addClass("active");
$("#navbar-allocation-requests").addClass("active");
$(document).on('click', '.confirm-activate', function(){
return confirm('Are you sure you want to activate this allocation request without setting any allocation attributes?');
})
</script>
{% endblock %}
2 changes: 2 additions & 0 deletions coldfront/core/allocation/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
allocation_views.AllocationChangeView.as_view(), name='allocation-change'),
path('<int:pk>/allocationattribute/delete',
allocation_views.AllocationAttributeDeleteView.as_view(), name='allocation-attribute-delete'),
path('<int:pk>/allocationnote/add',
allocation_views.AllocationNoteCreateView.as_view(), name='allocation-note-add'),
path('allocation-invoice-list', allocation_views.AllocationInvoiceListView.as_view(),
name='allocation-invoice-list'),
path('<int:pk>/invoice/', allocation_views.AllocationInvoiceDetailView.as_view(),
Expand Down
Loading

0 comments on commit 01e244a

Please sign in to comment.