Skip to content

Commit 63e4079

Browse files
s-paquettes-paquette
authored
Merge pull request #386 from ImagingDataCommons/idc-prod-sp
Hotfix: #384
2 parents e681f46 + 2198a30 commit 63e4079

2 files changed

Lines changed: 108 additions & 107 deletions

File tree

‎static/js/image_search.js‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,68 +2447,6 @@ require(['jquery', 'underscore', 'jquerydt','jqueryui', 'bootstrap','base'],
24472447
});
24482448
};
24492449

2450-
2451-
$(document).ready(function () {
2452-
2453-
// $('#proj_table').DataTable();
2454-
// window.filterObj.collection_id = window.tcgaColls;
2455-
window.selItems = new Object();
2456-
window.selItems.selStudies = new Object();
2457-
window.selItems.selProjects = new Array();
2458-
window.histIndex = 0;
2459-
window.histMaxLength = 6;
2460-
histObj = new Object();
2461-
histObj.selItems = JSON.parse(JSON.stringify(window.selItems));
2462-
histObj.filterObj = JSON.parse(JSON.stringify(window.filterObj));
2463-
//histObj.filterObj.collection_id = window.tcgaColls;
2464-
window.filtHistory = new Array();
2465-
window.filtHistory.push(histObj);
2466-
2467-
/* addFilterBindings('search_orig_set');
2468-
addFilterBindings('search_related_set');*/
2469-
2470-
filterItemBindings('program_set');
2471-
filterItemBindings('search_orig_set');
2472-
filterItemBindings('search_derived_set');
2473-
filterItemBindings('search_related_set');
2474-
tableSortBindings('projects_table_head');
2475-
tableSortBindings('studies_table_head');
2476-
tableSortBindings('series_table_head');
2477-
2478-
mkSlider('age_at_diagnosis',0, parseInt($('#age_at_diagnosis').data('attr-max')),1,true,true, 'tcga_clinical.',
2479-
$('#age_at_diagnosis').data('filter-attr-id'), $('#age_at_diagnosis').data('filter-display-attr'));
2480-
2481-
addSliders('quantitative');
2482-
2483-
createPlots('search_orig_set');
2484-
createPlots('search_derived_set');
2485-
createPlots('tcga_clinical');
2486-
2487-
var numCol = $('#projects_table').children('tr').length
2488-
$('#projects_panel').find('.total-file-count')[0].innerHTML = numCol.toString();
2489-
$('#projects_panel').find('.goto-page-number')[0].max=3;
2490-
2491-
window.resetTableControls ($('#projects_table'), false, 0);
2492-
window.resetTableControls ($('#studies_table'), false, 0);
2493-
window.resetTableControls ($('#series_table'), false, 0);
2494-
2495-
$('.clear-filters').on('click', function () {
2496-
$('input:checkbox').not('#hide-zeros').prop('checked',false);
2497-
$('input:checkbox').not('#hide-zeros').prop('indeterminate',false);
2498-
window.filterObj = new Object();
2499-
$('.ui-slider').each(function(){
2500-
setSlider(this.id,true,0,0,true, false);
2501-
})
2502-
$('#search_def_warn').hide();
2503-
2504-
mkFiltText();
2505-
updateFacetsData(true);
2506-
});
2507-
2508-
//$("#number_ajax").bind("change", function(){ alert($()this.val)} );
2509-
}
2510-
);
2511-
25122450
var load_filters = function(filters) {
25132451
var sliders = [];
25142452
_.each(filters, function(group){
@@ -2553,46 +2491,6 @@ require(['jquery', 'underscore', 'jquerydt','jqueryui', 'bootstrap','base'],
25532491
}
25542492
};
25552493

2556-
var cohort_loaded = false;
2557-
$(window).on('load', function(){
2558-
console.debug("Fired window.onload");
2559-
if(is_cohort && !cohort_loaded) {
2560-
console.debug("Unloaded cohort found, loading...");
2561-
var loadPending = load_filters(cohort_filters);
2562-
loadPending.done(function(){
2563-
console.debug("Load pending complete.");
2564-
cohort_loaded = true;
2565-
$('input[type="checkbox"]').prop("disabled","disabled");
2566-
$('div.ui-slider').siblings('button').prop('disabled','disabled');
2567-
$('input#hide-zeros').prop("disabled","");
2568-
$('input#hide-zeros').prop("checked",true);
2569-
$('input#hide-zeros').triggerHandler('change');
2570-
});
2571-
} else if(Object.keys(filters_for_load).length > 0) {
2572-
var loadPending = load_filters(filters_for_load);
2573-
loadPending.done(function(){
2574-
console.debug("External filter load done.");
2575-
});
2576-
} else {
2577-
// check for localStorage key of saved filters from a login
2578-
load_anonymous_selection_data();
2579-
var has_sliders = (ANONYMOUS_SLIDERS !== null && ANONYMOUS_SLIDERS.length > 0);
2580-
var has_filters = (ANONYMOUS_FILTERS !== null && ANONYMOUS_FILTERS[0]['filters'].length > 0);
2581-
if (has_sliders) {
2582-
let loadPending = load_sliders(ANONYMOUS_SLIDERS, !has_filters);
2583-
loadPending.done(function(){
2584-
console.debug("Sliders loaded from anonymous login.");
2585-
});
2586-
}
2587-
if (has_filters) {
2588-
let loadPending = load_filters(ANONYMOUS_FILTERS);
2589-
loadPending.done(function(){
2590-
console.debug("Filters loaded from anonymous login.");
2591-
});
2592-
}
2593-
}
2594-
});
2595-
25962494
var ANONYMOUS_FILTERS = {};
25972495
var ANONYMOUS_SLIDERS = {};
25982496

@@ -2603,7 +2501,7 @@ require(['jquery', 'underscore', 'jquerydt','jqueryui', 'bootstrap','base'],
26032501
var filters = [];
26042502
$('.list-group-item__body').each(function() {
26052503
var $group = $(this);
2606-
var my_id = $group.data('attrId');
2504+
var my_id = $group.data('filter-attr-id');
26072505
if (my_id != null)
26082506
{
26092507
var checkboxes = $group.find("input:checked");
@@ -2663,6 +2561,108 @@ require(['jquery', 'underscore', 'jquerydt','jqueryui', 'bootstrap','base'],
26632561
if(!user_is_auth) {
26642562
save_anonymous_selection_data();
26652563
}
2564+
location.href=$(this).data('uri');
26662565
});
2667-
});
26682566

2567+
var cohort_loaded = false;
2568+
function load_preset_filters() {
2569+
if (is_cohort && !cohort_loaded) {
2570+
console.debug("Unloaded cohort found, loading...");
2571+
var loadPending = load_filters(cohort_filters);
2572+
loadPending.done(function () {
2573+
console.debug("Load pending complete.");
2574+
cohort_loaded = true;
2575+
$('input[type="checkbox"]').prop("disabled", "disabled");
2576+
$('div.ui-slider').siblings('button').prop('disabled', 'disabled');
2577+
$('input#hide-zeros').prop("disabled", "");
2578+
$('input#hide-zeros').prop("checked", true);
2579+
$('input#hide-zeros').triggerHandler('change');
2580+
});
2581+
} else if (Object.keys(filters_for_load).length > 0) {
2582+
var loadPending = load_filters(filters_for_load);
2583+
loadPending.done(function () {
2584+
console.debug("External filter load done.");
2585+
});
2586+
} else {
2587+
// check for localStorage key of saved filters from a login
2588+
load_anonymous_selection_data();
2589+
var has_sliders = (ANONYMOUS_SLIDERS !== null && ANONYMOUS_SLIDERS.length > 0);
2590+
var has_filters = (ANONYMOUS_FILTERS !== null && ANONYMOUS_FILTERS[0]['filters'].length > 0);
2591+
if (has_sliders) {
2592+
let loadPending = load_sliders(ANONYMOUS_SLIDERS, !has_filters);
2593+
loadPending.done(function () {
2594+
console.debug("Sliders loaded from anonymous login.");
2595+
});
2596+
}
2597+
if (has_filters) {
2598+
let loadPending = load_filters(ANONYMOUS_FILTERS);
2599+
loadPending.done(function () {
2600+
console.debug("Filters loaded from anonymous login.");
2601+
});
2602+
}
2603+
}
2604+
}
2605+
2606+
$(document).ready(function () {
2607+
2608+
// $('#proj_table').DataTable();
2609+
// window.filterObj.collection_id = window.tcgaColls;
2610+
window.selItems = new Object();
2611+
window.selItems.selStudies = new Object();
2612+
window.selItems.selProjects = new Array();
2613+
window.histIndex = 0;
2614+
window.histMaxLength = 6;
2615+
histObj = new Object();
2616+
histObj.selItems = JSON.parse(JSON.stringify(window.selItems));
2617+
histObj.filterObj = JSON.parse(JSON.stringify(window.filterObj));
2618+
//histObj.filterObj.collection_id = window.tcgaColls;
2619+
window.filtHistory = new Array();
2620+
window.filtHistory.push(histObj);
2621+
2622+
/* addFilterBindings('search_orig_set');
2623+
addFilterBindings('search_related_set');*/
2624+
2625+
filterItemBindings('program_set');
2626+
filterItemBindings('search_orig_set');
2627+
filterItemBindings('search_derived_set');
2628+
filterItemBindings('search_related_set');
2629+
tableSortBindings('projects_table_head');
2630+
tableSortBindings('studies_table_head');
2631+
tableSortBindings('series_table_head');
2632+
2633+
mkSlider('age_at_diagnosis',0, parseInt($('#age_at_diagnosis').data('attr-max')),1,true,true, 'tcga_clinical.',
2634+
$('#age_at_diagnosis').data('filter-attr-id'), $('#age_at_diagnosis').data('filter-display-attr'));
2635+
2636+
addSliders('quantitative');
2637+
2638+
createPlots('search_orig_set');
2639+
createPlots('search_derived_set');
2640+
createPlots('tcga_clinical');
2641+
2642+
var numCol = $('#projects_table').children('tr').length
2643+
$('#projects_panel').find('.total-file-count')[0].innerHTML = numCol.toString();
2644+
$('#projects_panel').find('.goto-page-number')[0].max=3;
2645+
2646+
window.resetTableControls ($('#projects_table'), false, 0);
2647+
window.resetTableControls ($('#studies_table'), false, 0);
2648+
window.resetTableControls ($('#series_table'), false, 0);
2649+
2650+
$('.clear-filters').on('click', function () {
2651+
$('input:checkbox').not('#hide-zeros').prop('checked',false);
2652+
$('input:checkbox').not('#hide-zeros').prop('indeterminate',false);
2653+
window.filterObj = new Object();
2654+
$('.ui-slider').each(function(){
2655+
setSlider(this.id,true,0,0,true, false);
2656+
})
2657+
$('#search_def_warn').hide();
2658+
2659+
mkFiltText();
2660+
updateFacetsData(true);
2661+
});
2662+
2663+
//$("#number_ajax").bind("change", function(){ alert($()this.val)} );
2664+
2665+
load_preset_filters();
2666+
}
2667+
);
2668+
});

‎templates/idc/explore.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@
4545

4646
<h3 class="pull-left" role="heading" aria-level="1">Explore Image Data</h3>
4747
{% if request.user.is_authenticated %}
48-
<button id="save-cohort-btn" class="btn btn-special pull-right" data-toggle="modal" data-target="#save-cohort-modal"
48+
<button id="save-cohort-btn" class="btn btn-special pull-right" data-toggle="modal"
49+
data-target="#save-cohort-modal"
4950
title="Select at least one filter." disabled="disabled"> Save As New Cohort
5051
</button>
5152
{% else %}
52-
<button id="save-cohort-btn" class="btn btn-special pull-right" onclick="location.href='{% url 'account_login' %}'"
53-
title="Select at least one filter." disabled="disabled"> Log in to Save
53+
<button id="save-cohort-btn" class="btn btn-special pull-right" title="Select at least one filter."
54+
disabled="disabled" data-uri="{% url 'account_login' %}"> Log in to Save
5455
</button>
5556
{% endif %}
5657
</div>

0 commit comments

Comments
 (0)