Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[quick fix]: Fix user information in the "data access request" page. #2211

Merged
merged 3 commits into from
Mar 26, 2024
Merged

[quick fix]: Fix user information in the "data access request" page. #2211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6760ce2
change default access period to 365 days.
tompollard Mar 23, 2024
6be2fca
Quick fixes to template.
tompollard Mar 23, 2024
345b7de
Update the period of days in the test
tompollard Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions physionet-django/project/management/commands/test_accept_pending_requests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ def get_req(user, days_delta):
days=days_delta)
old_req.save()

# Create two access requests
# Args are (username, n) where n is
# the number of days granted access.
get_req('rgmark', 1)
get_req('aewj', 30)
get_req('aewj', 370)

# there are two access requests created above, plus one
# predefined in demo-project.json
# There should be 3 access requests in total
# (2 above, plus 1 in the fixtures)
self.assertEqual(DataAccessRequest.objects.count(), 3)
self.assertEqual(DataAccessRequest.objects.filter(
status=DataAccessRequest.PENDING_VALUE).count(), 3)
Expand All @@ -42,6 +45,5 @@ def get_req(user, days_delta):
requester=User.objects.get(username='aewj')).status,
DataAccessRequest.ACCEPT_REQUEST_VALUE)

# one of the two access requests above should be approved,
# plus one from demo-project.json
# There should be two users with access.
self.assertEqual(len(mail.outbox), 2)
2 changes: 1 addition & 1 deletion physionet-django/project/modelcomponents/access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class DataAccessRequest(models.Model):
REVOKED_VALUE: "revoked",
}

DATA_ACCESS_REQUESTS_DAY_LIMIT = 14
DATA_ACCESS_REQUESTS_DAY_LIMIT = 365

request_datetime = models.DateTimeField(auto_now_add=True)

