Account for ordering

R/brdg_hierarchical.R

@@ -36,6 +36,8 @@
 #'   named list of summary types.
 #' @param count (scalar `logical`)\cr
 #'   whether `tbl_hierarchical_count()` (`TRUE`) or `tbl_hierarchical()` (`FALSE`) is being applied.
+#' @param is_ordered (scalar `logical`)\cr
+#'   whether the last variable in `hierarchies` is ordered.
 #' @param label (named `list`)\cr
 #'   named list of hierarchy variable labels.
 #' @inheritParams tbl_hierarchical
@@ -53,6 +55,7 @@ brdg_hierarchical <- function(cards,
                               type,
                               overall_row,
                               count,
+                              is_ordered,
                               label) {
   set_cli_abort_call()
 
@@ -81,6 +84,20 @@ brdg_hierarchical <- function(cards,
     )
   }
 
+  if (is_ordered) {
+    grpX <- paste0("group", n_by + 1)
+    grpX_lvl <- paste0(grpX, "_level")
+    cards[which(cards[[grpX]] == hierarchies |> tail(1)), ] <-
+      cards[which(cards[[grpX]] == hierarchies |> tail(1)), ] |>
+      dplyr::rename(
+        variable := !!grpX,
+        variable_level := !!grpX_lvl,
+        !!grpX := "variable",
+        !!grpX_lvl := "variable_level"
+      ) |>
+      cards::tidy_ard_column_order()
+  }
+
   table_body <- pier_summary_hierarchical(
     cards = cards,
     variables = hierarchies,
@@ -97,7 +114,7 @@ brdg_hierarchical <- function(cards,
 
     # create dummy rows
     tbl_rows <- table_body |>
-      dplyr::filter(across(cards::all_ard_groups("names"), ~ .x != " ")) |>
+      dplyr::filter(dplyr::if_any(cards::all_ard_groups("names"), ~ .x != " ")) |>
       select(row_type, prior_gp, prior_gp_lvl) |>
       unique() |>
       mutate(

R/tbl_hierarchical.R

@@ -122,7 +122,7 @@ tbl_hierarchical <- function(data,
     denominator = denominator,
     include = {{ include }},
     statistic = statistic,
-    overall_row = {{ overall_row }},
+    overall_row = overall_row,
     label = label,
     digits = digits
   )
@@ -175,7 +175,7 @@ tbl_hierarchical_count <- function(data,
     denominator = denominator,
     include = {{ include }},
     statistic = "{n}",
-    overall_row = {{ overall_row }},
+    overall_row = overall_row,
     label = label,
     digits = digits
   )
@@ -356,6 +356,7 @@ internal_tbl_hierarchical <- function(data,
     type,
     overall_row,
     count = is_empty(id),
+    is_ordered = is.ordered(data[[hierarchies |> tail(1)]]),
     label
   ) |>
     append(
@@ -370,6 +371,11 @@ internal_tbl_hierarchical <- function(data,
 # this function calculates either the counts or the rates of the events
 .run_ard_stack_hierarchical_fun <- function(data, hierarchies, by, id, denominator, include, statistic, overall_row) {
   if (!is_empty(id)) {
+    if (is.ordered(data[[hierarchies |> tail(1)]])) {
+      by <- c(by, hierarchies |> tail(1))
+      hierarchies <- hierarchies |> head(-1)
+      include <- c(intersect(include, hierarchies), hierarchies |> tail(1))
+    }
     cards::ard_stack_hierarchical(
       data = data,
       variables = hierarchies,
@@ -379,7 +385,7 @@ internal_tbl_hierarchical <- function(data,
       include = include,
       statistic = statistic,
       over_variables = overall_row,
-      total_n = TRUE#is_empty(by)
+      total_n = is_empty(by)
     )
   } else {
     cards::ard_stack_hierarchical_count(