Merge branch 'main' into 931_reinstate_summarize_vars_in_cols@main

insightsengineering · Jun 6, 2023 · f636231 · f636231
2 parents df741d0 + 6ca9aa5
commit f636231
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9011
+    rev: v0.3.2.9013
     hooks:
       - id: style-files
         name: Style code with `styler`

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: tern
 Title: Create Common TLGs Used in Clinical Trials
-Version: 0.8.2.9002
-Date: 2023-06-02
+Version: 0.8.2.9003
+Date: 2023-06-06
 Authors@R: c(
     person("Joe", "Zhu", , "joe.zhu@roche.com", role = c("aut", "cre")),
     person("Daniel", "Sabanés Bové", , "daniel.sabanes_bove@roche.com", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# tern 0.8.2.9002
+# tern 0.8.2.9003
 
 ### Enhancements
 * Added explicit zero counts to `g_km` plot "at risk" annotation tables.

diff --git a/R/kaplan_meier_plot.R b/R/kaplan_meier_plot.R
@@ -971,7 +971,7 @@ h_grob_tbl_at_risk <- function(data, annot_tbl, xlim) {
   annot_tbl <- expand.grid(
     time = seq(0, xlim, y_int),
     strata = unique(annot_tbl$strata)
-  ) %>% left_join(annot_tbl, by = c("time", "strata"))
+  ) %>% dplyr::left_join(annot_tbl, by = c("time", "strata"))
   annot_tbl[is.na(annot_tbl)] <- 0
   y_str_unit <- as.numeric(annot_tbl$strata)
   vp_table <- grid::plotViewport(margins = grid::unit(c(0, 0, 0, 0), "lines"))