Merge pull request #12 from ricoderks/dev

Dev
ricoderks · Jul 8, 2021 · 6a797d5 · 6a797d5
2 parents dab71fc + ecbc495
commit 6a797d5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: lipidomics
 Type: Package
 Title: Lipidomics workflow
-Version: 0.6.2
+Version: 0.6.3
 Author: Rico Derks
 Maintainer: Rico Derks <[email protected]>
 Description: Lipidomics workflow to proces the result files (export alignment)

diff --git a/R/shinyAppServer.R b/R/shinyAppServer.R
@@ -139,14 +139,16 @@ shinyAppServer <- function(input, output, session) {
     all_data$lipid_data_filter <- all_data$lipid_data_long %>%
       mutate(
         keep = case_when(
+          !(.data$my_id %in% keep_class) ~ FALSE,
           !(.data$my_id %in% keep_rsd) ~ FALSE,
           !(.data$my_id %in% keep_msms) ~ FALSE,
-          !(.data$my_id %in% keep_class) ~ FALSE,
+          # !(.data$my_id %in% keep_class) ~ FALSE,
           TRUE ~ TRUE),
         comment = case_when(
+          !(.data$my_id %in% keep_class) ~ "remove_class",
           !(.data$my_id %in% keep_rsd) ~ "large_rsd",
           !(.data$my_id %in% keep_msms) ~ "no_match",
-          !(.data$my_id %in% keep_class) ~ "remove_class",
+          # !(.data$my_id %in% keep_class) ~ "remove_class",
           TRUE ~ "")
       )
   })
@@ -491,14 +493,16 @@ shinyAppServer <- function(input, output, session) {
     all_data$lipid_data_filter <- tmp_filter %>%
       mutate(
         keep = case_when(
+          !(.data$my_id %in% keep_lipids_class) ~ FALSE,
           !(.data$my_id %in% keep_lipids_rsd) ~ FALSE,
           !(.data$my_id %in% keep_lipids_msms) ~ FALSE,
-          !(.data$my_id %in% keep_lipids_class) ~ FALSE,
+          # !(.data$my_id %in% keep_lipids_class) ~ FALSE,
           TRUE ~ TRUE),
         comment = case_when(
+          !(.data$my_id %in% keep_lipids_class) ~ "remove_class",
           !(.data$my_id %in% keep_lipids_rsd) ~ "large_rsd",
           !(.data$my_id %in% keep_lipids_msms) ~ "no_match",
-          !(.data$my_id %in% keep_lipids_class) ~ "remove_class",
+          # !(.data$my_id %in% keep_lipids_class) ~ "remove_class",
           TRUE ~ "")
       )
   })