Skip to content

fix #2512 #2515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2018
Merged

fix #2512 #2515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbebd76
fix #2512
antgonza Feb 23, 2018
617831b
addressing @ElDeveloper comments
antgonza Feb 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions qiita_pet/templates/list_studies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
$('#user-studies-table').dataTable({
"lengthMenu": [[5, 10, 50, -1], [5, 10, 50, "All"]],
"deferRender": true,
"sDom": '<"top">l',
"columns": [
{ "orderable": false, "data": "artifact_biom_ids" },
{ "data": "study_title" },
Expand Down Expand Up @@ -112,7 +113,6 @@
}, targets: [5]},
],
"language": {
"search": "Filter results by column data (Title, abstract, PI, etc):",
"loadingRecords": "Please wait - loading information ...",
"zeroRecords": "No studies found"
},
Expand Down Expand Up @@ -176,7 +176,6 @@
}, targets: [1]},
],
"language": {
"search": "Filter results by column data (Title, abstract, PI, etc):",
"loadingRecords": "Please wait - loading information ...",
"zeroRecords": "No studies found"
},
Expand Down Expand Up @@ -241,8 +240,9 @@
});

// connecting searches
$('#user-studies-table').on('search.dt', function () {
var search_text = $('.dataTables_filter input').val();
$('#study-search-input').keyup(function(){
var search_text = $(this).val();
$('#user-studies-table').DataTable().search(search_text).draw();
$('#studies-table').DataTable().search(search_text).draw();
});

Expand Down Expand Up @@ -341,14 +341,22 @@
<!--User Studies-->
<div class="row">
<div class="col-sm-12" id="user-studies-div">
<h5 class="gray-msg">
Filter studies by tags:
<small>(
<span style="color: #FFA500">Admin</span>,
<span style="color: #1E90FF">User</span>
)</small>
</h5>
<select class="js-select2-multiple form-control" id="study_tags_multiple" multiple="multiple" style="width: 100%"></select>
<div class="row">
<div class="col-md-8">
<h5 class="gray-msg">Filter by column data (Title, abstract, PI, etc):</h5>
<input type="text" class="form-control" id="study-search-input" style="width: 100%">
</div>
<div class="col-md-4">
<h5 class="gray-msg">
Filter studies by tags:
<small>(
<span style="color: #FFA500">Admin</span>,
<span style="color: #1E90FF">User</span>
)</small>
</h5>
<select class="js-select2-multiple form-control" id="study_tags_multiple" multiple="multiple" style="width: 100%"></select>
</div>
</div>

<h3 class="gray-msg">Your Studies</h3>
<table id="user-studies-table" class="table table-bordered gray-msg">
Expand Down