Skip to content

Commit 5af2c1f

Browse files
clarklimingbenoitBFalquet
authored
try to harmonize the templates (#496)
following #476, I tried to make the templates a bit clearer. something added 1. for aet01_aesi and aet01 template, remove the check functions in pre. all these derivations are executed without check! as users are responsible for these derivations and they are clear. more checks added in `main` functions 1. check the arm variable are identical in levels (in adsl and adae) 2. check variables to analyze exists (especially those new derived) 3. remove `deco`. titles/footnotes should be handled in citril using lopo 1. remove aet01_2. this can be handled through arguments of aet01 1. for aet02 template, variants are removed. can be achieved through argument `row_split_var` 2. add many utility functions (currently put in aet02.R but should go into utility.R) 3. valid_row_path. this checks if a row_path is valid for a table 4. valid_sort_at_path. this conduct the sort based on `row_path` if it is valid. (sort_at_path gives error on incorrect row_path provided, and aet02_1 previously will run into issues if prune_0 = FALSE on empty data) 5. get_sort_path. this function will create "*" between variables, e.g, `get_sort_path(c("A","B"))` will give "A" "*" "B", this is required by `sort_at_path` 6. tlg_sort_by_var. this functions will sort using "A" and "B", instead of "A" "*" "B". Also will check if the table contains the path. if does not contain the path, the sorting will be ignored. I think some of the funcitonality should go into tern/rtables. But for now let's use them. Please review this update in general and I will finalize this PR if no objections. Then everyone can collaborate to harmonize all templates. @Teninq @BFalquet @duanx9 @crazycatandy @barnett11 --------- Signed-off-by: b_falquet <[email protected]> Co-authored-by: benoit <[email protected]> Co-authored-by: b_falquet <[email protected]>
1 parent 73bc45e commit 5af2c1f

File tree

226 files changed

+8589
-12177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+8589
-12177
lines changed

.Rbuildignore

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
^\.pre-commit-config\.yaml$
44
^data-raw
55
^temp$
6-
^.github$
7-
^staged_dependencies.yaml$
8-
_pkgdown.yaml
6+
^\.github$
7+
^staged_dependencies\.yaml$
8+
_pkgdown\.yaml
99
docs
10-
^.lintr
11-
^.gitlab-ci.yml
12-
CODE_OF_CONDUCT.md
13-
SECURITY.md
10+
^\.lintr
11+
^\.gitlab-ci\.yml
12+
CODE_OF_CONDUCT\.md
13+
SECURITY\.md
14+
^doc$
15+
^Meta$
16+
^\.vscode$

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ temp
1010
.Renviron
1111
.Rprofile
1212
.vscode
13+
doc/
14+
Meta/
15+
*pdf

DESCRIPTION

+7-1
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ Imports:
3030
magrittr,
3131
methods,
3232
nestcolor (>= 0.1.1),
33+
purrr,
34+
stringr,
3335
rlang,
3436
rlistings (>= 0.2.1),
3537
rtables (>= 0.6.0),
3638
tern (>= 0.8.1),
37-
tibble
39+
tibble,
40+
utils
3841
Suggests:
3942
knitr,
4043
rmarkdown,
@@ -92,7 +95,10 @@ Collate:
9295
'package.R'
9396
'pdt01.R'
9497
'pdt02.R'
98+
'reexports.R'
9599
'rmpt01.R'
96100
'rspt01.R'
101+
'rtables_utils.R'
102+
'standard_rules.R'
97103
'vst01.R'
98104
'vst02.R'

0 commit comments

Comments
 (0)