Adding JOGL links and data to activity pages

This is currently "hidden" with a feature flag.

open_humans/fixtures/test-data.json

@@ -224,6 +224,7 @@
         "is_academic_or_nonprofit": false,
         "contact_email": "[email protected]",
         "info_url": "http://jimihendrix.com",
+	"jogl_page": "https://app.jogl.io/project/135",
         "short_description": "Really groovy music",
         "long_description": "Bork norps are coming!",
         "returned_data_description": "Lots of music",
@@ -253,6 +254,7 @@
         "is_academic_or_nonprofit": false,
         "contact_email": "[email protected]",
         "info_url": "https://en.wikipedia.org/wiki/Trance_music",
+	"jogl_page": "",
         "short_description": "List your five favorite trance tracks",
         "long_description": "Trance",
         "returned_data_description": "Lists of songs",
@@ -282,6 +284,7 @@
         "is_academic_or_nonprofit": false,
         "contact_email": "[email protected]",
         "info_url": "http://www.example.com",
+	"jogl_page": "",
         "short_description": "Some data",
         "long_description": "Some data, long description",
         "returned_data_description": "Stuff",

open_humans/templates/member/activity.html

@@ -1,5 +1,6 @@
 {% extends 'base-bs4.html' %}
 {% load static %}
+{% load waffle_tags %}
 {% load utilities %}
 
 {% block head_title %}{{ project.name }}{% endblock %}
@@ -55,6 +56,22 @@ <h2>About {{ project.name }}</h2>
       aria-selected="false">Data</a>
   </li>
   {% endif %}
+
+  {% flag "jogl_features" %}
+  {# JOGL news & needs tabs #}
+  {% if project.jogl_page %}
+  <li class="nav-item">
+    <a class="nav-link" id="activity-panel-news-tab" data-toggle="tab"
+      href="#activity-panel-news" role="tab" aria-controls="activity-panel-news"
+      aria-selected="false">News</a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" id="activity-panel-needs-tab" data-toggle="tab"
+      href="#activity-panel-needs" role="tab" aria-controls="activity-panel-needs"
+      aria-selected="false">Needs</a>
+  </li>
+  {% endif %}
+  {% endflag %}
 </ul>
 <div class="tab-content mt-3" id="myTabContent">
   <div class="tab-pane fade show active" id="activity-panel-info" role="tabpanel"
@@ -65,5 +82,22 @@ <h2>About {{ project.name }}</h2>
       aria-labelledby="activity-panel-data-tab">
     {% include 'partials/activity-panel-data.html' %}
   </div>
+
+  {% flag "jogl_features" %}
+  {# JOGL news & needs panels #}
+  {% if project.jogl_page %}
+  <script>
+    var joglURL = "{{ project.jogl_page }}";
+  </script>
+  <div class="tab-pane fade" id="activity-panel-news" role="tabpanel"
+      aria-labelledby="activity-panel-news-tab">
+    {% include 'partials/activity-panel-news.html' %}
+  </div>
+  <div class="tab-pane fade" id="activity-panel-needs" role="tabpanel"
+      aria-labelledby="activity-panel-needs-tab">
+    {% include 'partials/activity-panel-needs.html' %}
+  </div>
+  {% endif %}
+  {% endflag %}
 </div>
 {% endblock main %}

open_humans/templates/partials/activity-panel-info.html

@@ -1,4 +1,5 @@
 {% load static %}
+{% load waffle_tags %}
 {% load utilities %}
 {# the "info" panel on an activity page #}
 <div class="row">
@@ -194,6 +195,13 @@ <h3>
 
     {% endif %} {# / if project_member #}
 
+    {% flag "jogl_features" %}
+    {% if project.jogl_page %}
+    <div id="info-jogl-news">
+    </div>
+    {% endif %}
+    {% endflag %}
+
     <hr class="d-md-none">
   </div>
 
@@ -339,5 +347,13 @@ <h5 class="modal-title" id="termsModalTitle">{{ project.name}}: {% if project.is
       {# describe permissions and added data #}
       {% include 'partials/activity-permissions-bs4.html' %}
     </div>
+
+    {% flag "jogl_features" %}
+    {% if project.jogl_page %}
+    <div id="info-jogl-needs">
+    </div>
+    {% endif %}
+    {% endflag %}
+
   </div>
 </div>

open_humans/templates/partials/activity-panel-needs.html

@@ -0,0 +1,5 @@
+{% load static %}
+{% load utilities %}
+{# the "needs" panel on an activity page #}
+<div id="jogl-needs">
+</div>

open_humans/templates/partials/activity-panel-news.html

@@ -0,0 +1,5 @@
+{% load static %}
+{% load utilities %}
+{# the "news" panel on an activity page #}
+<div id="jogl-news">
+</div>

private_sharing/fixtures/test-data.json

@@ -11,6 +11,7 @@
     "is_academic_or_nonprofit": true,
     "contact_email": "[email protected]",
     "info_url": "https://beaugunderson.com/",
+    "jogl_page": "",
     "short_description": "abc",
     "long_description": "def",
     "active": true,
@@ -47,6 +48,7 @@
     "is_academic_or_nonprofit": true,
     "contact_email": "[email protected]",
     "info_url": "https://beaugunderson.com/",
+    "jogl_page": "https://app.jogl.io/project/135",
     "short_description": "def",
     "long_description": "ghk",
     "active": true,
@@ -81,6 +83,7 @@
     "is_academic_or_nonprofit": true,
     "contact_email": "[email protected]",
     "info_url": "https://beaugunderson.com/",
+    "jogl_page": "",
     "short_description": "abc3",
     "long_description": "def3",
     "active": true,

private_sharing/forms.py

@@ -43,6 +43,7 @@ class Meta:  # noqa: D101
             "erasure_supported",
             "deauth_email_notification",
             "requested_sources",
+            "jogl_page",
         )
 
     def __init__(self, *args, **kwargs):

private_sharing/migrations/0028_datarequestproject_jogl_page.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-07-16 22:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("private_sharing", "0027_oauth2datarequestproject_webhook_secret")]
+
+    operations = [
+        migrations.AddField(
+            model_name="datarequestproject",
+            name="jogl_page",
+            field=models.URLField(
+                blank=True, help_text="JOGL project page URL (optional)"
+            ),
+        )
+    ]

private_sharing/models.py

@@ -223,6 +223,9 @@ class DataRequestProject(models.Model):
         DataType, blank=True, related_name="source_projects"
     )
     any_datatypes = models.BooleanField(default=False)
+    jogl_page = models.URLField(
+        help_text="JOGL project page URL (optional)", blank=True
+    )
 
     class Meta:
         ordering = ["name"]