From a57241a160757ac737658b33ea7cc8ad670a0e61 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 3 Dec 2020 00:01:52 +0300
Subject: add hide  empty column in table script

---
 .../static/new/javascript/auto_hide_column.js      | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 wqflask/wqflask/static/new/javascript/auto_hide_column.js

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
new file mode 100644
index 00000000..652b2ad7
--- /dev/null
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -0,0 +1,22 @@
+
+$(function (){
+$("table th").each(function(index,col_th){
+	var filter_counter = 0;
+	// map each column to row ie  column i to ith element
+	var column_tds = $(this).closest('table').find('tr td:nth-child(' + (index + 1) + ')')
+	column_tds.each(function(j,col_td){
+		if(this.innerHTML==''||this.innerHTML=="N/A"){
+			filter_counter+=1;
+		}
+		else{
+			// break
+			return false;
+		}
+	})
+	if (filter_counter == ($('table tr').length - 1)){
+		$(this).hide();
+        column_tds.hide();
+
+	}
+})
+})
\ No newline at end of file
-- 
cgit v1.2.3


From 8746f2e93fe889ac0ba9e801b3684764fffa2945 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 3 Dec 2020 00:04:52 +0300
Subject: add table row index

---
 wqflask/wqflask/static/new/javascript/auto_hide_column.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index 652b2ad7..73b639dc 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -1,10 +1,10 @@
 
 $(function (){
-$("table th").each(function(index,col_th){
+$("table th").each(function(th_index,col_th){
 	var filter_counter = 0;
 	// map each column to row ie  column i to ith element
 	var column_tds = $(this).closest('table').find('tr td:nth-child(' + (index + 1) + ')')
-	column_tds.each(function(j,col_td){
+	column_tds.each(function(td_index,col_td){
 		if(this.innerHTML==''||this.innerHTML=="N/A"){
 			filter_counter+=1;
 		}
-- 
cgit v1.2.3


From f199a59587bad2b20c4122562eb707931b045669 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 3 Dec 2020 00:47:54 +0300
Subject: add support for multiple tables

---
 .../static/new/javascript/auto_hide_column.js      | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index 73b639dc..14348ccd 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -1,22 +1,21 @@
+$(function(){
+	$("table").each(function(table){
+		$(this).find("th").each(function(col_index,col_th){
+			var filter_counter=0
+			var col_td=$(this).closest('table').find('tr td:nth-child(' + (col_index + 1) + ')')
+			col_td.each(function(td_index,col_td){
+				if(this.innerHTML==""||this.innerHTML=="N/A"){
+					filter_counter+=1
+				}
+				else{
+					return false
+				}
+			})
+			if (filter_counter==$(this).closest("table").find("tr").length-1){
+					$(this).hide();
+                   col_td.hide();
 
-$(function (){
-$("table th").each(function(th_index,col_th){
-	var filter_counter = 0;
-	// map each column to row ie  column i to ith element
-	var column_tds = $(this).closest('table').find('tr td:nth-child(' + (index + 1) + ')')
-	column_tds.each(function(td_index,col_td){
-		if(this.innerHTML==''||this.innerHTML=="N/A"){
-			filter_counter+=1;
-		}
-		else{
-			// break
-			return false;
-		}
+			}
+		})
 	})
-	if (filter_counter == ($('table tr').length - 1)){
-		$(this).hide();
-        column_tds.hide();
-
-	}
 })
-})
\ No newline at end of file
-- 
cgit v1.2.3


From 953727abb0b2c9075b486e3adfb13f029ebb00b1 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Thu, 3 Dec 2020 18:46:37 +0300
Subject: add datatable filter for empty  columns

---
 .../static/new/javascript/auto_hide_column.js      | 47 +++++++++++++---------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index 14348ccd..94bb8a90 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -1,21 +1,28 @@
-$(function(){
-	$("table").each(function(table){
-		$(this).find("th").each(function(col_index,col_th){
-			var filter_counter=0
-			var col_td=$(this).closest('table').find('tr td:nth-child(' + (col_index + 1) + ')')
-			col_td.each(function(td_index,col_td){
-				if(this.innerHTML==""||this.innerHTML=="N/A"){
-					filter_counter+=1
-				}
-				else{
-					return false
-				}
-			})
-			if (filter_counter==$(this).closest("table").find("tr").length-1){
-					$(this).hide();
-                   col_td.hide();
+function filterDatable(datatable){
+        let visitedColumns=[]
+        let columnCount=datatable.columns().header().length;
+        let numberOfRows=datatable.data().length;
+        for (let i=0;i<numberOfRows;i++){
+            if (visitedColumns.length==columnCount){
+                break;
+            }
+            let rowObj=datatable.rows(i).data()
+            rowObj.data().each(function(rowData,v){
+                if (visitedColumns.length==columnCount){
+                    return false;
+                }
+                for (let j=0;j<rowData.length;j++){
+                    if (j in visitedColumns||visitedColumns.length==columnCount){
+                        break;
+                    }
+                    if (rowData[j]!="N/A" && rowData[j]!=""){
 
-			}
-		})
-	})
-})
+                        visitedColumns.push(j)
+                    }
+                }
+            })
+        }
+        emptyColumns=Array.from(Array(columnCount).keys()).filter((item)=>visitedColumns.indexOf(item)<0);
+        return datatable.columns(emptyColumns).visible(false);
+
+}
-- 
cgit v1.2.3


From 18d01454548f7fb30f6fc24d9d8fb38840e76901 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:18:26 +0300
Subject: replace datatatable/jquery.js in templates

---
 wqflask/wqflask/templates/admin/create_group.html      | 4 +++-
 wqflask/wqflask/templates/admin/search_for_groups.html | 4 +++-
 wqflask/wqflask/templates/ctl_results.html             | 4 +++-
 wqflask/wqflask/templates/network_graph.html           | 4 +++-
 wqflask/wqflask/templates/pair_scan_results.html       | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/admin/create_group.html b/wqflask/wqflask/templates/admin/create_group.html
index 5a6929fb..4ab70007 100644
--- a/wqflask/wqflask/templates/admin/create_group.html
+++ b/wqflask/wqflask/templates/admin/create_group.html
@@ -80,7 +80,9 @@
 {% endblock %}
 
 {% block js %}
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/group_manager.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
 
diff --git a/wqflask/wqflask/templates/admin/search_for_groups.html b/wqflask/wqflask/templates/admin/search_for_groups.html
index f304a172..1df4d0a2 100644
--- a/wqflask/wqflask/templates/admin/search_for_groups.html
+++ b/wqflask/wqflask/templates/admin/search_for_groups.html
@@ -63,7 +63,9 @@
 {% endblock %}
 
 {% block js %}
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/group_manager.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
 
diff --git a/wqflask/wqflask/templates/ctl_results.html b/wqflask/wqflask/templates/ctl_results.html
index e374eb4e..7ce67d0e 100644
--- a/wqflask/wqflask/templates/ctl_results.html
+++ b/wqflask/wqflask/templates/ctl_results.html
@@ -64,7 +64,9 @@
         gn2_url = "{{ gn2_url | safe }}"
     </script>
 
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='qtip2/jquery.qtip.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="/js/cytoscape/cytoscape.min.js"></script>
diff --git a/wqflask/wqflask/templates/network_graph.html b/wqflask/wqflask/templates/network_graph.html
index be3d0402..33f0365b 100644
--- a/wqflask/wqflask/templates/network_graph.html
+++ b/wqflask/wqflask/templates/network_graph.html
@@ -140,7 +140,9 @@
         gn2_url       = "{{ gn2_url | safe }}"
     </script>
 
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='qtip2/jquery.qtip.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/underscore.min.js') }}"></script>
 
diff --git a/wqflask/wqflask/templates/pair_scan_results.html b/wqflask/wqflask/templates/pair_scan_results.html
index f1646af7..14a62e0d 100644
--- a/wqflask/wqflask/templates/pair_scan_results.html
+++ b/wqflask/wqflask/templates/pair_scan_results.html
@@ -64,7 +64,9 @@
 
     <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='d3-tip/d3-tip.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.js"></script>
+     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/scientific.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
-- 
cgit v1.2.3


From 0319428bc26ba7d956dc7564ad69feeae7c9ef90 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:23:01 +0300
Subject: replace js_alt/timeago in templates

---
 wqflask/wqflask/templates/admin/ind_user_manager.html    | 2 +-
 wqflask/wqflask/templates/collections/list.html          | 2 +-
 wqflask/wqflask/templates/collections/not_logged_in.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/admin/ind_user_manager.html b/wqflask/wqflask/templates/admin/ind_user_manager.html
index e859b442..b821e5d5 100644
--- a/wqflask/wqflask/templates/admin/ind_user_manager.html
+++ b/wqflask/wqflask/templates/admin/ind_user_manager.html
@@ -103,7 +103,7 @@
 
 {% block js %}
 
-    <script type="text/javascript" src="/static/packages/smart-time-ago/lib/timeago.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/timeago.min.js') }}"></script>
     <script>
         $('body').timeago();
     </script>
diff --git a/wqflask/wqflask/templates/collections/list.html b/wqflask/wqflask/templates/collections/list.html
index 9e0c0f07..280ca6cc 100644
--- a/wqflask/wqflask/templates/collections/list.html
+++ b/wqflask/wqflask/templates/collections/list.html
@@ -66,7 +66,7 @@
 {% endblock %}
 
 {% block js %}
-    <script type="text/javascript" src="/static/packages/smart-time-ago/lib/timeago.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/timeago.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/search_results.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
diff --git a/wqflask/wqflask/templates/collections/not_logged_in.html b/wqflask/wqflask/templates/collections/not_logged_in.html
index a4c8747e..49b0e07d 100644
--- a/wqflask/wqflask/templates/collections/not_logged_in.html
+++ b/wqflask/wqflask/templates/collections/not_logged_in.html
@@ -5,7 +5,7 @@
     {{ header("Not logged in") }}
 
 
-    <div id "collections_holder" class="container">
+    <div id="collections_holder" class="container">
         <div class="page-header">
             <h1>Please log in in order to use this feature.</h1>
         </div>
@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block js %}
-    <script type="text/javascript" src="/static/packages/smart-time-ago/lib/timeago.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/timeago.min.js') }}"></script>
     <script>
         $('body').timeago();
     </script>
-- 
cgit v1.2.3


From f9fd76752944e9952a48fd2fa3718db5b11fc40e Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:25:35 +0300
Subject: replace js_alt/parsley in templates

---
 wqflask/wqflask/templates/base.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index faa59deb..51a21324 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -257,7 +257,9 @@
     <script language="javascript" type="text/javascript" src="/static/packages/colorbox/jquery.colorbox.js"></script>
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
 
-    <script type="text/javascript" src="/static/new/js_external/parsley.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
+<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
+<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
 
     {% block js %}
     {% endblock %}
-- 
cgit v1.2.3


From 4f55eeda63106694f8fad1355b7ecef2baad257e Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:27:26 +0300
Subject: replace jstat in templates

---
 wqflask/wqflask/templates/show_trait.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 7b74a3f6..918894f5 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -133,7 +133,7 @@
     <script type="text/javascript" src="/static/new/js_external/underscore-min.js"></script>
     <script type="text/javascript" src="/static/new/js_external/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="/static/new/js_external/jstat.min.js"></script>
+    <script type="text/javascript" src="{{ url_for('js', filename='js_alt/jstat.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/js_external/shapiro-wilk.js"></script>
     <script type="text/javascript" src="/static/new/js_external/plotly-latest.min.js"></script>
     <script type="text/javascript" src="/static/new/javascript/colorbrewer.js"></script>
-- 
cgit v1.2.3


From 51b70d89d5b085b9f81e5da2b695873ca53e54f9 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:31:24 +0300
Subject: replace jszip lib in templates

---
 wqflask/wqflask/templates/collections/list.html   | 2 +-
 wqflask/wqflask/templates/collections/view.html   | 2 +-
 wqflask/wqflask/templates/correlation_page.html   | 2 +-
 wqflask/wqflask/templates/gsearch_gene.html       | 2 +-
 wqflask/wqflask/templates/gsearch_pheno.html      | 2 +-
 wqflask/wqflask/templates/search_result_page.html | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/collections/list.html b/wqflask/wqflask/templates/collections/list.html
index 9e0c0f07..b04672ec 100644
--- a/wqflask/wqflask/templates/collections/list.html
+++ b/wqflask/wqflask/templates/collections/list.html
@@ -69,7 +69,7 @@
     <script type="text/javascript" src="/static/packages/smart-time-ago/lib/timeago.js"></script>
     <script type="text/javascript" src="/static/new/javascript/search_results.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <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/buttons/js/dataTables.buttons.min.js') }}"></script>
     <script>
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index ccec495b..afc47bc2 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -162,7 +162,7 @@
 {% endblock %}
 
 {% block js %}
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html
index 06ee9056..01789d67 100644
--- a/wqflask/wqflask/templates/correlation_page.html
+++ b/wqflask/wqflask/templates/correlation_page.html
@@ -171,7 +171,7 @@
     <script type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
     <script type="text/javascript" src="/static/new/javascript/search_results.js"></script>
 
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html
index d5bc4141..6fd0abe8 100644
--- a/wqflask/wqflask/templates/gsearch_gene.html
+++ b/wqflask/wqflask/templates/gsearch_gene.html
@@ -48,7 +48,7 @@
 {% block js %}
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <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/colReorder/js/dataTables.colReorder.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/colResize/dataTables.colResize.js') }}"></script>
diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html
index ccd4a9d9..0dc6fe5f 100644
--- a/wqflask/wqflask/templates/gsearch_pheno.html
+++ b/wqflask/wqflask/templates/gsearch_pheno.html
@@ -48,7 +48,7 @@
 {% block js %}
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <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/colReorder/js/dataTables.colReorder.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/colResize/dataTables.colResize.js') }}"></script>
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index 87c97c50..1a2d2112 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -183,7 +183,7 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/md5.min.js') }}"></script>
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jszip/jszip.min.js') }}"></script>
     <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/buttons/js/dataTables.buttons.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/buttons.colVis.min.js') }}"></script>
-- 
cgit v1.2.3


From 1c202735fc279f42e70d2cdef6ee8b9214ca0f44 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:41:44 +0300
Subject: replace colorbox jquery.colorbox  in templates

---
 wqflask/wqflask/templates/base.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index faa59deb..5c8343d1 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -254,7 +254,9 @@
     <script type="text/javascript" src="/static/new/js_external/json2.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" type="text/javascript"></script>
 
-    <script language="javascript" type="text/javascript" src="/static/packages/colorbox/jquery.colorbox.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
+<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
+<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
 
     <script type="text/javascript" src="/static/new/js_external/parsley.min.js"></script>
-- 
cgit v1.2.3


From 5fc3f0647beafc1290ede2f5242275c2f0e54ed9 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 12:57:10 +0300
Subject: replace jscolor lib in templates

---
 wqflask/wqflask/templates/corr_scatterplot.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/corr_scatterplot.html b/wqflask/wqflask/templates/corr_scatterplot.html
index 1133fcd2..145cfcf7 100644
--- a/wqflask/wqflask/templates/corr_scatterplot.html
+++ b/wqflask/wqflask/templates/corr_scatterplot.html
@@ -349,7 +349,7 @@
     <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='d3-tip/d3-tip.js') }}"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/js_external/jscolor.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='jscolor/jscolor.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/panelutil.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
-- 
cgit v1.2.3


From fabd1049a3d79833ee204e3bf6791526a8770b54 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 13:35:18 +0300
Subject: replace ckeditor in templates

---
 wqflask/wqflask/templates/docedit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/docedit.html b/wqflask/wqflask/templates/docedit.html
index b87c5b41..50bb96c0 100644
--- a/wqflask/wqflask/templates/docedit.html
+++ b/wqflask/wqflask/templates/docedit.html
@@ -16,7 +16,7 @@
 			{{content|safe}}
         </textarea>
         <button class="submit_changes" style="margin-top: 20px;">Submit Changes</button>
-        <script src="/static/packages/ckeditor/ckeditor.js"></script>
+        <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='ckeditor/ckeditor.js') }}"></script>
         <script type="text/javascript">
             CKEDITOR.replace('ckcontent',	{
                 height: '650px',
-- 
cgit v1.2.3


From ecd85a3d6656cbae8dddd59d2ceed3186d157e8f Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 13:51:00 +0300
Subject: replace datatable/images in css

---
 wqflask/wqflask/static/new/css/marker_regression.css | 4 ++--
 wqflask/wqflask/static/new/css/show_trait.css        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/css/marker_regression.css b/wqflask/wqflask/static/new/css/marker_regression.css
index e0a5ceea..9f56b63d 100644
--- a/wqflask/wqflask/static/new/css/marker_regression.css
+++ b/wqflask/wqflask/static/new/css/marker_regression.css
@@ -48,10 +48,10 @@ table.dataTable thead th{
 }
 
 table.dataTable thead .sorting_asc {
-  background-image: url("../packages/DataTables/images/sort_asc_disabled.png");
+  background-image: url("/js/DataTables/images/sort_asc_disabled.png");
 }
 table.dataTable thead .sorting_desc {
-  background-image: url("../packages/DataTables/images/sort_desc_disabled.png");
+  background-image: url("/js/DataTables/images/sort_desc_disabled.png");
 }
 
 table.dataTable thead th {
diff --git a/wqflask/wqflask/static/new/css/show_trait.css b/wqflask/wqflask/static/new/css/show_trait.css
index 39c6ba53..27404801 100644
--- a/wqflask/wqflask/static/new/css/show_trait.css
+++ b/wqflask/wqflask/static/new/css/show_trait.css
@@ -25,10 +25,10 @@ table.dataTable thead th, table.dataTable tfoot th{
 }
 
 table.dataTable thead .sorting_asc {
-  background-image: url("../packages/DataTables/images/sort_asc_disabled.png");
+  background-image: url("/js/DataTables/images/sort_asc_disabled.png");
 }
 table.dataTable thead .sorting_desc {
-  background-image: url("../packages/DataTables/images/sort_desc_disabled.png");
+  background-image: url("/js/DataTables/images/sort_desc_disabled.png");
 }
 
 table.dataTable thead th, table.dataTable tfoot {
-- 
cgit v1.2.3


From 506ef2eb500660ca7b16fcc99801b3c7e7a0f309 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 17:27:30 +0300
Subject: replace datatable-scroller in templates

---
 wqflask/wqflask/templates/show_trait.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 7b74a3f6..25aa6230 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -147,7 +147,7 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/scientific.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
-    <script type="text/javascript" src="https://cdn.datatables.net/scroller/2.0.2/js/dataTables.scroller.min.js"></script>
+   <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/scroller/js/scroller.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/packages/noUiSlider/nouislider.js"></script>
 
     <script type="text/javascript" src="/static/new/javascript/initialize_show_trait_tables.js"></script>
-- 
cgit v1.2.3


From 1bb40a56dd5a0a3d526284385835fb51c290c394 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 17:38:37 +0300
Subject: add replace colorbox css

---
 wqflask/wqflask/static/new/css/colorbox.css | 238 ++++++++++++++++++++++++++++
 wqflask/wqflask/templates/base.html         |   2 +-
 2 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 wqflask/wqflask/static/new/css/colorbox.css

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/css/colorbox.css b/wqflask/wqflask/static/new/css/colorbox.css
new file mode 100644
index 00000000..8b9fb388
--- /dev/null
+++ b/wqflask/wqflask/static/new/css/colorbox.css
@@ -0,0 +1,238 @@
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox,
+#cboxOverlay,
+#cboxWrapper {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 9999;
+    overflow: hidden;
+}
+
+#cboxOverlay {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+}
+
+#cboxMiddleLeft,
+#cboxBottomLeft {
+    clear: left;
+}
+
+#cboxContent {
+    position: relative;
+}
+
+#cboxLoadedContent {
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+#cboxTitle {
+    margin: 0;
+}
+
+#cboxLoadingOverlay,
+#cboxLoadingGraphic {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+
+#cboxPrevious,
+#cboxNext,
+#cboxClose,
+#cboxSlideshow {
+    cursor: pointer;
+}
+
+.cboxPhoto {
+    float: left;
+    margin: auto;
+    border: 0;
+    display: block;
+    max-width: none;
+    -ms-interpolation-mode: bicubic;
+}
+
+.cboxIframe {
+    width: 100%;
+    height: 100%;
+    display: block;
+    border: 0;
+}
+
+#colorbox,
+#cboxContent,
+#cboxLoadedContent {
+    box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay {
+    background: #fff;
+}
+
+#colorbox {
+    outline: 0;
+}
+
+#cboxTopLeft {
+    width: 25px;
+    height: 25px;
+    background: url(images/border1.png) no-repeat 0 0;
+}
+
+#cboxTopCenter {
+    height: 25px;
+    background: url(images/border1.png) repeat-x 0 -50px;
+}
+
+#cboxTopRight {
+    width: 25px;
+    height: 25px;
+    background: url(images/border1.png) no-repeat -25px 0;
+}
+
+#cboxBottomLeft {
+    width: 25px;
+    height: 25px;
+    background: url(images/border1.png) no-repeat 0 -25px;
+}
+
+#cboxBottomCenter {
+    height: 25px;
+    background: url(images/border1.png) repeat-x 0 -75px;
+}
+
+#cboxBottomRight {
+    width: 25px;
+    height: 25px;
+    background: url(images/border1.png) no-repeat -25px -25px;
+}
+
+#cboxMiddleLeft {
+    width: 25px;
+    background: url(images/border2.png) repeat-y 0 0;
+}
+
+#cboxMiddleRight {
+    width: 25px;
+    background: url(images/border2.png) repeat-y -25px 0;
+}
+
+#cboxContent {
+    background: #fff;
+    overflow: hidden;
+}
+
+.cboxIframe {
+    background: #fff;
+}
+
+#cboxError {
+    padding: 50px;
+    border: 1px solid #ccc;
+}
+
+#cboxLoadedContent {
+    margin-bottom: 20px;
+}
+
+#cboxTitle {
+    position: absolute;
+    bottom: 0px;
+    left: 0;
+    text-align: center;
+    width: 100%;
+    color: #999;
+}
+
+#cboxCurrent {
+    position: absolute;
+    bottom: 0px;
+    left: 100px;
+    color: #999;
+}
+
+#cboxLoadingOverlay {
+    background: #fff url(images/loading.gif) no-repeat 5px 5px;
+}
+
+/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+#cboxPrevious,
+#cboxNext,
+#cboxSlideshow,
+#cboxClose {
+    border: 0;
+    padding: 0;
+    margin: 0;
+    overflow: visible;
+    width: auto;
+    background: none;
+}
+
+/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+#cboxPrevious:active,
+#cboxNext:active,
+#cboxSlideshow:active,
+#cboxClose:active {
+    outline: 0;
+}
+
+#cboxSlideshow {
+    position: absolute;
+    bottom: 0px;
+    right: 42px;
+    color: #444;
+}
+
+#cboxPrevious {
+    position: absolute;
+    bottom: 0px;
+    left: 0;
+    color: #444;
+}
+
+#cboxNext {
+    position: absolute;
+    bottom: 0px;
+    left: 63px;
+    color: #444;
+}
+
+#cboxClose {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    display: block;
+    color: #444;
+}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF, endColorstr=#00FFFFFF);
+}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 5c8343d1..b0d22277 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -17,7 +17,7 @@
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/bootstrap.css" />
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/non-responsive.css" />
     <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/docs.css" />
