Skip to content

Commit 11cf066

Browse files
s-paquettes-paquette
committed
-> #1453 
1 parent 08a3998 commit 11cf066

File tree

4 files changed

+43
-33
lines changed

4 files changed

+43
-33
lines changed

‎static/css/style.css‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ nav {
424424

425425
.dataTables_filter input {
426426
margin-left: 10px;
427+
border: 1px solid black;
427428
}
428429

429430
.dataTables_controls {
@@ -4472,14 +4473,25 @@ d-topics-list iframe {
44724473
}
44734474

44744475
.filter-display-panel .panel-body, .shopping-cart-panel .panel-body {
4475-
padding-top: 0px
4476+
padding-top: 0px;
44764477
}
44774478

44784479
.filter-display-panel .panel-heading, .shopping-cart-panel .panel-heading,
44794480
#projects_panel_container .panel-heading {
4480-
padding-bottom: 0px
4481+
padding-bottom: 0px;
44814482
}
44824483

44834484
.filter-display-panel .panel-heading, .shopping-cart-panel .panel-heading {
4484-
padding-top: 0px
4485+
padding-top: 0px;
4486+
}
4487+
4488+
.dataTables_filter button.clear {
4489+
display: inline-block;
4490+
margin-left: -25px;
4491+
background-color: transparent;
4492+
border: 0;
4493+
}
4494+
4495+
.dataTables_filter button.clear:hover {
4496+
color: #a4470c;
44854497
}

‎static/img/circle-x.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎static/js/tables.js‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -749,8 +749,15 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
749749
);
750750
});
751751
$('#cases_tab').find('tbody').attr('id','cases_table');
752-
$('#cases_panel').find('.dataTables_controls').find('.dataTables_length').after('<div class="dataTables_goto_page"><label>Page </label><input class="goto-page-number" type="number"><button onclick="changePage(\'cases_tab_wrapper\')">Go</button></div>');
753-
$('#cases_panel').find('.dataTables_controls').find('.dataTables_paginate').after('<div class="dataTables_filter"><strong>Find by Case ID:</strong><input class="caseID_inp" type="search" value="'+caseID+'" maxlength="256"></div>');
752+
$('#cases_panel').find('.dataTables_controls').find('.dataTables_length').after(
753+
'<div class="dataTables_goto_page"><label>Page </label><input class="goto-page-number" '
754+
+ 'type="number"></div>'
755+
);
756+
$('#cases_panel').find('.dataTables_controls').find('.dataTables_paginate').after(
757+
'<div class="dataTables_filter"><strong>Find by Case ID:</strong><input class="caseID_inp '
758+
+ 'table-search-box" data-search-type="case" type="text-box" value="'+caseID+'" maxlength="256"><button '
759+
+ 'class="clear"><i class="fa fa-solid fa-circle-xmark"></i></button></div>'
760+
);
754761
return updatePromise;
755762
}
756763

@@ -1107,7 +1114,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
11071114

11081115
$('#studies_tab').children('tbody').attr('id','studies_table');
11091116
$('#studies_tab_wrapper').find('.dataTables_controls').find('.dataTables_length').after('<div class="dataTables_goto_page"><label>Page </label><input class="goto-page-number" type="number"><button onclick="changePage(\'studies_tab_wrapper\')">Go</button></div>');
1110-
$('#studies_tab_wrapper').find('.dataTables_controls').find('.dataTables_paginate').after('<div class="dataTables_filter"><strong>Find by Study Instance UID:</strong><input class="studyID_inp" type="search" value="'+studyID+'" maxlength="256"></div>');
1117+
$('#studies_tab_wrapper').find('.dataTables_controls').find('.dataTables_paginate').after('<div class="dataTables_filter"><strong>Find by Study Instance UID:</strong><input data-search-type="study" class="studyID_inp table-search-box" type="text-box" value="'+studyID+'" maxlength="256"><button class="clear"><i class="fa fa-solid fa-circle-xmark"></i></button></div>');
11111118
return updatePromise;
11121119
}
11131120

