From 52996ca81edb059e6796ad1365a3744c6c6cde6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <todor.kondic@uni.lu>
Date: Mon, 4 Jul 2022 09:54:04 +0200
Subject: [PATCH] app: shiny-state, shiny-ui-base: Close the datafile loop.
---
R/shiny-state.R | 2 +-
R/shiny-ui-base.R | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/R/shiny-state.R b/R/shiny-state.R
index e2c1630..bfdef8e 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 c7dab14..fca1daf 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
--
GitLab