Skip to content

Commit 85ac52b

Browse files
madprimemadprime
committed
Further additions to activity page (not authed)
1 parent 4b04b05 commit 85ac52b

File tree

5 files changed

+92
-45
lines changed

5 files changed

+92
-45
lines changed

‎open_humans/templates/member/activity.html‎

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="flex-grow-1 mb-3">
1212
<div class="d-none d-sm-inline-block">
1313
<h1>{{ project.name }}</h1>
14-
{% include 'partials/activity-info-table-bs4.html' %}
14+
{% include 'partials/activity-info-short-bs4.html' %}
1515
</div>
1616
<div class="d-flex justify-content-center d-sm-none">
1717
<img class="w-25 m-2" src="{% static 'images/default-badge.png' %}">
@@ -20,7 +20,7 @@ <h1>{{ project.name }}</h1>
2020
<h1 class="justify-content-center">{{ project.name }}</h1>
2121
</div>
2222
<div class="d-flex justify-content-center d-sm-none">
23-
{% include 'partials/activity-info-table-bs4.html' %}
23+
{% include 'partials/activity-info-short-bs4.html' %}
2424
</div>
2525
</div>
2626
<div class="d-none d-sm-inline-block w-25">
@@ -44,23 +44,11 @@ <h2>Project membership</h2>
4444
You'll review terms and permissions before finalizing authorization.
4545
</div>
4646
</div>
47-
{% if project.request_username_access or project.requested_sources.exists %}
47+
{% if requests_permissions %}
4848
<h3>Permissions</h3>
49-
<div class="row">
50-
<div class="col">
51-
<b>Requested permissions:</b>
52-
</div>
53-
<div class="col">
54-
{% for source_project in project.requested_sources.all %}
55-
<a href="{% url 'activity-management' source_project.slug %}">
56-
{{ source_project.name }}</a><br>
57-
{% endfor %}
58-
{% if project.request_username_access %}
59-
Username
60-
{% endif %}
61-
</div>
62-
</div>
49+
{% include 'partials/activity-permissions-bs4.html' %}
6350
{% endif %}
51+
<hr class="d-md-none">
6452
</div>
6553
<div class="col-md">
6654
{% if requesting_projects %}
@@ -69,7 +57,7 @@ <h2>Projects &amp; studies</h2>
6957
You can use &amp; share your data from {{ project.name }} with the
7058
following other projects:
7159
</p>
72-
<div class="d-flex flex-wrap p-2 mb-2">
60+
<div class="d-flex flex-wrap p-2">
7361
{% for req_project in requesting_projects %}
7462
<div class="w-25">
7563
<div class="d-flex justify-content-center">
@@ -83,6 +71,7 @@ <h2>Projects &amp; studies</h2>
8371
</div>
8472
{% endfor %}
8573
</div>
74+
<hr>
8675
{% endif %}
8776
{% if notebooks %}
8877
<h2>Notebooks</h2>
@@ -95,9 +84,10 @@ <h2>Notebooks</h2>
9584
<li><a href="{{ notebook.details_url }}">{{ notebook.name }}</a></li>
9685
{% endfor %}
9786
</ul>
87+
<hr>
9888
{% endif %}
9989
<h2>Project Members</h2>
100-
<div class="d-flex">
90+
<div class="d-flex py-2">
10191
<div class="w-25">
10292
<div class="d-flex justify-content-center">
10393
<img src="{% static 'images/profile-placeholder.png' %}" style="height:2.5rem;">
@@ -134,17 +124,47 @@ <h2>Project Members</h2>
134124
</div>
135125
</div>
136126
</div>
137-
<p><a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See all members...</a></p>
127+
<p>
128+
<a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">See
129+
all members...</a>
130+
</p>
131+
<hr>
138132
<h2>Project information</h2>
139133
<div>
140-
<b>Managed by:</b>
141-
<div class="d-inline-block">
142-
{{ project.leader }}
143-
</div><br>
144-
<b>Contact email:</b> {{ project.contact_email }}<br>
145-
<b>Joined by:</b>
134+
{% include 'partials/activity-info-short-bs4.html' %}
135+
<div class="mb-1">
136+
<b class="mr-2">Joined by:</b>
146137
<a href="{% url 'api:members-by-source' %}?source={{ project.id_label }}">
147138
{{ project.authorized_members }} members</a>
139+
</div>
140+
<div class="mb-1">
141+
<b class="mr-2">Launched:</b> {{ project.project_approval_date|date }}
142+
</div>
143+
<div class="mb-1">
144+
<b class="mr-2">Project website:</b>
145+
<a href="{{ project.info_url }}">{{ project.info_url }}</a>
146+
</div>
147+
<div class="mb-1">
148+
<b class="mr-2">Contact email:</b>
149+
<a href="mailto:{{ project.contact_email }}">{{ project.contact_email }}</a>
150+
</div>
151+
<div class="mb-1">
152+
<b class="mr-2">Project terms:</b>
153+
<a href="{% if project.terms_url %}{{ project.terms_url }}{% else %}{{ project.info_url }}{% endif %}">Read here</a>
154+
</div>
155+
{% if requests_permissions %}
156+
{% include 'partials/activity-permissions-bs4.html' %}
157+
{% endif %}
158+
{% if project.returned_data_description %}
159+
<div class="d-flex mb-1">
160+
<div class="pr-3">
161+
<b>Uploaded&nbsp;data:</b>
162+
</div>
163+
<div class="text-muted">
164+
{{ project.returned_data_description }}
165+
</div>
166+
</div>
167+
{% endif %}
148168
</div>
149169
</div>
150170
</div>