@@ -1454,8 +1461,15 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
14541461
});
14551462
});
14561463
$('#series_tab').children('tbody').attr('id','series_table');
1457-
$('#series_tab_wrapper').find('.dataTables_controls').find('.dataTables_length').after('<div class="dataTables_goto_page"><label>Page </label><input class="goto-page-number" type="number"><button onclick="changePage(\'series_tab_wrapper\')">Go</button></div>');
1458-
$('#series_tab_wrapper').find('.dataTables_controls').find('.dataTables_paginate').after('<div class="dataTables_filter"><strong>Find by Series Instance UID:</strong><input class="seriesID_inp" type="search" value="'+seriesID+'" maxlength="256"></div>');
1464+
$('#series_tab_wrapper').find('.dataTables_controls').find('.dataTables_length').after(
1465+
'<div class="dataTables_goto_page"><label>Page </label><input class="goto-page-number" type="number">'
1466+
+'<button onclick="changePage(\'series_tab_wrapper\')">Go</button></div>'
1467+
);
1468+
$('#series_tab_wrapper').find('.dataTables_controls').find('.dataTables_paginate').after(
1469+
'<div class="dataTables_filter"><strong>Find by Series Instance UID:</strong><input '
1470+
+'class="seriesID_inp table-search-box" type="text-box" data-search-type="series" value="'
1471+
+seriesID+'" maxlength="256"><button class="clear"><i class="fa fa-solid fa-circle-xmark"></i></button></div>'
1472+
);
14591473
return updatePromise;
14601474
}
14611475

@@ -1504,7 +1518,7 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
15041518
update_search_thread = setTimeout(function(){
15051519
SEARCH_PENDING = true;
15061520
let varStr = input.val();
1507-
// Don't search again if no change was made (this squelches any non-changing keypress eg. home, end
1521+
// Don't search again if no change was made (this squelches any non-change)
15081522
if(Last_searches[type] !== varStr) {
15091523
Last_searches[type] = varStr;
15101524
update_methods[type](false, varStr, true)
@@ -1523,19 +1537,17 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
15231537
}, SUBSEQUENT_DELAY);
15241538
}
15251539

1526-
$('#cases_panel_container').on('change', '.caseID_inp', function(event){
1527-
filterTable('cases_panel', 'caseID', $(this));
1540+
$('#rh_panel').on('change keyup', '.table-search-box', function(event){
1541+
let type = $(this).attr("data-search-type");
1542+
filterTable(`${type}_panel`, `${type}ID`, $(this));
15281543
});
15291544

1530-
$('#series_panel_container').on('change', '.seriesID_inp', function(event){
1531-
filterTable('series_panel', 'seriesID', $(this));
1545+
$('#rh_panel').on('click', '.dataTables_filter button.clear', function(){
1546+
let search_box = $(this).siblings('.table-search-box');
1547+
search_box.val('');
1548+
search_box.trigger("change");
15321549
});
15331550

1534-
$('#studies_panel_container').on('change', '.studyID_inp', function(event){
1535-
filterTable('study_panel', 'studyID', $(this));
1536-
});
1537-
1538-
15391551
window.resetCartInTables = function(projArr){
15401552
for (var i =0; i< projArr.length;i++){
15411553
propagateCartTableStatChanges([projArr[i]], {}, false,true);
@@ -2262,8 +2274,6 @@ define(['cartutils','filterutils','tippy','jquery', 'base'], function(cartutils,
22622274

22632275
}
22642276

2265-
2266-
22672277
const pretty_print_id = function (id) {
22682278
var newId = id.slice(0, 8) + '...' + id.slice(id.length - 8, id.length);
22692279
return newId;

‎templates/idc/explore_data_core.html‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,6 @@ <h4 class="panel-title">Search Scope</h4>
213213
</div>
214214
</div>
215215
</div>
216-
{% if DEV_TIER %}
217-
<div class="tabpanel data-tab-content-panel" style="display:none">
218-
<div class="panel panel-default">
219-
<div class="panel-heading clearfix"><h4 class="panel-title">Data Source</h4></div>
220-
<div class="panel-body">
221-
<select id="data_source_type">
222-
<option selected value="S"> Solr (Lucene)</option>
223-
<option value="B"> BigQuery</option>
224-
</select>
225-
</div>
226-
</div>
227-
</div>
228-
{% endif %}
229216
<div id="search-configuration" class="search-configuration filter-panel search-con" role="tabpanel">
230217
<div class="tabpanel panel-default" role="tabpanel">
231218
<div class="panel-heading clearfix">

0 commit comments

Comments
 (0)