Expand Down
356 changes: 217 additions & 139 deletions physionet-django/project/templates/project/data_access_request_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,147 +1,225 @@
{% extends "base.html" %}
{% load static %}
{% block title %}View Data Access Request{% endblock %}
{% block title %}Access Request{% endblock %}
{% block content %}
<div class="container col-md-8">
<h1>Data Access Request</h1>
<form action="" method="post">
{% csrf_token %}
<div class="modal-body">
<p>
The user
<a href="{% url 'public_profile' access_request.requester.username %}">
{{ access_request.requester.profile.first_names }}
{{ access_request.requester.profile.lastname }}</a>
requested access to {{ access_request.project.title }} on
{{ access_request.request_datetime|date }}.
</p>
<p>
{% if credentialing_data %}
<div>
<p>
Credentialing Application Date: {{ credentialing_data.application_datetime|date }}
</p>
<p>
Organization: {{ credentialing_data.organization_name }}
</p>
<p>
Location: {{ credentialing_data.city }}
{{ credentialing_data.country }}
</p>
<p>
Job Title: {{ credentialing_data.job_title }}
</p>
{% if credentialing_data.webpage %}
<p>
<a href="{{ credentialing_data.webpage }}">Webpage</a>
</p>
{% endif %}
</div>
{% elif legacy_credentialing_data %}
<div>
<p>
Country: {{ legacy_credentialing_data.country }}
</p>
<p>
MIMIC Approval Date: {{ legacy_credentialing_data.mimic_approval_date }}
</p>
</div>
{% else %}
{# should not happen #}
No credentialing information found for this user.
{% endif %}
</p>
<p>
The purpose of the data use was stated as
follows:
</p>
<div class="alert alert-secondary">
<h4>{{ access_request.data_use_title }}</h4>
<div style="height: 300px; overflow: scroll">{{ access_request.data_use_purpose|safe }}</div>
</div>
{% if access_request.is_pending %}
{{ response_form.media }}
{% include "descriptive_inline_form_snippet.html" with form=response_form %}
<button class="btn btn-primary"
name="data_access_response"
type="button"
data-toggle="modal"
data-target="#check-modal"
onclick="setCheckButtonText('{{ response_form.status.auto_id }}');">
<i class="fa fa-reply"></i>
Submit
Decision
</button>
{% elif access_request.is_accepted or access_request.is_rejected or access_request.is_revoked %}
{{ access_request.responder }} decided
{{ access_request.decision_datetime|date }}
to
{% if access_request.is_accepted or access_request.is_revoked %}
accept
{% else %}
not grant
{% endif %}
this request.<br>
{% if access_request.is_revoked %}
<strong>The access request was revoked.</strong>
{% endif %}
{% if access_request.responder_comments %}
The response was:
<hr />
<p>
{{ access_request.responder_comments|safe }}
</p>
<hr />
{% endif %}
{% elif access_request.is_withdrawn %}
The requester withdrew the request on the
{{ access_request.decision_datetime|date }}

<div class="container col-md-8">
<h1>Access Request</h1>

<p>You have received an access request for: {{ access_request.project.title }}.</p>

<h3>User Profile</h3>
<hr>
<div class="row mb-1">
<div class="col-md-3">
Name:
</div>
<div class="col-md-9">
{{ requester.profile.get_full_name }}
</div>
</div>
<div class="row mb-1">
<div class="col-md-3">
Account activated:
</div>
<div class="col-md-9">
{{ requester.is_active }}
</div>
</div>
<div class="row mb-1">
<div class="col-md-3">
Credentialed:
</div>
<div class="col-md-9">
{{ requester.is_credentialed }}
</div>
</div>
<div class="row mb-1">
<div class="col-md-3">
Date of request:
</div>
<div class="col-md-9">
{{ access_request.request_datetime|date }}
</div>
</div>
<div class="row mb-1">
<div class="col-md-3">
Affiliation:
</div>
<div class="col-md-9">
{% if requester.profile.affiliation %}
{{ requester.profile.affiliation }}
{% else %}
Not provided.
{% endif %}
</div>
</div>
<div class="row mb-1">
<div class="col-md-3">
Personal Website:
</div>
<div class="col-md-9">
{% if requester.profile.website %}
<a href="{{ profile.website }}" rel="nofollow">{{ requester.profile.website }}</a>
{% else %}
Not provided.
{% endif %}
</div>
</div>
{% for status, group in emails.items %}
<div class="row mb-1">
<div class="col-md-3">
Email ({{ status }}):
</div>
<div class="col-md-9">
{% for email in group %}
{{ email|join:", " }}
{% empty %}
N/A
{% endfor %}
</div>
</div>
{% endfor %}

<br>
<h3>Project Description</h3>
<hr>
<div class="alert alert-secondary">
<h4>{{ access_request.data_use_title }}</h4>
{{ access_request.data_use_purpose|safe }}
</div>

<br>
<h3>Training</h3>
<hr>
{% for status, course in training.items %}
<h4>{{ status }}</h4>
<ul>
{% for train in course %}
<li>
{{ train.training_type.name }}
</li>
{% empty %}
<li> N/A </li>
{% endfor %}
</ul>
{% endfor %}

<br />
<h3>Credentialing history</h3>
<hr>
<ul>
{% for cred_app in credentialing_data %}
<li><strong>Submitted on: {{ cred_app.application_datetime }}</strong><br />
Status: {{ cred_app.get_status_display }}
<br />
Reviewer:
{% if cred_app.responder %}
{{ cred_app.responder }}
{% else %}
N/A
{% endif %}
</li>
{% empty %}
<li>No applications found.</li>
{% endfor %}
</ul>

<br>
<h3>Approve or deny request</h3>
<hr>

<form action="" method="post">
{% csrf_token %}
<div class="modal-body">

{% if access_request.is_pending %}
{{ response_form.media }}
{% include "descriptive_inline_form_snippet.html" with form=response_form %}
<button class="btn btn-primary"
name="data_access_response"
type="button"
data-toggle="modal"
data-target="#check-modal"
onclick="setCheckButtonText('{{ response_form.status.auto_id }}');">
<i class="fa fa-reply"></i>
Submit
Decision
</button>
{% elif access_request.is_accepted or access_request.is_rejected or access_request.is_revoked %}
{{ access_request.responder }} decided
{{ access_request.decision_datetime|date }}
to
{% if access_request.is_accepted or access_request.is_revoked %}
accept
{% else %}
not grant
{% endif %}
<div class="modal fade"
id="check-modal"
tabindex="-1"
role="dialog"
aria-labelledby="check-modal"
aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Are you sure?</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-footer">
<button id="check-button-submit"
class="btn btn-danger"
name="data_access_response"
value="{{ access_request.id }}"
type="submit">
Yes
</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
</div>
this request.<br>
{% if access_request.is_revoked %}
<strong>The access request was revoked.</strong>
{% endif %}
{% if access_request.responder_comments %}
The response was:
<hr />
<p>
{{ access_request.responder_comments|safe }}
</p>
<hr />
{% endif %}
{% elif access_request.is_withdrawn %}
The requester withdrew the request on the
{{ access_request.decision_datetime|date }}
{% endif %}

<div class="modal fade"
id="check-modal"
tabindex="-1"
role="dialog"
aria-labelledby="check-modal"
aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Are you sure?</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-footer">
<button id="check-button-submit"
class="btn btn-danger"
name="data_access_response"
value="{{ access_request.id }}"
type="submit">
Yes
</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
</div>
</div>
</div>
<script type="application/javascript">
function setCheckButtonText(selector_id) {
var selector = document.querySelector("#" + selector_id);
var buttonText = "Yes, " + selector.options[selector
.selectedIndex]
.text;
</div>

document.querySelector('#check-button-submit').innerHTML =
buttonText;
}
</script>
</form>
<hr />
{% include "project/data_access_request_table_snippet.html" %}
<a href="{% url 'data_access_requests_overview' access_request.project.slug access_request.project.version %}">Requests overview</a>
</div>
{% endblock %}
{% block local_js_bottom %}
<script src="{% static 'custom/js/enable-tooltip.js' %}"></script>
<script src="{% static 'custom/js/resize-ck.js' %}"></script>
{% endblock %}
<script type="application/javascript">
function setCheckButtonText(selector_id) {
var selector = document.querySelector("#" + selector_id);
var buttonText = "Yes, " + selector.options[selector
.selectedIndex]
.text;

document.querySelector('#check-button-submit').innerHTML =
buttonText;
}
</script>
</form>

<hr />
{% include "project/data_access_request_table_snippet.html" %}
<a href="{% url 'data_access_requests_overview' access_request.project.slug access_request.project.version %}">Requests overview</a>
</div>

{% endblock %}
{% block local_js_bottom %}
<script src="{% static 'custom/js/enable-tooltip.js' %}"></script>
<script src="{% static 'custom/js/resize-ck.js' %}"></script>
{% endblock %}
Loading
Loading