-    <link rel="stylesheet" type="text/css" href="/static/packages/colorbox/example4/colorbox.css"  />
+    <link rel="stylesheet" type="text/css" href="/static/new/css/colorbox.css"  />
     <!--<link rel="stylesheet" type="text/css" href="/static/new/css/main.css"  />-->
     <link rel="stylesheet" type="text/css" href="/static/new/css/parsley.css"  />
 
-- 
cgit v1.2.3


From 16c1566041d4f871d2b4904392260261a7ee99f3 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Mon, 7 Dec 2020 17:47:38 +0300
Subject: add buttons.datatables css

---
 wqflask/wqflask/templates/admin/group_manager.html        | 2 +-
 wqflask/wqflask/templates/admin/manage_user.html          | 2 +-
 wqflask/wqflask/templates/admin/set_group_privileges.html | 2 +-
 wqflask/wqflask/templates/admin/view_group.html           | 2 +-
 wqflask/wqflask/templates/set_group_privileges.html       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/admin/group_manager.html b/wqflask/wqflask/templates/admin/group_manager.html
index c8ed6851..c0b99e75 100644
--- a/wqflask/wqflask/templates/admin/group_manager.html
+++ b/wqflask/wqflask/templates/admin/group_manager.html
@@ -2,7 +2,7 @@
 {% block title %}Group Manager{% endblock %}
 {% block css %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
+     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
 {% endblock %}
 {% block content %}
diff --git a/wqflask/wqflask/templates/admin/manage_user.html b/wqflask/wqflask/templates/admin/manage_user.html
index 7afe075f..3ef90b90 100644
--- a/wqflask/wqflask/templates/admin/manage_user.html
+++ b/wqflask/wqflask/templates/admin/manage_user.html
@@ -2,7 +2,7 @@
 {% block title %}View and Edit Group{% endblock %}
 {% block css %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
+     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
 {% endblock %}
 {% block content %}
diff --git a/wqflask/wqflask/templates/admin/set_group_privileges.html b/wqflask/wqflask/templates/admin/set_group_privileges.html
index bc52788f..04842453 100644
--- a/wqflask/wqflask/templates/admin/set_group_privileges.html
+++ b/wqflask/wqflask/templates/admin/set_group_privileges.html
@@ -2,7 +2,7 @@
 {% block title %}Set Group Privileges{% endblock %}
 {% block css %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
+     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
 {% endblock %}
 {% block content %}
diff --git a/wqflask/wqflask/templates/admin/view_group.html b/wqflask/wqflask/templates/admin/view_group.html
index 9e3cce7b..26692fe8 100644
--- a/wqflask/wqflask/templates/admin/view_group.html
+++ b/wqflask/wqflask/templates/admin/view_group.html
@@ -2,7 +2,7 @@
 {% block title %}View and Edit Group{% endblock %}
 {% block css %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
+     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
 {% endblock %}
 {% block content %}
diff --git a/wqflask/wqflask/templates/set_group_privileges.html b/wqflask/wqflask/templates/set_group_privileges.html
index 98b0cc12..a0a53292 100644
--- a/wqflask/wqflask/templates/set_group_privileges.html
+++ b/wqflask/wqflask/templates/set_group_privileges.html
@@ -2,7 +2,7 @@
 {% block title %}Set Group Privileges{% endblock %}
 {% block css %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTables/css/jquery.dataTables.css') }}" />
-    <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
+     <link rel="stylesheet" type="text/css" href="{{ url_for('css', filename='DataTablesExtensions/buttonStyles/css/buttons.dataTables.min.css') }}" />
     <link rel="stylesheet" type="text/css" href="/static/new/css/show_trait.css" />
 {% endblock %}
 {% block content %}
-- 
cgit v1.2.3


From 977e0068b4038e65c0a03c80c304adac9951507c Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 01:46:27 +0300
Subject: replace return with filter for conditional queries for correlations

---
 wqflask/wqflask/templates/show_trait_calculate_correlations.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
index 4f25e90a..6026e0a1 100644
--- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html
+++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
@@ -38,7 +38,7 @@
           </div>
 
           <div class="form-group">
-              <label for="corr_return_results" class="col-xs-2 control-label">Return</label>
+              <label for="corr_return_results" class="col-xs-2 control-label">Filter</label>
               <div class="col-xs-4 controls">
                   <select name="corr_return_results" class="form-control">
                       {% for return_result in corr_tools.return_results_menu %}
-- 
cgit v1.2.3


From 6b9627b7b3559a64c5523bad8b5b376ae786a69b Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 04:40:52 +0300
Subject: refactor filter datatable function

---
 .../static/new/javascript/auto_hide_column.js      | 43 ++++++++++------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index 94bb8a90..f879e0d1 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -1,28 +1,23 @@
-function filterDatable(datatable){
-        let visitedColumns=[]
-        let columnCount=datatable.columns().header().length;
-        let numberOfRows=datatable.data().length;
-        for (let i=0;i<numberOfRows;i++){
-            if (visitedColumns.length==columnCount){
+function filterDatatable(datatable){
+    let visitedFoundColumns=[]
+    let columnCount=datatable.columns().header().length;
+    let numberOfRows=datatable.data().length;
+    for (let i=0;i<numberOfRows;i++){
+        if (visitedFoundColumns.length==columnCount){
+            break;
+        }
+        let rowObj=datatable.rows(i).data()[0]
+        for(let col=0;col<rowObj.length;col++){
+            if (visitedFoundColumns.length==columnCount){
                 break;
             }
-            let rowObj=datatable.rows(i).data()
-            rowObj.data().each(function(rowData,v){
-                if (visitedColumns.length==columnCount){
-                    return false;
-                }
-                for (let j=0;j<rowData.length;j++){
-                    if (j in visitedColumns||visitedColumns.length==columnCount){
-                        break;
-                    }
-                    if (rowData[j]!="N/A" && rowData[j]!=""){
-
-                        visitedColumns.push(j)
-                    }
-                }
-            })
+            if (visitedFoundColumns.includes(col) || rowObj[col]=="N/A"||rowObj[col]==""){
+                continue;
+            }
+            visitedFoundColumns.push(col)
         }
-        emptyColumns=Array.from(Array(columnCount).keys()).filter((item)=>visitedColumns.indexOf(item)<0);
-        return datatable.columns(emptyColumns).visible(false);
+    }
+    emptyColumns=Array.from(Array(columnCount).keys()).filter((item)=>visitedFoundColumns.indexOf(item)<0);
+    return datatable.columns(emptyColumns).visible(false);
 
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 3a4357113cf52ef71a686736d30dad0291f33e33 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 04:50:26 +0300
Subject: replace item with column

---
 wqflask/wqflask/static/new/javascript/auto_hide_column.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index f879e0d1..2fc89786 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -17,7 +17,7 @@ function filterDatatable(datatable){
             visitedFoundColumns.push(col)
         }
     }
-    emptyColumns=Array.from(Array(columnCount).keys()).filter((item)=>visitedFoundColumns.indexOf(item)<0);
+    emptyColumns=Array.from(Array(columnCount).keys()).filter((column)=>visitedFoundColumns.indexOf(column)<0);
     return datatable.columns(emptyColumns).visible(false);
 
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 8e92e8b01779c97b58becf997604269bd6bb5bb7 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 13:16:01 +0300
Subject: replace plotly js in templates

---
 wqflask/wqflask/templates/comparison_bar_chart.html | 2 +-
 wqflask/wqflask/templates/corr_scatterplot.html     | 2 +-
 wqflask/wqflask/templates/mapping_results.html      | 2 +-
 wqflask/wqflask/templates/show_trait.html           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/comparison_bar_chart.html b/wqflask/wqflask/templates/comparison_bar_chart.html
index f791457f..9ea43097 100644
--- a/wqflask/wqflask/templates/comparison_bar_chart.html
+++ b/wqflask/wqflask/templates/comparison_bar_chart.html
@@ -32,7 +32,7 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='d3-tip/d3-tip.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/panelutil.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
-    <script type="text/javascript" src="/static/new/js_external/plotly-latest.min.js"></script>
+    <script type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/comparison_bar_chart.js"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/corr_scatterplot.html b/wqflask/wqflask/templates/corr_scatterplot.html
index 1133fcd2..41354cf5 100644
--- a/wqflask/wqflask/templates/corr_scatterplot.html
+++ b/wqflask/wqflask/templates/corr_scatterplot.html
@@ -354,6 +354,6 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <!--<script language="javascript" type="text/javascript" src="/static/new/javascript/get_traits_from_collection.js"></script>-->
-    <script type="text/javascript" src="/static/new/js_external/plotly-latest.min.js"></script>
+    <script type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/draw_corr_scatterplot.js"></script>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html
index 9542c29d..268144ec 100644
--- a/wqflask/wqflask/templates/mapping_results.html
+++ b/wqflask/wqflask/templates/mapping_results.html
@@ -350,7 +350,7 @@
     <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="/static/new/js_external/plotly-latest.min.js"></script>
+    <script type="text/javascript" src="{{ url_for('js', filename='plotly/plotly.min.js') }}"></script>
     {% if manhattan_plot == True and selectedChr == -1 %}
     <script type="text/javascript" src="/static/new/js_external/jscolor.js"></script>
     {% endif %}
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 7b74a3f6..18325abc 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -135,7 +135,7 @@
     <script type="text/javascript" src="{{ url_for('js', filename='d3-tip/d3-tip.js') }}"></script>
     <script type="text/javascript" src="/static/new/js_external/jstat.min.js"></script>
     <script type="text/javascript" src="/static/new/js_external/shapiro-wilk.js"></script>
-    <script type="text/javascript" src="/static/new/js_external/plotly-latest.min.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 type="text/javascript" src="/static/new/javascript/stats.js"></script>
-- 
cgit v1.2.3


From 713e1798256c01ab8b29f2f6209987091d8b08bf Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 16:15:59 +0300
Subject: remove duplicate lib in templates/base.html

---
 wqflask/wqflask/templates/base.html | 2 --
 1 file changed, 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index b0d22277..95a2c39e 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -255,8 +255,6 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js" type="text/javascript"></script>
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
-<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
-<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='colorbox/jquery.colorbox-min.js') }}"></script>
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
 
     <script type="text/javascript" src="/static/new/js_external/parsley.min.js"></script>
-- 
cgit v1.2.3


From 6de952648e36e7382ca692066aadbc48d613fb3c Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 16:40:20 +0300
Subject: remove duplicate libs

---
 wqflask/wqflask/templates/admin/create_group.html      | 2 --
 wqflask/wqflask/templates/admin/search_for_groups.html | 2 --
 wqflask/wqflask/templates/ctl_results.html             | 4 +---
 wqflask/wqflask/templates/network_graph.html           | 5 +----
 wqflask/wqflask/templates/pair_scan_results.html       | 2 --
 5 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/admin/create_group.html b/wqflask/wqflask/templates/admin/create_group.html
index 4ab70007..38ae834c 100644
--- a/wqflask/wqflask/templates/admin/create_group.html
+++ b/wqflask/wqflask/templates/admin/create_group.html
@@ -81,8 +81,6 @@
 
 {% block js %}
      <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/group_manager.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
 
diff --git a/wqflask/wqflask/templates/admin/search_for_groups.html b/wqflask/wqflask/templates/admin/search_for_groups.html
index 1df4d0a2..0e1ec720 100644
--- a/wqflask/wqflask/templates/admin/search_for_groups.html
+++ b/wqflask/wqflask/templates/admin/search_for_groups.html
@@ -64,8 +64,6 @@
 
 {% block js %}
      <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/group_manager.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
 
diff --git a/wqflask/wqflask/templates/ctl_results.html b/wqflask/wqflask/templates/ctl_results.html
index 7ce67d0e..5b8a4cc2 100644
--- a/wqflask/wqflask/templates/ctl_results.html
+++ b/wqflask/wqflask/templates/ctl_results.html
@@ -64,9 +64,7 @@
         gn2_url = "{{ gn2_url | safe }}"
     </script>
 
-     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='qtip2/jquery.qtip.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="/js/cytoscape/cytoscape.min.js"></script>
diff --git a/wqflask/wqflask/templates/network_graph.html b/wqflask/wqflask/templates/network_graph.html
index 33f0365b..06937293 100644
--- a/wqflask/wqflask/templates/network_graph.html
+++ b/wqflask/wqflask/templates/network_graph.html
@@ -139,10 +139,7 @@
         elements_list = {{ elements | safe }}
         gn2_url       = "{{ gn2_url | safe }}"
     </script>
-
-     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='qtip2/jquery.qtip.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/underscore.min.js') }}"></script>
 
diff --git a/wqflask/wqflask/templates/pair_scan_results.html b/wqflask/wqflask/templates/pair_scan_results.html
index 14a62e0d..a706403b 100644
--- a/wqflask/wqflask/templates/pair_scan_results.html
+++ b/wqflask/wqflask/templates/pair_scan_results.html
@@ -65,8 +65,6 @@
     <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='d3-tip/d3-tip.js') }}"></script>
      <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/scientific.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
