Skip to content

Commit 7773446

Browse files
authored
Merge pull request #1097 from pharmaverse/886-r-script-with-the-custom-time-duplicate-management
Consider time duplicates in R-script
2 parents f3a40ab + 958fc7c commit 7773446

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: aNCA
22
Title: (Pre-)Clinical NCA in a Dynamic Shiny App
3-
Version: 0.1.0.9110
3+
Version: 0.1.0.9111
44
Authors@R: c(
55
person("Ercan", "Suekuer", email = "ercan.suekuer@roche.com", role = "aut",
66
comment = c(ORCID = "0009-0001-1626-1526")),

R/get_session_code.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ get_settings_code <- function(
253253
slope_rules = settings[["slope_rules"]],
254254
data_path = data_path,
255255
mapping = mapping,
256-
ratio_table = ratio_table
256+
ratio_table = ratio_table,
257+
time_duplicate_rows = NULL
257258
)
258259
get_code(
259260
template_path = template_path,

inst/shiny/modules/tab_data/data_mapping.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ data_mapping_server <- function(id, adnca_data, trigger) {
305305
# Check for blocking duplicates using annotate_duplicates()
306306
df_duplicates <- reactiveVal(NULL)
307307
resolved_time_duplicate_rows <- reactiveVal(NULL)
308+
observe({
309+
session$userData$time_duplicate_rows <- resolved_time_duplicate_rows()
310+
})
308311

309312
processed_data <- reactive({
310313
req(mapped_data())

inst/www/templates/script_template.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ adnca_data <- read_pk(data_path)
1515
mapping <- settings_list$mapping
1616
names(mapping) <- gsub("select_", "", names(mapping))
1717
applied_filters <- settings_list$applied_filters
18+
time_duplicate_rows <- settings_list$time_duplicate_rows
1819

1920
int_parameters <- settings_list$settings$int_parameters
2021
units_table <- settings_list$units_table
@@ -28,7 +29,8 @@ pknca_obj <- adnca_data %>%
2829
# Preprocess raw data and create the PKNCA object
2930
PKNCA_create_data_object(
3031
mapping = mapping,
31-
applied_filters = applied_filters
32+
applied_filters = applied_filters,
33+
time_duplicate_rows = time_duplicate_rows
3234
) %>%
3335

3436
# Setup basic settings

0 commit comments

Comments
 (0)