From 4bdc0b6fb3c292766f321fc1d78040a881082cba Mon Sep 17 00:00:00 2001 From: Felix Lohmeier Date: Fri, 8 Mar 2019 20:22:36 +0100 Subject: [PATCH 1/5] added facet by blank to menu All --- .../modules/core/langs/translation-en.json | 1 + .../scripts/views/data-table/data-table-view.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index 2cd4c0cf2..d653d7b11 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -581,6 +581,7 @@ "core-views/starred-rows": "Starred Rows", "core-views/facet-flag": "Facet by flag", "core-views/flagged-rows": "Flagged Rows", + "core-views/blank-rows": "Blank Rows", "core-views/edit-rows": "Edit rows", "core-views/star-rows": "Star rows", "core-views/unstar-rows": "Unstar rows", diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index 27bbed432..eed0ab1d3 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -650,6 +650,23 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } ); } + }, + { + label: $.i18n('core-views/facet-blank'), + id: "core/facet-by-blank", + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name" : $.i18n('core-views/blank-rows'), + "columnName" : "", + "expression" : "(filter(row.columnNames,cn,isNonBlank(cells[cn].value)).length()>0).toString()" + }, + { + "scroll" : false + } + ); + } } ] }, From 229b049f23dc8eeec4e03968ef3a70590516a278 Mon Sep 17 00:00:00 2001 From: Felix Lohmeier Date: Fri, 8 Mar 2019 20:25:38 +0100 Subject: [PATCH 2/5] added facet "Count non-blank values/column" to menu All --- .../modules/core/langs/translation-en.json | 2 ++ .../scripts/views/data-table/data-table-view.js | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index d653d7b11..d823145ae 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -582,6 +582,8 @@ "core-views/facet-flag": "Facet by flag", "core-views/flagged-rows": "Flagged Rows", "core-views/blank-rows": "Blank Rows", + "core-views/count-non-blank-values": "Count non-blank values/column", + "core-views/non-blank-values": "Non-blank values per column", "core-views/edit-rows": "Edit rows", "core-views/star-rows": "Star rows", "core-views/unstar-rows": "Unstar rows", diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index eed0ab1d3..03af637aa 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -667,6 +667,23 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } ); } + }, + { + label: $.i18n('core-views/count-non-blank-values'), + id: "core/count-non-blank-values", + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name" : $.i18n('core-views/non-blank-values'), + "columnName" : "", + "expression" : "filter(row.columnNames,cn,isNonBlank(cells[cn].value))" + }, + { + "scroll" : false + } + ); + } } ] }, From 2db567ab0f1bc53de02b1adce63475a56e27ede7 Mon Sep 17 00:00:00 2001 From: Felix Lohmeier Date: Fri, 8 Mar 2019 20:26:18 +0100 Subject: [PATCH 3/5] added facet "Count non-blank records/column" to menu All --- .../modules/core/langs/translation-en.json | 2 ++ .../scripts/views/data-table/data-table-view.js | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index d823145ae..212798e4f 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -584,6 +584,8 @@ "core-views/blank-rows": "Blank Rows", "core-views/count-non-blank-values": "Count non-blank values/column", "core-views/non-blank-values": "Non-blank values per column", + "core-views/count-non-blank-records": "Count non-blank records/column", + "core-views/non-blank-records": "Non-blank records per column", "core-views/edit-rows": "Edit rows", "core-views/star-rows": "Star rows", "core-views/unstar-rows": "Unstar rows", diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index 03af637aa..c7e44b308 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -684,6 +684,23 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } ); } + }, + { + label: $.i18n('core-views/count-non-blank-records'), + id: "core/count-non-blank-records", + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name" : $.i18n('core-views/non-blank-records'), + "columnName" : "", + "expression" : "filter(row.columnNames,cn,isNonBlank(if(row.record.fromRowIndex==row.index,row.record.cells[cn].value.join(\"\"),null)))" + }, + { + "scroll" : false + } + ); + } } ] }, From 9c55c7e12189f3282a3ed6aa407f6b8192fd30d0 Mon Sep 17 00:00:00 2001 From: Felix Lohmeier Date: Fri, 8 Mar 2019 20:51:14 +0100 Subject: [PATCH 4/5] fix facet by blank (switched true/false) --- .../modules/core/scripts/views/data-table/data-table-view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index c7e44b308..67ad9c247 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -660,7 +660,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { { "name" : $.i18n('core-views/blank-rows'), "columnName" : "", - "expression" : "(filter(row.columnNames,cn,isNonBlank(cells[cn].value)).length()>0).toString()" + "expression" : "(filter(row.columnNames,cn,isNonBlank(cells[cn].value)).length()==0).toString()" }, { "scroll" : false From 2c266d3f20f0b93885a75f886175b56186e8b6bc Mon Sep 17 00:00:00 2001 From: Felix Lohmeier Date: Mon, 11 Mar 2019 20:33:51 +0100 Subject: [PATCH 5/5] renamed new facets in menu All --- main/webapp/modules/core/langs/translation-en.json | 2 -- .../core/scripts/views/data-table/data-table-view.js | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index 212798e4f..7fe6bb415 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -582,9 +582,7 @@ "core-views/facet-flag": "Facet by flag", "core-views/flagged-rows": "Flagged Rows", "core-views/blank-rows": "Blank Rows", - "core-views/count-non-blank-values": "Count non-blank values/column", "core-views/non-blank-values": "Non-blank values per column", - "core-views/count-non-blank-records": "Count non-blank records/column", "core-views/non-blank-records": "Non-blank records per column", "core-views/edit-rows": "Edit rows", "core-views/star-rows": "Star rows", diff --git a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js index 67ad9c247..3132b2381 100644 --- a/main/webapp/modules/core/scripts/views/data-table/data-table-view.js +++ b/main/webapp/modules/core/scripts/views/data-table/data-table-view.js @@ -669,8 +669,8 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } }, { - label: $.i18n('core-views/count-non-blank-values'), - id: "core/count-non-blank-values", + label: $.i18n('core-views/non-blank-values'), + id: "core/non-blank-values", click: function() { ui.browsingEngine.addFacet( "list", @@ -686,8 +686,8 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) { } }, { - label: $.i18n('core-views/count-non-blank-records'), - id: "core/count-non-blank-records", + label: $.i18n('core-views/non-blank-records'), + id: "core/non-blank-records", click: function() { ui.browsingEngine.addFacet( "list",