70 formatting function round type

.github/workflows/R-CMD-check.yaml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macos-latest,   r: 'release'}
+#          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
 

.gitignore

@@ -32,7 +32,6 @@ programs_external/*
 #IDE
 .vscode/settings.json
 .idea/*
-temp_ilse/*
 
 #Air
 air.toml

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.3] - 2025-11-28
+## [0.1.2] - 2025-12-10
 
 ### Added and Removed
 - Add `a_two_tier()` analysis function
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixes #102 bug inappropriate warnings from `cond_rm_facets` function
 - Fix bug for not selecting NA records in `h_subset_combo()`
+- Consistent `tt_to_tbldf()` function behavior with invalid structures #116
 
 
 ## [0.1.1] - 2025-07-28

DESCRIPTION

@@ -14,6 +14,7 @@ Authors@R: c(
     person("Ezequiel", "Anokian", , "eanokia1@its.jnj.com", role = c("ctb")),
     person("Renfei", "Mao", , "rmao6@its.jnj.com", role = c("ctb")),
     person("Mrinal", "Das", , "mdas35@its.jnj.com", role = c("ctb")),
+    person("Wojciech", "Wojciak", , "wwojciak@its.jnj.com", role = c("ctb")),
     person("Isaac", "Gravestock", role = "cph",
            comment = "Author of included rbmi functions"),
     person("Joe", "Zhu", role = "cph",
@@ -35,19 +36,14 @@ Description: Structure and formatting requirements for clinical trial table and
 License: Apache License (>= 2)
 URL: https://github.com/johnsonandjohnson/junco, https://johnsonandjohnson.github.io/junco/
 BugReports: https://github.com/johnsonandjohnson/junco/issues
-Remotes:
-    insightsengineering/formatters@main,
-    insightsengineering/rtables@main,
-    insightsengineering/rlistings@main,
-    insightsengineering/tern@main
-Depends: 
+Depends:
     R (>= 4.4),
-    formatters (>= 0.5.6),
+    formatters (>= 0.5.12),
     rtables (>= 0.6.13)
 Imports:
     tidytlg (>= 0.1.5),
     tern (>= 0.9.9),
-    rlistings (>= 0.2.11),
+    rlistings (>= 0.2.13),
     checkmate (>= 2.1.0),
     broom,
     methods,
@@ -74,12 +70,16 @@ Suggests:
     mvtnorm,
     parallel,
     readxl,
-    pharmaverseadam,
+    rlang,
+    rbmi (>= 1.3.0),
+    tidyr,
     rlang,
     rbmi (>= 1.3.0),
     tidyr,
     rlang,
     pharmaverseadamjnj
 VignetteBuilder: knitr
 Config/testthat/edition: 3
+Remotes:
+    insightsengineering/rtables@main
 Additional_repositories: https://insightsengineering.r-universe.dev/

NAMESPACE

@@ -47,7 +47,6 @@ export(find_missing_chg_after_avisit)
 export(fit_ancova)
 export(fit_mmrm_j)
 export(format_stats)
-export(format_xx_fct)
 export(get_mmrm_lsmeans)
 export(get_ref_info)
 export(get_titles_from_file)
@@ -60,6 +59,7 @@ export(inches_to_spaces)
 export(insert_blank_line)
 export(jj_complex_scorefun)
 export(jjcs_num_formats)
+export(jjcsformat_cnt_den_fract_fct)
 export(jjcsformat_count_denom_fraction)
 export(jjcsformat_count_fraction)
 export(jjcsformat_fraction_count_denom)

NEWS.md

@@ -10,8 +10,9 @@
 
 - Remove some unused functions (jj_uc_map, postfun_cog, postfun_eq5d, column_N, non_blank_sentinel, null_fn, unicodify
 - Replace {pharmaverseadam} with {pharmaverseadamjnj}
-- fix bug for not selecting NA records in `h_subset_combo()`
-- update `string_to_title()` to handle factors (#26)
+- Fix bug for not selecting NA records in `h_subset_combo()`
+- Update `string_to_title()` to handle factors (#26)
+- Consistent `tt_to_tbldf()` function behavior with invalid structures (#116)
 
 ## Other changes
 

R/column_stats.R

@@ -1,60 +1,33 @@
-calc_one_visit <- function(datvec, decimal, statnm, visit, varnm, roundmethod = c("sas", "iec"), exclude_visits,
+calc_one_visit <- function(datvec, decimal, statnm, visit, varnm, round_type = valid_round_type, exclude_visits,
                            var_names = c("AVAL", "CHG", "BASE")) {
-  roundmethod <- match.arg(roundmethod)
+  round_type <- match.arg(round_type)
   if (is.na(decimal)) {
     decimal <- 0
   }
   if ((varnm == var_names[2] || varnm == var_names[3]) && (visit %in% exclude_visits)) {
     return(NULL)
   }
-  if (roundmethod == "sas") {
-    switch(statnm,
-      N = length(stats::na.omit(datvec)),
-      SE = format(
-        tidytlg::roundSAS(stats::sd(datvec) / sqrt(length(stats::na.omit(datvec))), decimal + 2),
-        nsmall = decimal + 2
-      ),
-      SD = format(
-        tidytlg::roundSAS(stats::sd(datvec), decimal + 2),
-        nsmall = decimal +
-          2
-      ),
-      Mean = format(tidytlg::roundSAS(mean(datvec), decimal + 1), nsmall = decimal + 1),
-      mean_sd = paste0(
-        format(tidytlg::roundSAS(mean(datvec), decimal + 1), nsmall = decimal + 1),
-        " (",
-        format(
-          tidytlg::roundSAS(stats::sd(datvec), decimal + 2),
-          nsmall = decimal +
-            2
-        ),
-        ")"
-      ),
-      Med = format(tidytlg::roundSAS(stats::median(datvec), decimal + 1), nsmall = decimal + 1),
-      Min = format(tidytlg::roundSAS(min(datvec), decimal), nsmall = decimal),
-      Max = format(tidytlg::roundSAS(max(datvec), decimal), nsmall = decimal)
-    )
-  } else {
-    switch(statnm,
-      N = length(stats::na.omit(datvec)),
-      SE = format(round(stats::sd(datvec) / sqrt(length(stats::na.omit(datvec))), decimal + 2), nsmall = decimal + 2),
-      SD = format(round(stats::sd(datvec), decimal + 2), nsmall = decimal + 2),
-      Mean = format(round(mean(datvec), decimal + 1), nsmall = decimal + 1),
-      mean_sd = paste0(
-        format(round(mean(datvec), decimal + 1), nsmall = decimal + 1),
-        " (",
-        format(
-          round(stats::sd(datvec), decimal + 2),
-          nsmall = decimal +
-            2
-        ),
-        ")"
-      ),
-      Med = format(round(stats::median(datvec), decimal + 1), nsmall = decimal + 1),
-      Min = format(round(min(datvec), decimal), nsmall = decimal),
-      Max = format(round(max(datvec), decimal), nsmall = decimal)
-    )
-  }
+
+  switch(statnm,
+    N = length(stats::na.omit(datvec)),
+    SE = round_fmt(stats::sd(datvec) / sqrt(length(stats::na.omit(datvec))),
+      decimal + 2,
+      round_type = round_type
+    ),
+    SD = round_fmt(stats::sd(datvec), decimal + 2, round_type = round_type),
+    Mean = round_fmt(mean(datvec), decimal + 1,
+      round_type = round_type
+    ),
+    mean_sd = paste0(
+      round_fmt(mean(datvec), decimal + 1, round_type = round_type),
+      " (",
+      round_fmt(stats::sd(datvec), decimal + 2, round_type = round_type),
+      ")"
+    ),
+    Med = round_fmt(stats::median(datvec), decimal + 1, round_type = round_type),
+    Min = round_fmt(min(datvec), decimal, round_type = round_type),
+    Max = round_fmt(max(datvec), decimal, round_type = round_type),
+  )
 }
 
 #' @name column_stats