Add necessary new JS files to show_trait.html and make formatting of all js imports the same

1 files changed, 19 insertions, 44 deletions

diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index f366d33f..0f93188b 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -131,19 +131,19 @@
         $('.collapse').collapse()
     </script>
 
-    <script type="text/javascript" src="{{ url_for('js', filename='d3js/d3.min.js') }}"></script>
-     <script type="text/javascript" src="{{ url_for('js', filename='js_alt/underscore.min.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('js', filename='underscore-string/underscore.string.min.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('js', filename='d3-tip/d3-tip.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('js', filename='js_alt/jstat.min.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('js', filename='shapiro-wilk/shapiro-wilk.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
-    <script type="text/javascript" src="/static/new/javascript/colorbrewer.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='d3js/d3.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/underscore.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='underscore-string/underscore.string.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='d3-tip/d3-tip.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/jstat.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='shapiro-wilk/shapiro-wilk.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/colorbrewer.js"></script>
 
-    <script type="text/javascript" src="/static/new/javascript/stats.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/scatter-matrix.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/plotly_probability_plot.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/compare_traits_scatterplot.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/stats.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/scatter-matrix.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/plotly_probability_plot.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/compare_traits_scatterplot.js"></script>
 
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.js') }}"></script>
@@ -151,12 +151,13 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/scroller/js/dataTables.scroller.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='nouislider/nouislider.js') }}"></script>
-    <script type="text/javascript" src="/static/new/javascript/initialize_show_trait_tables.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/show_trait_mapping_tools.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/show_trait.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/validation.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/get_covariates_from_collection.js"></script>
-    <script type="text/javascript" src="/static/new/javascript/table_functions.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/table_functions.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/create_datatable.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/initialize_show_trait_tables.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/show_trait_mapping_tools.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/show_trait.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/validation.js"></script>
+    <script language="javascript" type="text/javascript" src="/static/new/javascript/get_covariates_from_collection.js"></script>
 
     <script type="text/javascript" charset="utf-8">
 
@@ -213,32 +214,6 @@
                    }
                 });
 
-                $('.toggle-vis').on('click', function (e) {
-                    e.preventDefault();
-
-                    function toggle_column(column) {
-                        //ZS: Toggle column visibility
-                        column.visible( ! column.visible() );
-                        if (column.visible()){
-                            $(this).removeClass("active");
-                        } else {
-                            $(this).addClass("active");
-                        }
-                    }
-
-                    // Get the column API object
-                    var target_cols = $(this).attr('data-column').split(",")
-                    for (let i = 0; i < target_cols.length; i++){
-                        var column = primary_table.column( target_cols[i] );
-                        toggle_column(column);
-
-                        {% if sample_groups|length != 1 %}
-                        var column2 = other_table.column( target_cols[i] );
-                        toggle_column(column2);
-                        {% endif %}
-                    }
-                } );
-
                 $('#samples_primary, #samples_other').find("tr.outlier").css('background-color', 'orange')
 
                 $('.edit_sample_checkbox:checkbox').change(function() {