Skip to content

Commit ad25976

Browse files
committed
clean show R code for remove zero-only columns
1 parent 8dba181 commit ad25976

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

R/tm_t_crosstable.R

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
378378
ANL
379379
)
380380

381-
teal.code::eval_code(
381+
obj <- teal.code::eval_code(
382382
merged$anl_q_r(),
383383
substitute(
384384
expr = {
@@ -423,17 +423,32 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
423423
)
424424
) %>%
425425
teal.code::eval_code(
426-
substitute(
427-
expr = {
428-
ANL <- tern::df_explicit_na(ANL)
429-
if (remove_zero_columns) {
426+
expression(ANL <- tern::df_explicit_na(ANL))
427+
)
428+
429+
if (remove_zero_columns) {
430+
obj <- obj %>%
431+
teal.code::eval_code(
432+
substitute(
433+
expr = {
430434
ANL[[y_name]] <- droplevels(ANL[[y_name]])
431-
}
432-
table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
433-
},
434-
env = list(y_name = y_name, remove_zero_columns = remove_zero_columns)
435+
table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
436+
},
437+
env = list(y_name = y_name)
438+
)
435439
)
436-
)
440+
} else {
441+
obj <- obj %>%
442+
teal.code::eval_code(
443+
substitute(
444+
expr = {
445+
table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
446+
},
447+
env = list(y_name = y_name)
448+
)
449+
)
450+
}
451+
obj
437452
})
438453

439454
decorated_output_q <- srv_decorate_teal_data(

0 commit comments

Comments
 (0)