diff --git a/DESCRIPTION b/DESCRIPTION index aca73aa91c73197092b58c8fc7918820e8fd022e..85f12300a3e1b8705515746ea55b90121752ee9a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: shinyscreen Title: Pre-screening of Mass Spectrometry Data -Version: 1.0.5 +Version: 1.0.6 Author: Todor Kondić Maintainer: Todor Kondić <todor.kondic@uni.lu> Authors@R: diff --git a/R/shiny-ui-base.R b/R/shiny-ui-base.R index cd4d3656b6622f9732d3c87c67c66f3844a62138..bf80e7a88df707c5968fd2c5ce16543e2bca4156 100644 --- a/R/shiny-ui-base.R +++ b/R/shiny-ui-base.R @@ -277,22 +277,25 @@ style_tab_signif <- function(dt) { } ## A customised DT intended for spec data. -styled_dt <- function(tab,style = 'bootstrap', - class = 'cell-border', +styled_dt <- function(tab, extensions = 'Scroller', - options = list(scrollY=200, - scrollX=T, - dom = "t", - deferRender = T, - scroller = T, - ordering = F), + scrollY=200L, + dom = "t", + scroller = T, + ordering = F, colnames = style_tab_cols(tab), rownames = F, filter = 'top', ...) { + + options = list(scrollY=scrollY, + scrollX=T, + dom = "t", + deferRender = T, + scroller = scroller, + ordering = ordering) + dttab <- DT::datatable(tab, - style = style, - class = class, options = options, colnames = colnames, rownames = rownames, @@ -1722,11 +1725,11 @@ mk_shinyscreen_server <- function(projects,init) { DT::datatable(state$input$tab$cmpds, - style = 'bootstrap', - class = 'table-condensed', + ## style = 'bootstrap', + ## class = 'table-condensed', extensions = 'Scroller', options = list(scrollX = T, - scrollY = 200, + scrollY = 300, deferRender = T, scroller = T)) }) @@ -1736,11 +1739,11 @@ mk_shinyscreen_server <- function(projects,init) { state <- rf_compound_input_state() DT::datatable(state$input$tab$setid, - style = 'bootstrap', - class = 'table-condensed', + ## style = 'bootstrap', + ## class = 'table-condensed', extensions = 'Scroller', options = list(scrollX = T, - scrollY = 200, + scrollY = 300, deferRender = T, scroller = T)) }) @@ -1775,15 +1778,11 @@ mk_shinyscreen_server <- function(projects,init) { }) output$compound_selector_qa <- DT::renderDT({ - options <- list(scrollX=T, - dom = "t", - scroller = F, - ordering = F) styled_dt(rv_tran$qa_compsel_tab, extensions = NULL, selection = "none", filter = 'none', - options = options, + scroller = F, callback = DT::JS(dblclick_callback)) }) diff --git a/inst/rmd/app.Rmd b/inst/rmd/app.Rmd index ca80c35cf462d93f3054095ea5aad68baae48ea7..3520f6460438eddd6cfac6b67b1422b14a1651db 100644 --- a/inst/rmd/app.Rmd +++ b/inst/rmd/app.Rmd @@ -479,7 +479,7 @@ shiny::textInput(inputId = "rep_aut", label = "Report author", value = def_state shiny::textInput(inputId = "rep_tit", label = "Report title", value = def_state$conf$report$title) ``` -## View compound Lists and Sets {.tabset} +## View compound Lists and Sets ### Compound List @@ -609,22 +609,36 @@ filters. <div style="display: flex; vertical-align: top;margin: auto;"> -<div style="width: 50%;"> +<div style="width: 50%;padding-right=1.0em"> + +#### Compound selector + ```{r, echo=F} DT::DTOutput("compound_selector") ``` + +#### MS1 quality check table + ```{r, echo=F} DT::DTOutput("compound_selector_qa") ``` + </div> -<div style="width: 25%"> + +<div style="width: 50%"> + +#### MS2 quality check table + ```{r, echo=F} DT::DTOutput("compound_ms2_table") ``` -</div> -<div style="width: 25%"> + + +#### MS2 spectrum + + ```{r, echo=F} DT::DTOutput("compound_ms2_spectrum") ```