Fix table select and a little reformatting

ELIXIR-Belgium · Aug 7, 2023 · cafb63e · cafb63e
1 parent d9cee8c
commit cafb63e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/app/assets/javascripts/single_page/dynamic_table.js.erb b/app/assets/javascripts/single_page/dynamic_table.js.erb
@@ -35,7 +35,7 @@ const handleSelect = (e) => {
     dtSelectAll.html("Select all rows")
     dtSelectAll.css("display", "none")
   }
-  const dtName = $j(e).parents("table").data("dtname")
+  const dtName = $j(e).parents("table").data("dtname");
   window[dtName].setPermissionBTNActivity()
 }
 

diff --git a/app/views/isa_assays/_assay_samples.html.erb b/app/views/isa_assays/_assay_samples.html.erb
@@ -14,7 +14,7 @@
 
 <% if valid_assay %>
     <script>
-        let sampleDynamicTable
+        var sampleDynamicTable
         $j(document).ready(function () {
             $j('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
                 $j.fn.dataTable.tables( {visible: true, api: true} ).columns.adjust();

diff --git a/app/views/isa_assays/_assay_table.html.erb b/app/views/isa_assays/_assay_table.html.erb
@@ -20,7 +20,7 @@
             const dt = <%= sanitize(dt_aggregated(assay.study, assay).to_json) %>
             assayDynamicTable = new $j.dynamicTable('#assay-table')
             const ajax = {
-								url: dynamicTableDataPath,
+                url: dynamicTableDataPath,
                 data: function(d) {
                     if (initialLoad) {
                         initialLoad = false;
@@ -34,14 +34,14 @@
             assayDynamicTable.init(dt.rows, dt.columns, { readonly: true, level: "assay", ajax })
             const types = assayDynamicTable.getSampleTypes()
             createSampleTypeOptions(dt.sample_types)
-        });	
-        
+        });
+
         function createSampleTypeOptions(types){
-					$j("#options_container").append('<div id="checkbox_group" class="btn-group" data-toggle="buttons"></div>')
-						types.forEach( (t, i) => {
-							let elem = `<label class="btn btn-default active sp-btn-variant-${i%2}"><input id="checkbox-${t.id}" type="checkbox" checked onchange="toggleSampleType(${t.id}, $j(this))" />${t.title}</label>`
-							$j("#checkbox_group").append(elem)
-						})	
+            $j("#options_container").append('<div id="checkbox_group" class="btn-group" data-toggle="buttons"></div>')
+                types.forEach( (t, i) => {
+                    let elem = `<label class="btn btn-default active sp-btn-variant-${i%2}"><input id="checkbox-${t.id}" type="checkbox" checked onchange="toggleSampleType(${t.id}, $j(this))" />${t.title}</label>`
+                    $j("#checkbox_group").append(elem)
+                })
         }
 
         function toggleSampleType(sample_type, e){

diff --git a/app/views/isa_studies/_buttons.html.erb b/app/views/isa_studies/_buttons.html.erb
@@ -34,8 +34,8 @@ exportToExcel||="sampleExportExcel()"
           ObjectsInput.init();
         }
       },
-      error: (e) => {
-        console.log(e);
+      error: (err) => {
+        console.log(err);
         alert("An error occurred while fetching data from the server.")
       }
     });

diff --git a/app/views/isa_studies/_study_table.html.erb b/app/views/isa_studies/_study_table.html.erb
@@ -21,7 +21,7 @@
             studyDynamicTable = new $j.dynamicTable('#study-table')
             const ajax = {
                 url: dynamicTableDataPath,
-                data: function(d) { 
+                data: function(d) {
                     if (initialLoad) {
                         initialLoad = false;
                         return;
@@ -35,14 +35,14 @@
             createSampleTypeOptions(dt.sample_types)
 
             $j(".dataTables_scrollBody").css("min-height", "300px")
-        });	
-        
-				function createSampleTypeOptions(types){
-					$j("#options_container").append('<div id="checkbox_group" class="btn-group" data-toggle="buttons"></div>')
-						types.forEach( (t, i) => {
-							let elem = `<label class="btn btn-default active sp-btn-variant-${i%2}"><input id="checkbox-${t.id}" type="checkbox" checked onchange="toggleSampleType(${t.id}, $j(this))" />${t.title}</label>`
-							$j("#checkbox_group").append(elem)
-						})		
+        });
+
+        function createSampleTypeOptions(types){
+            $j("#options_container").append('<div id="checkbox_group" class="btn-group" data-toggle="buttons"></div>')
+                types.forEach( (t, i) => {
+                    let elem = `<label class="btn btn-default active sp-btn-variant-${i%2}"><input id="checkbox-${t.id}" type="checkbox" checked onchange="toggleSampleType(${t.id}, $j(this))" />${t.title}</label>`
+                    $j("#checkbox_group").append(elem)
+                })
         }
 
         function toggleSampleType(sample_type, e){