From 4642848cbf086e8f44a9c57a47ad59df95fe4726 Mon Sep 17 00:00:00 2001 From: Rico Derks Date: Mon, 30 Oct 2023 13:48:59 +0100 Subject: [PATCH 1/2] Bump dev version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8090e2b..7d6aae7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: lipidomics Type: Package Title: Lipidomics workflow -Version: 0.9.10 +Version: 0.9.10.9000 Author: Rico Derks Maintainer: Rico Derks Description: Lipidomics workflow to proces the result files (export alignment) From 0e8cf2163821a7f200194b850f1bff532a9de001 Mon Sep 17 00:00:00 2001 From: Rico Derks Date: Mon, 30 Oct 2023 13:54:52 +0100 Subject: [PATCH 2/2] This should fix issue #51. --- R/shinyAppServer.R | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/R/shinyAppServer.R b/R/shinyAppServer.R index 07035e1..7c1ec4c 100644 --- a/R/shinyAppServer.R +++ b/R/shinyAppServer.R @@ -1924,8 +1924,7 @@ shinyAppServer <- function(input, output, session) { req(all_data$analysis_data) # export needs to be in wide format export_wide <- all_data$analysis_data %>% - filter(.data$sample_type != "blank", - .data$keep == TRUE, + filter(.data$keep == TRUE, .data$class_keep == TRUE) %>% pivot_wider(id_cols = c(.data$my_id, .data$LongLipidName, .data$ShortLipidName, .data$LipidClass), names_from = .data$sample_name, @@ -1934,8 +1933,6 @@ shinyAppServer <- function(input, output, session) { if(all_data$merged_data == TRUE) { t_meta <- all_data$analysis_data %>% - # remove blanks - filter(.data$sample_type != "blank") %>% # select the columns select(.data$sample_name, .data$sample_type:last_col()) %>% select(-matches("\\.y")) %>%