-- 
cgit v1.2.3


From d03d66a15f0f400006ed61712f7e4ac82f041d33 Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 18:24:33 +0300
Subject: remove duplicates in base.html

---
 wqflask/wqflask/templates/base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 51a21324..4a6023b3 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -258,8 +258,7 @@
     <!--<script type="text/javascript" src="/static/new/javascript/login.js"></script>-->
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
-<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
-<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='js_alt/parsley.min.js') }}"></script>
+
 
     {% block js %}
     {% endblock %}
-- 
cgit v1.2.3


From eb5853e2327e399bd012c2ac085754cbb3db0bfb Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Tue, 8 Dec 2020 19:23:17 +0300
Subject: use Limit to for correlation

---
 wqflask/wqflask/templates/show_trait_calculate_correlations.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
index 6026e0a1..ba72ff27 100644
--- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html
+++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
@@ -38,7 +38,7 @@
           </div>
 
           <div class="form-group">
-              <label for="corr_return_results" class="col-xs-2 control-label">Filter</label>
+              <label for="corr_return_results" class="col-xs-2 control-label">Limit to</label>
               <div class="col-xs-4 controls">
                   <select name="corr_return_results" class="form-control">
                       {% for return_result in corr_tools.return_results_menu %}
-- 
cgit v1.2.3


