diff --git a/R/shiny-state.R b/R/shiny-state.R index e2c1630b931b63d588c58fd2a003f259eba825f4..bfdef8e91c0b0f58abaf345681642b9e6a8a3a33 100644 --- a/R/shiny-state.R +++ b/R/shiny-state.R @@ -76,7 +76,7 @@ r2datatab <- function(rdatatab) { gen_dtab <- function(tablist,sets) { data.table(tag=factor(tablist$tag,levels=unique(tablist$tag)), - adduct=factor(tablist$adduct,levels=ADDUCTMAP), + adduct=factor(tablist$adduct,levels=DISP_ADDUCTS), set=factor(tablist$set,levels=sets)) } diff --git a/R/shiny-ui-base.R b/R/shiny-ui-base.R index c7dab14aa9f421f067aa45b9f14595f786c8d0e7..fca1dafcfdd1ad85c3cfb5528d2e70ab81f93f2e 100644 --- a/R/shiny-ui-base.R +++ b/R/shiny-ui-base.R @@ -1133,11 +1133,13 @@ mk_shinyscreen_server <- function(projects,init) { }, label = "summ_subset-edit") observeEvent(input$datatab_cell_edit,{ - z <- DT::editData(rv_datatab(), + df <- gen_dtab(rvs$gui$datatab,sets=rf_get_sets()) + z <- DT::editData(df, input$datatab_cell_edit, rownames = F) - rv_datatab(z) - rv_flag_datatab(rv_flag_datatab()+1L) + + rvs$gui$datatab$set <- z$set + rvs$gui$datatab$adduct <- z$adduct }, label = "datatab-edit") ## FIXME: order_summ reordering/editing unstable. Therefore temporarily removed. @@ -1623,10 +1625,9 @@ mk_shinyscreen_server <- function(projects,init) { rvs$gui$datatab$tag rvs$gui$datatab$set rvs$gui$datatab$adduct - sets <- rf_get_subset() + sets <- rf_get_sets() dtab <- gen_dtab(rvs$gui$datatab, sets=sets) - message("Hey") print(dtab) tab <- dropdown_dt(dtab, callback = dt_drop_callback('1','2',sets)) tab