‎open_humans/templates/partials/activity-info-short-bs4.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="d-flex mb-1">
2+
<div class="pr-3"><b>Managed by:</b></div>
3+
<div>
4+
{{ project.leader }}
5+
{% if project.organization %}
6+
<br><span class="text-muted">{{ project.organization}}</span>
7+
{% endif %}
8+
</div>
9+
</div>

‎open_humans/templates/partials/activity-info-table-bs4.html‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎open_humans/templates/partials/activity-permissions-bs4.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="d-flex mb-1">
2+
<div class="pr-3">
3+
<b>Requested permissions:</b>
4+
</div>
5+
<div>
6+
{% for source_project in project.requested_sources.all %}
7+
<a href="{% url 'activity-management' source_project.slug %}">
8+
{{ source_project.name }}</a><br>
9+
{% endfor %}
10+
{% if project.request_username_access %}
11+
Username
12+
{% endif %}
13+
</div>
14+
</div>
15+

‎open_humans/views.py‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,17 +314,33 @@ class ActivityView(NeverCacheMixin, DetailView):
314314
context_object_name = "project"
315315
template_name = "member/activity.html"
316316

317-
def get_context_data(self, *args, **kwargs):
318-
context = super().get_context_data(*args, **kwargs)
319-
context["requesting_projects"] = self.object.requesting_projects.filter(
320-
active=True
321-
).filter(approved=True)
317+
def get_notebooks(self):
322318
resp = requests.get(
323319
"https://exploratory.openhumans.org/notebook_by_source/",
324320
params={"source": self.object.name},
325321
)
326322
if resp.status_code == 200:
327-
context["notebooks"] = resp.json()["notebooks"]
323+
return resp.json()["notebooks"]
324+
325+
def get_context_data(self, *args, **kwargs):
326+
context = super().get_context_data(*args, **kwargs)
327+
328+
requesting_projects_filtered = self.object.requesting_projects.filter(
329+
active=True
330+
).filter(approved=True)
331+
requests_permissions = (
332+
self.object.request_username_access
333+
or self.object.requested_sources.exists()
334+
)
335+
336+
context.update(
337+
{
338+
"notebooks": self.get_notebooks(),
339+
"requesting_projects": requesting_projects_filtered,
340+
"requests_permissions": requests_permissions,
341+
}
342+
)
343+
328344
return context
329345

330346

0 commit comments

Comments
 (0)