Merge pull request #388 from ImagingDataCommons/idc-test-sp

Hotfix #384, Sprint 15

Author: s-paquette

static/css/search.css

@@ -343,8 +343,8 @@ tr {
 #series_table td.series-description {
     width:32%;
 }
-#series_table_head th.text_data,
-#series_table td.text_data {
+#series_table_head th.open-viewer,
+#series_table td.open-viewer {
     width:13%;
 }
 

static/css/style.css

@@ -141,13 +141,6 @@ require([
         type: 'numeric'
     });
 
-    $('#cohort-table').tablesorter({
-        headers: {
-            0: {sorter:false}
-        },
-        sortList: [[1]]
-    });
-
     $(document).ready(function(){
         if(sessionStorage.getItem("reloadMsg")) {
             var msg = JSON.parse(sessionStorage.getItem("reloadMsg"));

static/js/base.js

@@ -22,25 +22,57 @@ require.config({
         jquery: 'libs/jquery-3.5.1',
         bootstrap: 'libs/bootstrap.min',
         jqueryui: 'libs/jquery-ui.min',
+        'datatables.net': 'libs/jquery.dataTables.min',
         underscore: 'libs/underscore-min',
         tablesorter:'libs/jquery.tablesorter.min',
         base: 'base'
     },
     shim: {
         'bootstrap': ['jquery'],
         'jqueryui': ['jquery'],
+        'datatables.net': ['jquery'],
         'tablesorter': ['jquery'],
         'base': ['jquery'],
     }
 });
 
 require([
     'jquery',
+    'datatables.net',
     'base',
     'jqueryui',
     'bootstrap',
     'tablesorter'
 ], function($,base) {
+    var cohort_list_table = $('#cohort-table').DataTable({
+        "dom": '<"dataTables_controls"ilpf>rt<"bottom"><"clear">',
+        "order": [[ 2, "desc" ]],
+        "columns": [
+            { "orderable": false },
+            { "orderable": false },
+            null,
+            null,
+            null,
+            null
+        ]
+    });
+
+    $('#cohort-table tbody').on('click', 'td.details-control', function () {
+        var tr = $(this).parents('tr');
+        var row = cohort_list_table.row(tr);
+
+        if (row.child.isShown()) {
+            // This row is already open - close it
+            row.child.hide();
+            tr.removeClass('shown');
+            $(this).prop('title', 'Click to display cohort description.');
+        } else {
+            $(this).prop('title', 'Click to hide cohort description.');
+            var desc = tr.attr('data-description');
+            (row.child() && row.child().length) ? row.child.show() : row.child($(`<tr><td></td><td colspan="5"><p>`+desc+`</p></td></tr>`)).show();
+            tr.addClass('shown');
+        }
+    });
 
     // Resets forms in modals on cancel. Suppressed warning when leaving page with dirty forms
     $('.modal').on('hide.bs.modal', function() {

static/js/cohorts/cohort-list.js

@@ -38,4 +38,8 @@ require(['jquery', 'datatables.net','jqueryui', 'bootstrap', 'base'],
                 tr.addClass('shown');
             }
         });
+
+        $(window).on('load', function(){
+            $('.collex-panel').removeClass('hidden');
+        });
 });

static/js/collections_list.js

@@ -207,4 +207,23 @@ require([
         maxWidth: 300
     });
 
+    tippy.delegate('.series-table', {
+        content: function(reference) {
+            return $(reference).data('study-id');
+        },
+        theme: 'dark',
+        placement: 'right',
+        arrow: false,
+        target: '.study-id-col',
+        maxWidth: 300
+    });
+
+    tippy.delegate('.series-table', {
+        content: 'Please open at the study level to see this series',
+        theme: 'dark',
+        placement: 'right',
+        arrow: false,
+        target: '.no-viewer-tooltip',
+        maxWidth: 130
+    });
 });