Skip to content

Commit 934599e

Browse files
committed
Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into sprint-13-sp
2 parents aa50bee + 8c005fd commit 934599e

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

static/css/search.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ tr {
303303
word-wrap: break-word; }
304304

305305

306-
#studies_table_head th studies_table td {
306+
#studies_table_head th, #studies_table td {
307307
word-break: break-word; }
308308
#studies_table_head th.project-name, th.case-id, th.study-id,
309309
#studies_table td.project-name, td.case-id, td.study-id {

static/js/explore.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,16 @@ require([
170170
});
171171

172172
tippy('.tooltip_filter_info',{
173-
content: 'Each chart below reports the number of cases (or patients) for all attributes within a given attribute '+
174-
'category for the cohort constructed by the defined filter. For certain categories (i.e. Modality) some '+
175-
'cases may apply to several attributes within the category. Hence some attributes that seem to be excluded '+
176-
'in the filter definition may have positive case counts.',
173+
content: 'Each chart below reports the number of cases (or patients) for all values within a given attribute. '+
174+
'For certain attributes (e.g. Modality) several distinct values may apply to the same case.',
177175
theme: 'light',
178176
placement: 'right-end',
179177
arrow: false
180178
});
181179

182180
tippy('.tooltip_chart_info',{
183-
content: 'The panel below reports the number of unique cases (or patients) for each attribute within a cohort '+
184-
'constructed by adding the given attribute (when absent) to the defined filter.',
181+
content: 'Counts shown below are the number of cases (or patients) for each attribute value. Counts for each attribute (e.g. Modality) '+
182+
'are unchanged by the values (e.g. PET) selected (checked) for that attribute. They only change based on the values selected for all other attributes.',
185183
theme: 'light',
186184
placement: 'right-end',
187185
arrow: false

static/js/image_search.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2454,7 +2454,6 @@ require([
24542454
}
24552455

24562456
var addSliders = function(id){
2457-
24582457
$('#'+id).find('.list-group-item__body').each(function(){
24592458
$(this).find('.more-checks').addClass('hide');
24602459
$(this).find('.less-checks').addClass('hide');
@@ -2471,7 +2470,7 @@ require([
24712470
max = 100;
24722471
} */
24732472
//var max = Math.ceil($(this).data('attr-max') * 1000)/1000;
2474-
mkSlider($(this).prop('id'),min, max,1,true,true,'', $(this).data('filter-attr-id'), $(this).data('filter-display-attr'));
2473+
mkSlider($(this).prop('id'),min, max,1,true,false,'', $(this).data('filter-attr-id'), $(this).data('filter-display-attr'));
24752474
});
24762475
};
24772476

static/js/sapien.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,8 @@ require([
8888
var groups = [];
8989
var filters = [];
9090
var values = [];
91-
if (id.site === "Head and Neck"){
92-
values.push("Head-Neck");
93-
}else {
94-
values.push(id.site);
95-
}
91+
id.site === "Head and Neck"? values.push("Head-Neck") : values.push(id.site);
92+
id.site === "Colorectal"? values.push("Colon") : values.push(id.site);
9693
filters.push(
9794
{
9895
'id': '128',

0 commit comments

Comments
 (0)