Fixed UI for select_base_from not updating when switching between mod…

…els.
john-harrold · Aug 24, 2024 · 6c5a660 · 6c5a660
1 parent 4f762c0
commit 6c5a660
Show file tree

Hide file tree

Showing 58 changed files with 259 additions and 254 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -27,7 +27,6 @@ Imports:
   shiny,
   shinyAce,
   shinyWidgets,
-  rxode2 (>= 2.1.2),
   stats,
   stringr,
   tidyr,
@@ -44,6 +43,7 @@ Suggests:
   prompter,
   rmarkdown,
   readxl,
+  rxode2 (>= 2.1.2),
   rxode2et,
   shinydashboard,
   testthat (>= 3.0.0),

diff --git a/R/CTS_Server.R b/R/CTS_Server.R
@@ -4306,6 +4306,7 @@ CTS_set_current_element    = function(state, element){
     paste0('                time_scales       = ', ts_object,          ','),
     paste0('                rules             = ', rules_object_name,  ','),
     paste0('                rx_options        = ', rxopts_object_name, ')'),
+    "",
     "# Collecting the simulation and event history values",
     paste0(sim_tc_object_name, ' = ', simres_object_name, '[["simall"]]'),
     paste0(sim_ev_object_name, ' = ', simres_object_name, '[["ev_history"]]'),

diff --git a/R/MB_Server.R b/R/MB_Server.R
@@ -86,7 +86,7 @@ MB_Server <- function(id,
 
       uiele})
     #------------------------------------
-    # Generating the
+    # Generating the timescale selection UI
     output$ui_select_time_scale    = renderUI({
         input[["element_name"]]
         input[["ui_mb_model"]]
@@ -168,7 +168,10 @@ MB_Server <- function(id,
       }
     uiele})
     #------------------------------------
+    # Generating the UI to select model from catalog or user-defined model
     output$ui_select_base_from = renderUI({
+      input[["element_name"]]
+      input[["ui_mb_model"]]
       state = MB_fetch_state(id              = id,
                              id_ASM          = id_ASM,
                              input           = input,

diff --git a/README.Rmd b/README.Rmd
@@ -53,6 +53,8 @@ install.packages("ubiquity")
 install.packages("nlmixr2lib")
 install.packages("nonmem2rx")
 install.packages("rxode2")
+install.packages("rxode2et")
+install.packages("nlmixr2")
 
 # Actual package
 install.packages("ruminate")

diff --git a/build_custom.R b/build_custom.R
@@ -1,6 +1,5 @@
-#repo_root = here::here()
-#setwd(repo_root)
-repo_root = file.path("~", "projects", "ruminate", "github", "ruminate")
+repo_root = here::here()
+setwd(repo_root)
 
 devtools::document(roclets = c('rd', 'collate', 'namespace'))
 

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -7,5 +7,5 @@ articles:
   model_builder: model_builder.html
   noncompartmental_analysis: noncompartmental_analysis.html
   simulate_rules: rmdhunks/simulate_rules.html
-last_built: 2024-08-22T01:43Z
+last_built: 2024-08-22T03:40Z
 
diff --git a/docs/reference/CTS_add_covariate.html b/docs/reference/CTS_add_covariate.html
diff --git a/docs/reference/CTS_add_rule.html b/docs/reference/CTS_add_rule.html
diff --git a/docs/reference/CTS_change_source_model.html b/docs/reference/CTS_change_source_model.html