Compare commits

..

No commits in common. "cce53e4cca4f1da55dcb6246afa0ef04a05c5a20" and "1522fa1e740eb073d00dec4d92303d90c133483f" have entirely different histories.

7 changed files with 46 additions and 63 deletions

View File

@ -1,3 +1,3 @@
Version: 23.6.3 Version: 23.4.1
Date: 2023-07-03 12:02:38 UTC Date: 2023-04-13 11:57:00 UTC
SHA: ff9270d1e9493760f5aef123d52f48e0148f8da2 SHA: 86bb9dc95357d5861603e3d487b59e1761edcded

View File

@ -1,6 +1,6 @@
Package: stRoke Package: stRoke
Title: Clinical Stroke Research Title: Clinical Stroke Research
Version: 23.6.3 Version: 23.6.2
Authors@R: Authors@R:
person("Andreas Gammelgaard", "Damsbo", , "agdamsbo@clin.au.dk", role = c("aut", "cre"), person("Andreas Gammelgaard", "Damsbo", , "agdamsbo@clin.au.dk", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-7559-1154")) comment = c(ORCID = "0000-0002-7559-1154"))

View File

@ -1,9 +1,3 @@
# stRoke 23.6.3
### Bug
* Fixed `ds2dd()` bug after first practical implementation.
# stRoke 23.6.2 # stRoke 23.6.2
### Functions: ### Functions:

View File

@ -13,8 +13,6 @@ utils::globalVariables(c("metadata_names"))
#' names. #' names.
#' @param include.column.names Flag to give detailed output including new #' @param include.column.names Flag to give detailed output including new
#' column names for original data set for upload. #' column names for original data set for upload.
#' @param metadata Metadata dataframe. Default is the included
#' stRoke::metadata_names.
#' #'
#' @return data.frame or list of data.frame and vector #' @return data.frame or list of data.frame and vector
#' @export #' @export
@ -29,10 +27,9 @@ ds2dd <-
form.name = "basis", form.name = "basis",
field.type = "text", field.type = "text",
field.label = NULL, field.label = NULL,
include.column.names = FALSE, include.column.names = FALSE) {
metadata = stRoke::metadata_names) { dd <- data.frame(matrix(ncol = length(metadata_names), nrow = ncol(ds)))
dd <- data.frame(matrix(ncol = length(metadata), nrow = ncol(ds))) colnames(dd) <- metadata_names
colnames(dd) <- metadata
if (is.character(record.id) & !record.id %in% colnames(ds)) { if (is.character(record.id) & !record.id %in% colnames(ds)) {
stop("Provided record.id is not a variable name in provided data set.") stop("Provided record.id is not a variable name in provided data set.")

View File

@ -1,7 +1,7 @@
<!-- badges: start --> <!-- badges: start -->
[![GitHub R package version](https://img.shields.io/github/r-package/v/agdamsbo/stRoke)](https://github.com/agdamsbo/stRoke) [![GitHub R package version](https://img.shields.io/github/r-package/v/agdamsbo/stRoke)](https://github.com/agdamsbo/stRoke)
[![CRAN/METACRAN](https://img.shields.io/cran/v/stRoke)](https://CRAN.R-project.org/package=stRoke) [![CRAN/METACRAN](https://img.shields.io/cran/v/stRoke)](https://CRAN.R-project.org/package=stRoke)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8013980.svg)](https://doi.org/10.5281/zenodo.8013980) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8013981.svg)](https://doi.org/10.5281/zenodo.8013981)
[![Github Actions](https://github.com/agdamsbo/stRoke/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/agdamsbo/stRoke/actions/workflows/R-CMD-check.yaml) [![Github Actions](https://github.com/agdamsbo/stRoke/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/agdamsbo/stRoke/actions/workflows/R-CMD-check.yaml)
[![Page deployed](https://github.com/agdamsbo/stRoke/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/agdamsbo/stRoke/actions/workflows/pages/pages-build-deployment) [![Page deployed](https://github.com/agdamsbo/stRoke/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/agdamsbo/stRoke/actions/workflows/pages/pages-build-deployment)
[![Codecov test coverage](https://codecov.io/gh/agdamsbo/stRoke/branch/main/graph/badge.svg)](https://app.codecov.io/gh/agdamsbo/stRoke?branch=main) [![Codecov test coverage](https://codecov.io/gh/agdamsbo/stRoke/branch/main/graph/badge.svg)](https://app.codecov.io/gh/agdamsbo/stRoke?branch=main)

View File

@ -1,49 +1,45 @@
####
This is a new package version
## Test environments
- R-hub windows-x86_64-devel (r-devel)
- R-hub ubuntu-gcc-release (r-release)
- R-hub fedora-clang-devel (r-devel)
## R CMD check results ## R CMD check results
On windows-x86_64-devel (r-devel)
0 errors | 0 warnings | 1 note checking for detritus in the temp directory ... NOTE
* This is a new release.
## From 'rhub::check_for_cran()'
> results
── stRoke 23.6.3: NOTE
Build ID: stRoke_23.6.3.tar.gz-02460c19f45e403eb1b115ac763abc6d
Platform: Windows Server 2022, R-devel, 64 bit
Submitted: 1h 56m 49.6s ago
Build time: 5m 11.1s
checking for non-standard things in the check directory ... NOTE
checking for detritus in the temp directory ... NOTE
Found the following files/directories: Found the following files/directories:
'lastMiKTeXException' 'lastMiKTeXException'
0 errors ✔ | 0 warnings ✔ | 2 notes ✖ On ubuntu-gcc-release (r-release)
checking CRAN incoming feasibility ... NOTE
Maintainer: Andreas Gammelgaard Damsbo <agdamsbo@clin.au.dk>
Found the following (possibly) invalid URLs:
URL: https://doi.org/10.1161/STROKEAHA.117.020067
From: inst/doc/toolbox.html
Status: 403
Message: Forbidden
URL: https://doi.org/10.1161/STROKEAHA.121.037744
From: inst/doc/toolbox.html
NEWS.md
Status: 403
Message: Forbidden
Found the following (possibly) invalid DOIs:
DOI: 10.1161/STROKEAHA.117.020067
From: DESCRIPTION
Status: Forbidden
Message: 403
DOI: 10.1161/STROKEAHA.121.037744
From: DESCRIPTION
Status: Forbidden
Message: 403
── stRoke 23.6.3: NOTE On fedora-clang-devel (r-devel)
checking HTML version of manual ... NOTE
Build ID: stRoke_23.6.3.tar.gz-d174f9de31a94b81b697dd9c28bcdf9f
Platform: Ubuntu Linux 20.04.1 LTS, R-release, GCC
Submitted: 1h 56m 49.7s ago
Build time: 1h 20m 33.6s
checking HTML version of manual ... NOTE
Skipping checking HTML validation: no command 'tidy' found Skipping checking HTML validation: no command 'tidy' found
0 errors ✔ | 0 warnings ✔ | 1 note ✖ 0 errors ✔ | 0 warnings ✔ | 3 notes ✖
── stRoke 23.6.3: NOTE
Build ID: stRoke_23.6.3.tar.gz-22dfd84a4ab244f6ae09928a12737bf0
Platform: Fedora Linux, R-devel, clang, gfortran
Submitted: 1h 56m 49.7s ago
Build time: 1h 12m 16s
checking HTML version of manual ... NOTE
Skipping checking HTML validation: no command 'tidy' found
0 errors ✔ | 0 warnings ✔ | 1 note ✖

View File

@ -10,8 +10,7 @@ ds2dd(
form.name = "basis", form.name = "basis",
field.type = "text", field.type = "text",
field.label = NULL, field.label = NULL,
include.column.names = FALSE, include.column.names = FALSE
metadata = stRoke::metadata_names
) )
} }
\arguments{ \arguments{
@ -32,9 +31,6 @@ names.}
\item{include.column.names}{Flag to give detailed output including new \item{include.column.names}{Flag to give detailed output including new
column names for original data set for upload.} column names for original data set for upload.}
\item{metadata}{Metadata dataframe. Default is the included
stRoke::metadata_names.}
} }
\value{ \value{
data.frame or list of data.frame and vector data.frame or list of data.frame and vector