From 0f05b13e6d40cf049e7edcf2c000a5a50937617a Mon Sep 17 00:00:00 2001 From: Wang Zheng Date: Sat, 30 May 2026 21:08:39 +0800 Subject: [PATCH 1/2] fix: include ATPTREF and ROUTE columns in ADPP export_cdisc output (#1276) Co-Authored-By: Claude Opus 4.7 --- DESCRIPTION | 2 +- NEWS.md | 1 + R/data.R | 2 +- data-raw/metadata_nca_variables.csv | 2 ++ data/metadata_nca_variables.rda | Bin 8518 -> 8590 bytes man/metadata_nca_variables.Rd | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 93220e9b3..3ff5bdc60 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: aNCA Title: (Pre-)Clinical NCA in a Dynamic Shiny App -Version: 0.1.0.9175 +Version: 0.1.0.9176 Authors@R: c( person("Ercan", "Suekuer", email = "ercan.suekuer@roche.com", role = "aut", comment = c(ORCID = "0009-0001-1626-1526")), diff --git a/NEWS.md b/NEWS.md index 9ac7adfd1..e2d4f1520 100644 --- a/NEWS.md +++ b/NEWS.md @@ -94,6 +94,7 @@ * NCA results flagging correctly distinguishes missing vs not-requested parameters (#934) * Custom units table join uses correct keys instead of hardcoded columns (#1159) * "Summarise by" selector in Matrix Ratios fixed (input ID mismatch) (#1198) +* `export_cdisc()` now includes `ATPTREF` and `ROUTE` columns in ADPP output (#1276) ### Settings & Upload * SASS compilation moved from runtime to build-time script, fixing startup crashes on read-only deployments (#1107) diff --git a/R/data.R b/R/data.R index 12408448c..a78a5ba26 100644 --- a/R/data.R +++ b/R/data.R @@ -39,7 +39,7 @@ #' #' A dataset containing pharmacokinetic variable specifications. #' -#' @format A data frame with 359 rows and 19 variables: +#' @format A data frame with 363 rows and 19 variables: #' \describe{ #' \item{Dataset}{Character. Indicates the dataset the variable belongs to (PP, ADNCA, ADPP).} #' \item{Order}{Numeric. Variable order within its domain, based on Role, Core and Variable} diff --git a/data-raw/metadata_nca_variables.csv b/data-raw/metadata_nca_variables.csv index 71b080203..e010349bf 100644 --- a/data-raw/metadata_nca_variables.csv +++ b/data-raw/metadata_nca_variables.csv @@ -361,3 +361,5 @@ ADNCA,264,PKSUM1F,PK Summary Exclusion Flag 1,text,Record Qualifier,Perm,FALSE,F ADNCA,265,PKSUM1FN,PK Summary Exclusion Flag 1 (N),integer,Record Qualifier,Perm,FALSE,FALSE,12,,FALSE,,FALSE,,,,NA,FALSE ADPP,193,PPSUMFL,PP Summary Exclusion Flag,text,Record Qualifier,Perm,FALSE,FALSE,1,,FALSE,,FALSE,,,,NA,FALSE ADPP,194,PPSUMRSN,PP Summary Exclusion Reason,text,Record Qualifier,Perm,FALSE,FALSE,200,,FALSE,,FALSE,,,,NA,FALSE +ADPP,229,ATPTREF,Analysis Timepoint Reference,text,Timing,Perm,FALSE,FALSE,200,,FALSE,,FALSE,,,,NA,FALSE +ADPP,88,ROUTE,Route of Administration,text,Topic,Perm,FALSE,FALSE,40,C66729,FALSE,,FALSE,,,,NA,FALSE diff --git a/data/metadata_nca_variables.rda b/data/metadata_nca_variables.rda index b0677ea7dca23aa26400600cc2025addeb93cfab..3551d8358fc62a815d82cf6a9a939a54f0b74ec2 100644 GIT binary patch literal 8590 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 UDcYU6{}cZgaz!{$ke29X_jxkwOaK4? literal 8518 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 AbpQYW diff --git a/man/metadata_nca_variables.Rd b/man/metadata_nca_variables.Rd index a634fd13c..a438ace66 100644 --- a/man/metadata_nca_variables.Rd +++ b/man/metadata_nca_variables.Rd @@ -5,7 +5,7 @@ \alias{metadata_nca_variables} \title{metadata_nca_variables} \format{ -A data frame with 359 rows and 19 variables: +A data frame with 363 rows and 19 variables: \describe{ \item{Dataset}{Character. Indicates the dataset the variable belongs to (PP, ADNCA, ADPP).} \item{Order}{Numeric. Variable order within its domain, based on Role, Core and Variable} From d435342e8a8a947eda13a4f1baf2deed1d8d9a49 Mon Sep 17 00:00:00 2001 From: Wang Zheng Date: Thu, 4 Jun 2026 17:06:04 +0800 Subject: [PATCH 2/2] test: verify ATPTREF and ROUTE appear in ADPP export output (#1276) --- tests/testthat/test-export_cdisc.R | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/testthat/test-export_cdisc.R b/tests/testthat/test-export_cdisc.R index 0b4f7907e..ca97b73e2 100644 --- a/tests/testthat/test-export_cdisc.R +++ b/tests/testthat/test-export_cdisc.R @@ -969,4 +969,10 @@ describe("export_cdisc: flag columns do not leak to other outputs", { crit_cols <- grep("^CRIT|PPSUMFL|PPSUMRSN", names(pp), value = TRUE) expect_length(crit_cols, 0) }) + + it("includes ATPTREF and ROUTE in ADPP when present in source data (#1276)", { + result <- export_cdisc(test_pknca_res) + expect_true("ATPTREF" %in% names(result$adpp)) + expect_true("ROUTE" %in% names(result$adpp)) + }) })