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 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 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