From 6ae4b324718ee56cea14935b19dc9d939cc9c532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zxBIB=20Lech=C3=B3n=2CMiguel=20=28MED=20BDS=29=20EXTERNAL?= Date: Sun, 3 Nov 2024 10:27:35 +0100 Subject: [PATCH 1/3] removes capitalize rule --- inst/www/css/custom.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/inst/www/css/custom.scss b/inst/www/css/custom.scss index ca27702..99c7879 100644 --- a/inst/www/css/custom.scss +++ b/inst/www/css/custom.scss @@ -33,7 +33,6 @@ body { li { a { padding: 16px 20px; - text-transform: capitalize; color: $color-text; background-color: $primary; color: $color-text; From b758d978c1585ac3a269fc1834562126a3a6b9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zxBIB=20Lech=C3=B3n=2CMiguel=20=28MED=20BDS=29=20EXTERNAL?= Date: Fri, 22 Nov 2024 17:16:45 +0100 Subject: [PATCH 2/3] Add `data` slot to afmm. --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ R/app_server.R | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3bfcee7..7af0b35 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: dv.manager Type: Package Title: DaVinci Module Manager -Version: 2.1.3 +Version: 2.1.4 Authors@R: c(person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph", "fnd")), person('Sorin', 'Voicu', email = 'sorin.voicu.ext@boehringer-ingelheim.com', role = c('aut')), person('Luis', 'Morís Fernández', email = 'luis.moris.fernandez@gmail.com', role = c('cre', 'aut'))) diff --git a/NEWS.md b/NEWS.md index 887dda1..5ad45a6 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# dv.manager 2.1.4 + +- Removes leftover title automatic capitalization. + +- Extends Arguments From Module Manager to include include a `data` slot that acts as a pass-through of the `run_app` argument by the same name. + # dv.manager 2.1.3 - dv.manager includes the option to filter using several datasets diff --git a/R/app_server.R b/R/app_server.R index 9cd9462..80ba8de 100644 --- a/R/app_server.R +++ b/R/app_server.R @@ -195,6 +195,7 @@ app_server_ <- function(input, output, session, opts) { } module_args <- list( + data = data, unfiltered_dataset = unfiltered_dataset, filtered_dataset = filtered_dataset, url_parameters = url_parameters, From 147212b3e4d8930fe8d9d564938617f9dac55082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zxBIB=20Lech=C3=B3n=2CMiguel=20=28MED=20BDS=29=20EXTERNAL?= Date: Fri, 22 Nov 2024 17:55:40 +0100 Subject: [PATCH 3/3] Tweak vignette to include `data` field of afmm. --- vignettes/arguments_from_module_manager.Rmd | 23 +++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/vignettes/arguments_from_module_manager.Rmd b/vignettes/arguments_from_module_manager.Rmd index 3a13389..d90ace2 100644 --- a/vignettes/arguments_from_module_manager.Rmd +++ b/vignettes/arguments_from_module_manager.Rmd @@ -14,15 +14,15 @@ knitr::opts_chunk$set( ) ``` -```{r setup} +```{r setup, include = FALSE} library(dv.manager) ``` - - -When developing a module we create a wrapper function that returns a list that is used to instantiate a given module +When developing a module, we create a wrapper function that returns a list that is used to instantiate a given module inside module manager. Within this list the `server` is a function with a single parameter provided by module manager when -the server function is called. This parameter by convention usually called `afmm`, an acronym of **a**rguments **f**rom **m**odule **manager**. `afmm` is a list with the following entries: +the server function is called. This parameter by convention usually called `afmm`, an acronym of **a**rguments **f**rom **m**odule **m**anager. `afmm` is a list with the following entries: + +1. **data**: a list of lists of data frames (or of functions that return data frames). Pass-through of the `run_app` argument by the same name. 1. **unfiltered_dataset**: a metaReactive list containing the tables inside the selected dataset before filtering them. @@ -32,11 +32,9 @@ the server function is called. This parameter by convention usually called `afmm 1. **dataset_name**: a reactive string containing the name of the selected dataset. (Deprecated) -1. **dataset_metadata**: a list with following entries: - - 1. **name**: a reactive string with the name of the selected dataset - - 1. **date_range**: a reactive character vector with two entries earliest and latest modification date in the dataset. +1. **dataset_metadata**: a list with the following entries: + a. **name**: a reactive string with the name of the selected dataset + a. **date_range**: a reactive character vector with two entries earliest and latest modification date in the dataset. 1. **module_output**: a function that when called returns a list of all the values returned by the different modules indexed by the module_id. @@ -93,7 +91,6 @@ mod_table <- function(table_name, mod_id) { mod } - data_list <- list( "D1" = list(adsl = pharmaverseadam::adsl, adae = pharmaverseadam::adae), "D2" = list(adsl = pharmaverseadam::adsl, adae = pharmaverseadam::adae) @@ -113,7 +110,8 @@ run_app( ``` When creating the module list we can select which of the tables inside the dataset we will access. Nonetheless, this is -just a design choice of the module developer. See below another possible example in which we can also select +just a design choice of the module developer. See below another possible example in which we can select either the +filtered or unfiltered dataset input by toggling the logical `filtered` parameter. ```{r, eval = FALSE} mod_table <- function(table_name, filtered = FALSE, mod_id) { @@ -132,7 +130,6 @@ mod_table <- function(table_name, filtered = FALSE, mod_id) { mod } - data_list <- list("D1" = list(adsl = pharmaverseadam::adsl, adae = pharmaverseadam::adae)) module_list <- list(