Merge branch 'master' of https://git.ratg.cat/marcelcosta/invivos

invivos/app.R

@@ -142,6 +142,7 @@ server <- function(input, output) {
     df<-df[!is.na(df$Volume),]
     up_cuttof<-input$upcut
     low_cuttof<-input$lowcut
+    print(up_cuttof)
     df<-df[df$Volume <= up_cuttof & df$Volume >= low_cuttof,]
     
     
@@ -183,11 +184,10 @@ server <- function(input, output) {
     if ("Group" %in% colnames(df_def)){
       df_def<-df_def %>% select(-"Group") 
     }
-
     df_def<-merge(dades$taula %>% select(-Group), df_def[,c("ID animal", "group")], all=T) %>% select(c(`ID animal`, `ID tumor`, Volume, Cage, Major, Minor, group))
-    
+    df_def[!paste0(df_def$`ID animal`, df_def$`ID tumor`) %in% paste0(df$`ID animal`, df$`ID tumor`),"group"]<-NA
     dades$db<-df_def
-    print(df_def)
+
     
     ggplot(df_def, aes(group, Volume))+
       geom_boxplot(outlier.alpha = F)+