From 4e3537b9e7525ea7a886cd12205bc40a53c5046a Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Wed, 9 Dec 2020 17:32:11 +0300
Subject: add changes to auto_hide_column

---
 .../static/new/javascript/auto_hide_column.js      | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/static/new/javascript/auto_hide_column.js b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
index 2fc89786..1a4dc039 100644
--- a/wqflask/wqflask/static/new/javascript/auto_hide_column.js
+++ b/wqflask/wqflask/static/new/javascript/auto_hide_column.js
@@ -1,23 +1,21 @@
-function filterDatatable(datatable){
-    let visitedFoundColumns=[]
-    let columnCount=datatable.columns().header().length;
-    let numberOfRows=datatable.data().length;
-    for (let i=0;i<numberOfRows;i++){
-        if (visitedFoundColumns.length==columnCount){
-            break;
-        }
-        let rowObj=datatable.rows(i).data()[0]
-        for(let col=0;col<rowObj.length;col++){
-            if (visitedFoundColumns.length==columnCount){
-                break;
+    function filterDatatable(datatable){
+        let invalidColumns=[]
+        let columnCount=datatable.columns().header().length;
+        let numberOfRows=datatable.rows().count();
+        for (let col=0; col<columnCount; col++){
+            colObj = datatable.column(col).nodes().to$();
+            allNAs = true;
+            for (let i=0;i<numberOfRows;i++){
+                cellContent = colObj[i].childNodes[0].data
+                if (cellContent != "N/A" && cellContent != ""){
+                    allNAs = false;
+                    break;
+                }
             }
-            if (visitedFoundColumns.includes(col) || rowObj[col]=="N/A"||rowObj[col]==""){
-                continue;
+            if (allNAs){
+                invalidColumns.push(col)
             }
-            visitedFoundColumns.push(col)
         }
-    }
-    emptyColumns=Array.from(Array(columnCount).keys()).filter((column)=>visitedFoundColumns.indexOf(column)<0);
-    return datatable.columns(emptyColumns).visible(false);
+        return datatable.columns(invalidColumns).visible(false);
 
-}
\ No newline at end of file
+    }
\ No newline at end of file
-- 
cgit v1.2.3