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

Closes #10 add function create_iso8601() #21

Merged
merged 56 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c9554f5
clean up dummy test
ramiromagno Nov 15, 2023
0b2532c
add `dtc_formats` data set
ramiromagno Nov 15, 2023
5368f4d
update .Rbuildignore
ramiromagno Nov 15, 2023
b3f29d2
add tibble support for automatic pretty printing of tibbles
ramiromagno Nov 15, 2023
475d8df
add `create_iso8601()` (closes #10)
ramiromagno Nov 15, 2023
81ef1e5
clean up `lintr::lint_package()` issues
ramiromagno Nov 15, 2023
b0bbe79
Automatic renv profile update.
ramiromagno Nov 15, 2023
d493b4c
Automatic renv profile update.
ramiromagno Nov 15, 2023
83db47d
Fix typos in R/dtc_utils.R
ramiromagno Nov 16, 2023
00d1e8f
remove `dummy()` function
ramiromagno Nov 16, 2023
5347631
remove `.onLoad()` function
ramiromagno Nov 16, 2023
8cc595a
Remove the `is_dtc_fmt()` function
ramiromagno Nov 16, 2023
ae8966c
Import `.data` from rlang globally
ramiromagno Nov 16, 2023
96505f0
Update WORDLIST
ramiromagno Nov 16, 2023
431c14a
Update `assert_capture_matrix()` and `complete_capture_matrix()` docs
ramiromagno Nov 16, 2023
673adcc
Add `coalesce_capture_matrices()` doc
ramiromagno Nov 16, 2023
057c84a
Merge branch '0010_calculate_isodate' of github.com:pharmaverse/sdtm.…
ramiromagno Nov 16, 2023
0b75374
Fix typo in `assert_dtc_fmt()` doc
ramiromagno Nov 16, 2023
0810be0
Add `regex_or()` doc
ramiromagno Nov 16, 2023
0a848c3
Add `fmt_rg()` doc
ramiromagno Nov 16, 2023
113c67c
Add `fmt_c()` doc
ramiromagno Nov 16, 2023
d558103
Add `parse_dttm_fmt()` doc
ramiromagno Nov 16, 2023
95e76ed
Fix doc of `parse_dttm_fmt()`
ramiromagno Nov 16, 2023
0f298c9
Add `dttm_fmt_to_regex()` doc
ramiromagno Nov 16, 2023
07cb489
Bump development version to 0.0.0.9001
ramiromagno Nov 16, 2023
565fdc7
Merge branch 'main' into 0010_calculate_isodate
ramiromagno Nov 17, 2023
57dd584
Style updates
ramiromagno Nov 17, 2023
52c752c
Style update to tests/testthat/test-yy_to_yyyy.R
ramiromagno Nov 17, 2023
55b0e5e
Style update
ramiromagno Nov 17, 2023
20f40ac
Blank lines removal
ramiromagno Nov 17, 2023
c43343e
Style update
ramiromagno Nov 17, 2023
8bac47b
Update docs after style update
ramiromagno Nov 17, 2023
0bad5ed
Refactor code about parsing dttm formats
ramiromagno Nov 19, 2023
dae8861
Make `parse_dttm_fmt()` handle the case of no matching format components
ramiromagno Nov 19, 2023
80e7278
Use `fmt_dttmc()` in unit tests
ramiromagno Nov 19, 2023
507b911
Small clarification on unit test description
ramiromagno Nov 20, 2023
d6cd751
Remove futile assertion from `assert_dtc_fmt()`
ramiromagno Nov 20, 2023
2079aa7
Add staged_dependencies for admiraldev (#26)
galachad Nov 20, 2023
2142f59
Merge branch '0010_calculate_isodate' of github.com:pharmaverse/sdtm.…
ramiromagno Nov 20, 2023
3becca5
Automatic renv profile update.
ramiromagno Nov 20, 2023
926026b
Automatic renv profile update.
ramiromagno Nov 20, 2023
c069713
Cleaned up lintr issues
ramiromagno Nov 20, 2023
160b7f0
Export `fmt_cmp()` and add early draft of `create_iso8601()` article
ramiromagno Nov 21, 2023
d223edd
Merge branch '0010_calculate_isodate' of github.com:pharmaverse/sdtm.…
ramiromagno Nov 21, 2023
b87efd0
Update `create_iso8601()` article
ramiromagno Nov 22, 2023
62eb915
Link `create_iso8601()` doc to article "iso_8601"
ramiromagno Nov 22, 2023
396d042
Add RM as author to DESCRIPTION
ramiromagno Nov 22, 2023
530924f
Fix author role of RM
ramiromagno Nov 22, 2023
b19b8a9
Fix indentation at `fmt_cmp()` source
ramiromagno Nov 22, 2023
aa21135
Remove `.check_format` from examples and add an example with `fmt_cmp()`
ramiromagno Nov 22, 2023
81336b1
Add an example to `create_iso8601()` with involving alternative forma…
ramiromagno Nov 22, 2023
e62fc5f
Add example to `create_iso8601()` about the interplay of `.format` an…
ramiromagno Nov 22, 2023
53d8b5a
Update common.yml
galachad Nov 22, 2023
763f6da
Update style
ramiromagno Nov 22, 2023
8cd0849
Change "oak" to "sdtm.oak" in DESCRIPTION
ramiromagno Nov 22, 2023
30376c3
Change "oak" to "sdtm.oak" in README
ramiromagno Nov 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
^pkgdown$
^LICENSE\.md$
^\.lintr$
^data-raw$
^staged_dependencies.yaml$
^vignettes/articles$
2 changes: 1 addition & 1 deletion .Rprofile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Sys.setenv("RENV_CONFIG_AUTO_SNAPSHOT" = FALSE)
if (!Sys.getenv("RENV_AUTOLOADER_ENABLED") %in% c("false", "FALSE")) {
.renv_profile <- paste(R.version$major, substr(R.version$minor, 1, 1), sep = ".")
if (!file.exists("./renv/profile")) {
if (.renv_profile %in% c("4.1", "4.2", "4.3")) {
if (.renv_profile %in% c("4.2", "4.3")) {
message("Set renv profile to `", .renv_profile, "`")
Sys.setenv("RENV_PROFILE" = .renv_profile)
} else {
Expand Down
95 changes: 0 additions & 95 deletions .devcontainer/4.1/devcontainer.json

This file was deleted.

4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This outlines how to propose a change to the aok package. For more detailed info
about contributing to {oak}, and other [pharmaverse
packages](https://pharmaverse.org/), please see the [development process
guide](https://pharmaverse.github.io/admiraldev/main/articles/development_process.html)
guide](https://pharmaverse.github.io/admiraldev/articles/development_process.html)
as well as other Developer Guides in the Articles section of the [{admiral}
website](https://pharmaverse.github.io/admiral/cran-release/index.html)

Expand All @@ -23,7 +23,7 @@ feedback. Since we are not a 100% fully resourced software development team it
might be that some issues will take longer to respond to depending on the amount
of overall issues.

* Familiarize yourself with our [programming strategy](https://pharmaverse.github.io/admiraldev/main/articles/programming_strategy.html), guidance for [GitHub usage](https://pharmaverse.github.io/admiraldev/main/articles/git_usage.html) and [unit testing](https://pharmaverse.github.io/admiraldev/main/articles/unit_test_guidance.html).
* Familiarize yourself with our [programming strategy](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html), guidance for [GitHub usage](https://pharmaverse.github.io/admiraldev/articles/git_usage.html) and [unit testing](https://pharmaverse.github.io/admiraldev/articles/unit_test_guidance.html).

* All newly [created issues](https://github.com/pharmaverse/oak/issues) will be
reviewed within the next backlog meeting and the creator will receive an
Expand Down
8 changes: 4 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Thank you for your Pull Request! We have developed this task checklist from the
[Development Process
Guide](https://pharmaverse.github.io/admiraldev/devel/articles/development_process.html)
Guide](https://pharmaverse.github.io/admiraldev/articles/development_process.html)
to help with the final steps of the process. Completing the below tasks helps to
ensure our reviewers can maximize their time on your code as well as making sure
the oak codebase remains robust and consistent.
Expand All @@ -18,13 +18,13 @@ Request Title (Use Edit button in top-right if you need to update)
- [ ] Updated relevant unit tests or have written new unit tests, which should
consider realistic data scenarios and edge cases, e.g. empty datasets, errors,
boundary cases etc. - See
[Unit Test Guide](https://pharmaverse.github.io/admiraldev/devel/articles/unit_test_guidance.html#tests-should-be-robust-to-cover-realistic-data-scenarios)
[Unit Test Guide](https://pharmaverse.github.io/admiraldev/articles/unit_test_guidance.html#tests-should-be-robust-to-cover-realistic-data-scenarios)
- [ ] If you removed/replaced any function and/or function parameters, did you
fully follow the
[deprecation guidance](https://pharmaverse.github.io/admiraldev/devel/articles/programming_strategy.html#deprecation)?
[deprecation guidance](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html#deprecation)?
- [ ] Update to all relevant roxygen headers and examples, including keywords
and families. Refer to the
[categorization of functions](https://pharmaverse.github.io/admiraldev/devel/articles/programming_strategy.html#categorization-of-functions) to tag appropriate keyword/family.
[categorization of functions](https://pharmaverse.github.io/admiraldev/articles/programming_strategy.html#categorization-of-functions) to tag appropriate keyword/family.
- [ ] Run `devtools::document()` so all `.Rd` files in the `man` folder and the
`NAMESPACE` file in the project root are updated appropriately
- [ ] Address any updates needed for vignettes and/or templates
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,15 @@ jobs:
# Whether to skip multiversion docs
# Note that if you have multiple versions of docs,
# your URL links are likely to break due to path changes
skip-multiversion-docs: false
latest-tag-alt-name: cran-release
multiversion-docs-landing-page: cran-release
branches-or-tags-to-list: >-
^cran-release$|^main$|^v([0-9]+\\.)?([0-9]+\\.)?([0-9]+)$
skip-multiversion-docs: true
linter:
name: Lint
uses: pharmaverse/admiralci/.github/workflows/lintr.yml@main
if: github.event_name == 'pull_request'
with:
r-version: "4.3"
latest-lintr: "true"
install-package: "true"
links:
name: Links
uses: pharmaverse/admiralci/.github/workflows/links.yml@main
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/r-renv-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
fail-fast: false
matrix:
config:
- {os: ubuntu-20.04, r: '4.1', repos: 'https://packagemanager.posit.co/cran/2022-03-10/'}
- {os: ubuntu-20.04, r: '4.2', repos: 'https://packagemanager.posit.co/cran/2023-03-15/'}
- {os: ubuntu-20.04, r: '4.3', repos: 'https://packagemanager.posit.co/cran/2023-04-20/'}

Expand Down
21 changes: 14 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
Package: sdtm.oak
Type: Package
Title: SDTM Data Transformation Engine
Version: 0.0.0.9000
Version: 0.0.0.9001
Authors@R: c(
person("Omar", "Garcia", email = "[email protected]", role = c("aut", "cre")),
person("Rammprasad", "Ganapathy", role = "aut"),
person("Ramiro", "Magno", email = "[email protected]",
role = "aut", comment = c(ORCID = "0000-0001-5226-3441")),
person("Pattern Institute", role = c("cph", "fnd")),
person("F. Hoffmann-La Roche AG", role = c("cph", "fnd")),
person("Pfizer Inc", role = c("cph", "fnd"))
)
Expand All @@ -13,21 +16,25 @@ Description: An EDC and Data Standard agnostic SDTM data transformation engine
based on standard mapping algorithms.
Language: en-US
License: Apache License (>= 2)
BugReports: https://github.com/pharmaverse/oak/issues
URL: https://pharmaverse.github.io/oak/, https://github.com/pharmaverse/oak
BugReports: https://github.com/pharmaverse/sdtm.oak/issues
URL: https://pharmaverse.github.io/sdtm.oak/, https://github.com/pharmaverse/sdtm.oak
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Depends: R (>= 4.1)
Depends: R (>= 4.2)
Imports:
rlang (>= 1.0.0)
admiraldev,
dplyr (>= 1.0.0),
purrr (>= 1.0.0),
rlang (>= 1.0.0),
stringr,
tibble
Suggests:
knitr,
rmarkdown,
spelling,
testthat (>= 3.1.7),
tibble
testthat (>= 3.1.7)
VignetteBuilder: knitr
Config/testthat/edition: 3
Config/testthat/parallel: true
5 changes: 4 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Generated by roxygen2: do not edit by hand

import(rlang)
galachad marked this conversation as resolved.
Show resolved Hide resolved
export(create_iso8601)
export(fmt_cmp)
importFrom(rlang,.data)
importFrom(tibble,tibble)
6 changes: 4 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# sdtm.oak (development version)
# sdtm.oak 0.0.0.9001 (development version)

* Initial CRAN submission.
## New Features

* New function `create_iso8601()` for conversion of vectors of dates, times or date-times to ISO8601 format.
Loading
Loading