Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

207 new figure figure 3 #225

Merged
merged 17 commits into from
Aug 23, 2024
Merged

207 new figure figure 3 #225

merged 17 commits into from
Aug 23, 2024

Conversation

huanlugwu
Copy link
Collaborator

Pull Request

huanlugwu and others added 2 commits May 29, 2024 11:07
* 201 new figure figure 14 (#209)

* First draft

First draft (not fully working)

* New push

Now the results are correct. Colors in the table are missing and the order of the group is not correct.

* Delete width= in geom_errorbar

To avoid warning `position_dodge()` requires non-overlapping x intervals

* Update

Put example in comments @examples

* Update fda-fig_14 and argument convention

* tests

Update setup.R to add ggplot2

* quarto page

* _quarto.yml and NEWS.md

* typo

* Put PARAMCD in code mode

* Remove id_var, add visit_var, reverse order of table rows

* [skip actions] Restyle files

* Add to index

* [skip actions] Restyle files

* Empty commit

* Fix unrelated broken template

* [skip actions] Roxygen Man Pages Auto Update

* Empty commit

* Fix lint

* Fix imports/exports

* Update template

---------

Co-authored-by: Emily de la Rua <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com>

* 196-new-table-38 (#204)

* 1st commitment for all documents

* [skip actions] Restyle files

* [skip actions] Roxygen Man Pages Auto Update

* Fix table 35 title

* Update index

* Update label indentation

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Emily de la Rua <[email protected]>

* 195 new table table 36 (#208)

* Add make_table_36

* Add tests for make_table_36

* Addd quarto page for make_table_36

* [skip actions] Restyle files

* Update NEWS file

* Remove scda from table 22

* Solve lintr marks for table 22

* empty commit

* Update WORDLIST

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Abinaya Yogasekaram <[email protected]>
Co-authored-by: ayogasekaram <[email protected]>
Co-authored-by: Emily de la Rua <[email protected]>

* 105 table 09 tplyr (#192)

* Prepare first raw tplyr table including risk difference columns

* Table 9 Tplyr: Update header string in case risk difference columns are expected

* Table 9 Tplyr: Add parameter for overall column

* Tab 9 Tplyr: Introduce soc_var parameter

* Add show_colcounts and prune functionality

* Clean comments

* Replace remaining hard-coded variable names by parameters

* Add option to return a gt_table object

* Add checkmate checks

* Allow for both, character and factor, since tplyr seems to prefer character

* Update roxygen documentation

* Add make_table_09_tplyr() to web page

* Establish first test cases

* Add test for correct column header assignment (make_table_09_tplyr)

* Add column ordering based on arm order for make_table_09_tplyr

* Add final tests and clean

* [skip actions] Restyle files

* Solve lintr markers

* Update after devtools::check()

* [skip actions] Restyle files

* [skip actions] Roxygen Man Pages Auto Update

* Restart github check by code modification

* Update example data frpm scda to random.cdisc.data

* [skip actions] Restyle files

* [skip actions] Roxygen Man Pages Auto Update

* Set RoxygenNote to 7.3.0 as required by GitHub action

* Fix make_table_09_tplyr() row order

* Add scda to 'Suggests' since table 22 still includes it in the example and tests

* Move scda from Suggests to Imports since table 22 quarto page relies on it as well...

* Replace scda w/ random.cdisc.data for table 22 examples and tests

* [skip actions] Roxygen Man Pages Auto Update

* Restrict Tplyr version to <= 1.1.0 until newly introduced incompatibilities w/ higher versions are solved

* Restrict to Tplyr version 1.1.0

* Remove version restriction for Tplyr

* Deactivate risk difference feature until {Tplyr} issue is solved

* Re-document

* [skip style] [skip vbump] Restyle files

---------

Co-authored-by: mattkorb <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: ayogasekaram <[email protected]>

* Update boehringer company logo on website (#214)

* [skip actions] Bump version to 0.1.0.9054

* 211 new table table 33 with gtsummary (#212)

Closes #211

* [skip actions] Bump version to 0.1.0.9055

* 205_BUG_fix _make_table_34 Issue (#215)

* Calculate counts for FMQ levels.
Updated test file and Qualt file accordingly.

* [skip style] [skip vbump] Restyle files

* [skip roxygen] [skip vbump] Roxygen Man Pages Auto Update

* lint R check

* [skip style] [skip vbump] Restyle files

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com>

---------

Co-authored-by: Alex Assuied <[email protected]>
Co-authored-by: Emily de la Rua <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 27856297+dependabot-preview[bot]@users.noreply.github.com <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: YoshitoKoujin <[email protected]>
Co-authored-by: Korbinian Matthias <[email protected]>
Co-authored-by: Abinaya Yogasekaram <[email protected]>
Co-authored-by: ayogasekaram <[email protected]>
Co-authored-by: Jessica Knizia <[email protected]>
Co-authored-by: mattkorb <[email protected]>
Co-authored-by: edelarua <[email protected]>
@huanlugwu huanlugwu linked an issue Jun 12, 2024 that may be closed by this pull request
8 tasks
Copy link
Collaborator

@edelarua edelarua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @huanlugwu,

Thanks for working on this! Could you look into using the ggsurvfit package instead of survminer for the plot generation? There is a survfit2() function and a ggsurvfit() function that should be analogous to survminer::surv_fit() and survminer::ggsurvplot(), respectively. Since we are pivoting towards using cards/cardx/gtsummary more throughout the package, ggsurvfit should be easier than survminer to use alongside these packages in terms of syntax, input types, workflows, etc.

Thanks!!

@huanlugwu huanlugwu requested a review from edelarua August 22, 2024 09:14
@huanlugwu
Copy link
Collaborator Author

Hi @huanlugwu,

Thanks for working on this! Could you look into using the ggsurvfit package instead of survminer for the plot generation? There is a survfit2() function and a ggsurvfit() function that should be analogous to survminer::surv_fit() and survminer::ggsurvplot(), respectively. Since we are pivoting towards using cards/cardx/gtsummary more throughout the package, ggsurvfit should be easier than survminer to use alongside these packages in terms of syntax, input types, workflows, etc.

Thanks!!

Thanks for your review, Emily! I've updated my codes using pharmaverse::{ggsurvfit}, Could you please take another look?

Copy link
Contributor

github-actions bot commented Aug 22, 2024

Unit Test Performance Difference

Test Suite $Status$ Time on main $±Time$ $±Tests$ $±Skipped$ $±Failures$ $±Errors$
fda-fig_03 👶 $+1.93$ $+8$ $+4$ $0$ $0$
Additional test case details
Test Suite $Status$ Time on main $±Time$ Test Case
fda-fig_03 👶 $+0.71$ Figure_03_generation_works_with_custom_values
fda-fig_03 👶 $+0.59$ Figure_03_generation_works_with_default_values
fda-fig_03 👶 $+0.55$ Figure_03_generation_works_with_ggtheme_argument_specified
fda-fig_03 👶 $+0.08$ Figure_03_generation_works_with_no_table

Results for commit 1151467

♻️ This comment has been updated with latest results.

Copy link
Contributor

github-actions bot commented Aug 22, 2024

badge

Code Coverage Summary

Filename            Stmts    Miss  Cover    Missing
----------------  -------  ------  -------  ---------
R/fda-fig_01.R         75       0  100.00%
R/fda-fig_02.R         75       0  100.00%
R/fda-fig_03.R        107       0  100.00%
R/fda-fig_14.R        115       0  100.00%
R/fda-table_02.R      166       0  100.00%
R/fda-table_03.R       35       0  100.00%
R/fda-table_04.R       63       0  100.00%
R/fda-table_05.R       61       0  100.00%
R/fda-table_06.R       76       0  100.00%
R/fda-table_07.R       35       0  100.00%
R/fda-table_08.R       46       0  100.00%
R/fda-table_09.R      329       0  100.00%
R/fda-table_10.R       26       0  100.00%
R/fda-table_11.R       42       0  100.00%
R/fda-table_12.R       40       0  100.00%
R/fda-table_13.R       20       0  100.00%
R/fda-table_14.R       27       0  100.00%
R/fda-table_15.R       32       0  100.00%
R/fda-table_16.R       32       0  100.00%
R/fda-table_17.R       32       0  100.00%
R/fda-table_18.R       32       0  100.00%
R/fda-table_20.R       71       0  100.00%
R/fda-table_21.R       78       0  100.00%
R/fda-table_22.R       77       0  100.00%
R/fda-table_32.R       94       0  100.00%
R/fda-table_33.R       95       0  100.00%
R/fda-table_34.R       41       0  100.00%
R/fda-table_35.R       23       0  100.00%
R/fda-table_36.R       30       0  100.00%
R/fda-table_38.R       39       0  100.00%
R/utils.R              28       0  100.00%
TOTAL                2042       0  100.00%

Diff against main

Filename          Stmts    Miss  Cover
--------------  -------  ------  --------
R/fda-fig_03.R     +107       0  +100.00%
TOTAL              +107       0  +100.00%

Results for commit: 87cf4aa

Minimum allowed coverage is 80%

♻️ This comment has been updated with latest results

Copy link
Contributor

github-actions bot commented Aug 22, 2024

Unit Tests Summary

  1 files   30 suites   1m 10s ⏱️
134 tests 134 ✅   0 💤 0 ❌
480 runs  354 ✅ 126 💤 0 ❌

Results for commit 87cf4aa.

♻️ This comment has been updated with latest results.

Copy link
Collaborator

@edelarua edelarua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is good to merge! I just made some small changes to standardize with other templates and fix all the checks, but otherwise everything was great!!

Thanks @huanlugwu :)

@huanlugwu huanlugwu merged commit 3d1e45d into main Aug 23, 2024
25 checks passed
@huanlugwu huanlugwu deleted the 207-new-figure-figure-3 branch August 23, 2024 01:04
@huanlugwu huanlugwu restored the 207-new-figure-figure-3 branch August 23, 2024 06:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New Figure]: Figure 3
2 participants