Skip to content

Commit 83ebd8a

Browse files
committed
Report Tweaks
1 parent c273fae commit 83ebd8a

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

microsetta_interface/implementation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2694,7 +2694,7 @@ def example_endpoint():
26942694
def get_sample_results_experimental():
26952695
# use an arbitrary set of credentials
26962696
sample_output = {'account_id': 'NA',
2697-
'sample_barcode': '000004220',
2697+
'sample_barcode': '0363215283',
26982698
'sample_datetime': '2013-04-21T22:00:00',
26992699
'sample_edit_locked': False,
27002700
'sample_id': 'NA',

microsetta_interface/templates/new_results_page.jinja2

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,19 +478,24 @@
478478
span_id = "#dataset_links_builtenv";
479479
break;
480480
case "tmi-WGS-gut":
481+
// Temporary workaround - we're going to add the Hadza study to the info['qiita-study-ids'] variable and alter the label to be more appropriate. Remove this line and the following four lines once contextual studies for WGS gut samples are fully restored.
482+
label = '{{ _('The Microsetta Initiative and Comparative Studies') }}';
483+
span_id = "#dataset_links_tmi";
484+
info['qiita-study-ids'].push("11358");
485+
break;
481486
case "tmi-16S-gut":
482487
case "tmi-WGS-skin":
483488
case "tmi-16S-skin":
484489
label = '{{ _('The Microsetta Initiative') }}';
485490
span_id = "#dataset_links_tmi";
486491
break;
487492
case "multipop-16S-gut":
488-
case "multipop-WGS-gut":
493+
//case "multipop-WGS-gut":
489494
label = '{{ _('Microbiomes Across the World') }}';
490495
span_id = "#dataset_links_multipopgut";
491496
break;
492497
case "lifestage-16S-gut":
493-
case "lifestage-WGS-gut":
498+
//case "lifestage-WGS-gut":
494499
label = '{{ _('Microbiomes Across the Lifespan') }}';
495500
span_id = "#dataset_links_lifestagegut";
496501
break;
@@ -1294,6 +1299,12 @@
12941299
for (let i = 0; i < site_specific_elements.length; i++) {
12951300
site_specific_elements[i].style.display = "";
12961301
}
1302+
1303+
// Temporary workaround - we need to disable the Microbiome Map tab for WGS gut samples, overriding the site-specific content framework. Remove this line and the following four lines once contextual studies for WGS gut samples are fully restored.
1304+
if(state.dataset_site.value === "gut" && state.dataset_type.value === "WGS") {
1305+
document.getElementById("how_you_compare_microbiome_map").style.display = "none";
1306+
document.getElementById("microbial_map_li_element").style.display = "none";
1307+
}
12971308
}
12981309
12991310
//Called immediately after a tab is shown
@@ -1471,7 +1482,7 @@
14711482
<li class="nav-item">
14721483
<a class="nav-link" id="taxonomy-tab" data-bs-toggle="tab" href="#taxonomy" role="tab" aria-controls="taxonomy" aria-selected="false">{{ _('Composition') }}</a>
14731484
</li>
1474-
<li class="nav-item site_specific_content site_specific_content_gut">
1485+
<li class="nav-item site_specific_content site_specific_content_gut" id="microbial_map_li_element">
14751486
<a class="nav-link" id="microbial-map-tab" data-bs-toggle="tab" href="#microbial-map" role="tab" aria-controls="microbial-map" aria-selected="false">{{ _('Microbiome Map') }}</a>
14761487
</li>
14771488
<li class="nav-item">
@@ -1818,7 +1829,7 @@
18181829
18191830
<h4 style="color:black;">{{ _('Datasets used in your report') }}</h4>
18201831
<p>
1821-
{{ _('The results shown in the Microbiome Maps portion of the report relied on data from many different publically accessible microbiome datasets. These different datasets, and links to them, are listed below.') }}
1832+
{{ _('The results shown in the report relied on data from different publically accessible microbiome datasets. These different datasets, and links to them, are listed below.') }}
18221833
</p>
18231834
<div id='datasets-used'>
18241835
</div>

0 commit comments

Comments
 (0)