Add header and breadcrumbs to signed consent view

biocore · Sep 12, 2023 · f760139 · f760139
1 parent 799a6ce
commit f760139
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/microsetta_interface/implementation.py b/microsetta_interface/implementation.py
@@ -2086,14 +2086,20 @@ def get_consent_view(*, account_id=None, source_id=None, consent_type=None):
         False
     )
 
+    if consent_type == "biospecimen":
+        consent_type_display = "Biospecimen"
+    else:
+        consent_type_display = "Survey"
+
     return _render_with_defaults(
         'signed_consent.jinja2',
         account_id=account_id,
         source_id=source_id,
         source_age=source_output['consent']['age_range'],
         source_name=source_output['source_name'],
         consent=consent_output,
-        tl=consent_assets
+        tl=consent_assets,
+        consent_type_display=consent_type_display
     )
 
 

diff --git a/microsetta_interface/templates/consents.jinja2 b/microsetta_interface/templates/consents.jinja2
@@ -44,7 +44,7 @@
                                 <h2>{{ _('Survey') }}</h2>
                             </div>
                             <div class="consent-col col-end">
-                                <a href="/accounts/{{ account_id }}/sources/{{ source_id }}/consents/data/view" class="consent-link" target="_blank">
+                                <a href="/accounts/{{ account_id }}/sources/{{ source_id }}/consents/data/view" class="consent-link">
                                     <img src="/static/img/pdf.svg" height="20" width="20" class="me-1"/> {{ _('View') }}
                                 </a>
                             </div>
@@ -62,7 +62,7 @@
                                 <h2>{{ _('Biospecimen') }}</h2>
                             </div>
                             <div class="consent-col col-end">
-                                <a href="/accounts/{{ account_id }}/sources/{{ source_id }}/consents/biospecimen/view" class="consent-link" target="_blank">
+                                <a href="/accounts/{{ account_id }}/sources/{{ source_id }}/consents/biospecimen/view" class="consent-link">
                                     <img src="/static/img/pdf.svg" height="20" width="20" class="me-1"/> {{ _('View') }}
                                 </a>
                             </div>

diff --git a/microsetta_interface/templates/signed_consent.jinja2 b/microsetta_interface/templates/signed_consent.jinja2
@@ -1,14 +1,19 @@
 {% extends "sitebase.jinja2" %}
 {% set page_title = _("Consent") %}
-{% set show_breadcrumbs = False %}
-{% set hide_header = True %}
-{% set hide_footer = True %}
+{% set show_breadcrumbs = True %}
 {% block head %}
 {% endblock %}
 
+{% block breadcrumb %}
+    <li class="breadcrumb-item"><a href="/accounts/{{account_id}}">{{ _('Dashboard') }}</a></li>
+    <li class="breadcrumb-item"><a href="/accounts/{{account_id}}/sources/{{source_id}}">{{ _('My Profile') }}</a></li>
+    <li class="breadcrumb-item"><a href="/accounts/{{account_id}}/sources/{{source_id}}/consents">{{ _('Consent Documents') }}</a></li>
+    <li class="breadcrumb-item active" aria-current="page">{{ consent_type_display }}</li>
+{% endblock %}
 
 {% block content%}
 
+
 <div class="container default-container">