diff --git a/DESCRIPTION b/DESCRIPTION index bde9f22..0c33326 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: BIGapp Title: Breeding Insight Genomics Shiny Application -Version: 0.6.1 +Version: 0.6.2 Authors@R: c( person(c("Alexander", "M."), "Sandercock", diff --git a/R/app_ui.R b/R/app_ui.R index de2dd35..45c2112 100644 --- a/R/app_ui.R +++ b/R/app_ui.R @@ -94,7 +94,7 @@ app_ui <- function(request) { ), left = div( style = "display: flex; align-items: center; height: 100%;", # Center the version text vertically - "v0.6.0") + "v0.6.2") ), dashboardBody( disconnectMessage(), #Adds generic error message for any error if not already accounted for diff --git a/R/mod_gwas.R b/R/mod_gwas.R index b9f2512..beeafb0 100644 --- a/R/mod_gwas.R +++ b/R/mod_gwas.R @@ -296,7 +296,7 @@ mod_gwas_server <- function(input, output, session, parent_session){ info <- data.frame(vcf@fix) gpoly_df <- cbind(info[,c("ID","CHROM","POS")], geno_mat) - if(!any(colnames(gpoly_df) %in% phenotype_file$Sample_ID)) { + if(!any(colnames(gpoly_df) %in% phenotype_file[,1])) { shinyalert( title = "Samples ID do not match", text = paste("Check if passport/phenotype files have same sample ID as the VCF/genotype file."), @@ -314,7 +314,7 @@ mod_gwas_server <- function(input, output, session, parent_session){ } validate( - need(any(colnames(gpoly_df) %in% phenotype_file$Sample_ID), "The selected traits must be numerical.") + need(any(colnames(gpoly_df) %in% phenotype_file[,1]), "The selected traits must be numerical.") ) write.csv(gpoly_df, file = temp_geno_file, row.names = FALSE)