Commit 4150ea9e authored by Midoux Cedric's avatar Midoux Cedric

Merge branch 'master' of https://gitlab.irstea.fr/cedric.midoux/easy16S

Conflicts:
	server.R
parents 160a2ada 5235e20f
...@@ -213,18 +213,18 @@ shinyServer ...@@ -213,18 +213,18 @@ shinyServer
choices = rank_names(data16S()), choices = rank_names(data16S()),
inline = TRUE inline = TRUE
), ),
dataTableOutput("tableGlom") DT::dataTableOutput("tableGlom")
) )
) )
) )
}) })
output$tableGlom <- renderDataTable({ output$tableGlom <- DT::renderDataTable(server = FALSE, {
Glom <- tax_glom(data16S(), input$glomRank) Glom <- tax_glom(data16S(), input$glomRank)
taxTableGlom <- Glom %>% taxTableGlom <- Glom %>%
tax_table() %>% tax_table() %>%
as.data.frame(stringsAsFactors = FALSE) %>% as.data.frame(stringsAsFactors = FALSE) %>%
dplyr::select(1:input$glomRank) %>% dplyr::select(input$glomRank:1) %>%
tibble::rownames_to_column() tibble::rownames_to_column()
otuTableGlom <- Glom %>% otuTableGlom <- Glom %>%
otu_table() %>% otu_table() %>%
...@@ -233,24 +233,8 @@ shinyServer ...@@ -233,24 +233,8 @@ shinyServer
joinGlom <- joinGlom <-
dplyr::left_join(taxTableGlom, otuTableGlom, by = "rowname") %>% dplyr::left_join(taxTableGlom, otuTableGlom, by = "rowname") %>%
dplyr::select(-rowname) dplyr::select(-rowname)
return(joinGlom) beautifulTable(joinGlom)
}, })
options = list(
filter = "top",
dom = "lBtip",
pageLength = 10,
lengthMenu = list(c(-1, 10, 25, 50, 100), list('All', '10', '25', '50', '100')),
buttons = list(
'colvis',
list(
extend = 'collection',
buttons = c('copy', 'csv', 'excel', 'pdf'),
text = 'Download'
)
),
colReorder = TRUE,
scrollX = TRUE
))
output$histUI <- renderUI({ output$histUI <- renderUI({
validate(need(data16S(), "")) validate(need(data16S(), ""))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment