From a3963cb36effea45092a5ae17bd3dd05ffb9f778 Mon Sep 17 00:00:00 2001 From: Dawid Kaledkowski Date: Mon, 20 Jun 2022 14:40:40 +0200 Subject: [PATCH 1/2] get_Varlabel directly from data --- DESCRIPTION | 1 + R/tm_a_pca.R | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index ad4fedab2..1d58cfd96 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -31,6 +31,7 @@ Imports: dplyr, DT, forcats, + formatters (>= 0.3.2), ggExtra, ggpmisc (>= 0.4.3), ggpp, diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R index 9ce1ca600..082eed76b 100644 --- a/R/tm_a_pca.R +++ b/R/tm_a_pca.R @@ -245,7 +245,7 @@ srv_a_pca <- function(id, datasets, dat, plot_height, plot_width, ggplot2_args) response[[i]]$select$multiple <- FALSE response[[i]]$select$always_selected <- NULL response[[i]]$select$selected <- NULL - response[[i]]$select$choices <- names(datasets$get_data_attr(response[[i]]$dataname, "column_labels")) + response[[i]]$select$choices <- formatters::var_labels(datasets$get_data(response[[i]]$dataname)) response[[1]]$select$choices <- setdiff( response[[1]]$select$choices, datasets$get_keys(response[[i]]$dataname) From 22fbd6d535795f9c01d7b279c2876dc022182caf Mon Sep 17 00:00:00 2001 From: Dawid Kaledkowski Date: Mon, 20 Jun 2022 15:04:10 +0200 Subject: [PATCH 2/2] remove formatters dependency --- DESCRIPTION | 1 - R/tm_a_pca.R | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1d58cfd96..ad4fedab2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -31,7 +31,6 @@ Imports: dplyr, DT, forcats, - formatters (>= 0.3.2), ggExtra, ggpmisc (>= 0.4.3), ggpp, diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R index 082eed76b..310dab4bc 100644 --- a/R/tm_a_pca.R +++ b/R/tm_a_pca.R @@ -245,7 +245,7 @@ srv_a_pca <- function(id, datasets, dat, plot_height, plot_width, ggplot2_args) response[[i]]$select$multiple <- FALSE response[[i]]$select$always_selected <- NULL response[[i]]$select$selected <- NULL - response[[i]]$select$choices <- formatters::var_labels(datasets$get_data(response[[i]]$dataname)) + response[[i]]$select$choices <- datasets$get_varlabels(dataname = response[[i]]$dataname) response[[1]]$select$choices <- setdiff( response[[1]]$select$choices, datasets$get_keys(response[[i]]$dataname)