From 51af2ecdf3175c04759e894e1897ff46562ca914 Mon Sep 17 00:00:00 2001 From: laureng-hd Date: Wed, 31 Jul 2024 22:38:40 -0700 Subject: [PATCH 1/2] hawkinR v1.1.2 w/ addition of TS test types and IDs --- .Rhistory | 1 + DESCRIPTION | 2 +- NEWS.md | 4 ++++ R/get_tests.R | 2 +- R/get_tests_type.R | 3 ++- R/utils.R | 8 +++++--- README.Rmd | 4 ++-- README.md | 6 +++--- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.Rhistory b/.Rhistory index 3ca94b6..8c15742 100644 --- a/.Rhistory +++ b/.Rhistory @@ -157,3 +157,4 @@ devtools::install_github("HawkinDynamics/hawkinR", auth_token = Sys.getenv("GITH github_token <- Sys.getenv("GITHUB_PAT") Sys.getenv("GITHUB_PAT") logger::log_formatter(logger::formatter_glue_or_sprintf) +devtools::load_all(".") diff --git a/DESCRIPTION b/DESCRIPTION index 90ce98c..7f5c117 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: hawkinR Title: R package to work with data from the Hawkin Dynamics API -Version: 1.1.1 +Version: 1.1.2 Authors@R: person("Lauren", "Green", , "lauren@hawkindynamics.com", role = c("aut", "cre")) Description: Provides simple functionality with Hawkin Dynamics API. These functions are for use with 'Hawkin Dynamics Beta API' version 1.8-beta. You must be an Hawkin Dynamics user with active integration account to utilize functions within the package. This API is designed to get data out of your Hawkin Dynamics database into your own database. It is not designed to be accessed from client applications directly. There is a limit on the amount of data that can be returned in a single request. As your database grows, it will be necessary to use the from and to parameters to limit the size of the responses. Responses that exceed the memory limit will fail. diff --git a/NEWS.md b/NEWS.md index b1568bb..9cec170 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # Change Log +## hawkinR v1.1.2 + +* Bug fix: addition of TruStrength test types to typeId validation methods + ## hawkinR v1.1.1 * fixes (or removes) log suppression: surface more useful logging to end-users by removing log suppression present in v1.1.0 and earlier diff --git a/R/get_tests.R b/R/get_tests.R index d11b770..1d28f0b 100644 --- a/R/get_tests.R +++ b/R/get_tests.R @@ -43,7 +43,7 @@ #' Names | Abbreviations: "Countermovement Jump" | "CMJ", "Squat Jump" | "SJ", #' "Isometric Test" | "ISO", "Drop Jump" | "DJ", "Free Run" | "FREE", #' "CMJ Rebound" | "CMJR", "Multi Rebound" | "MR", "Weigh In" | "WI", -#' "Drop Landing" | "DL" +#' "Drop Landing" | "DL", "TS Free Run" | "TSFR", "TS Isometric Test" | "TSISO" #' #' @param groupId Supply a group’s ID, a list of group IDs, or a string of a comma #' separated group id’s to receive tests from the specified groups. A maximum of 10 groups diff --git a/R/get_tests_type.R b/R/get_tests_type.R index 970744b..514b0e7 100644 --- a/R/get_tests_type.R +++ b/R/get_tests_type.R @@ -13,7 +13,8 @@ #' #' Names | Abbreviations: "Countermovement Jump" | "CMJ", "Squat Jump" | "SJ", #' "Isometric Test" | "ISO", "Drop Jump" | "DJ", "Free Run" | "FREE", "CMJ Rebound" | "CMJR", -#' "Multi Rebound" | "MR", "Weigh In" | "WI", "Drop Landing" | "DL" +#' "Multi Rebound" | "MR", "Weigh In" | "WI", "Drop Landing" | "DL", "TS Free Run" | "TSFR", +#' "TS Isometric Test" | "TSISO" #' #' @param from Optionally supply a time (Unix time stamp) you want the tests from. If you do not #' supply this value you will receive every test. This parameter is best suited for bulk exports of diff --git a/R/utils.R b/R/utils.R index c87f84b..e2bfe0a 100644 --- a/R/utils.R +++ b/R/utils.R @@ -172,13 +172,15 @@ TestIdCheck <- function(arg_id) { id = c( "7nNduHeM5zETPjHxvm7s", "QEG7m7DhYsD6BrcQ8pic", "2uS5XD5kXmWgIZ5HhQ3A", "gyBETpRXpdr63Ab2E0V8", "5pRSUQVSJVnxijpPMck3", "pqgf2TPUOQOQs6r0HQWb", - "r4fhrkPdYlLxYQxEeM78", "ubeWMPN1lJFbuQbAM97s", "rKgI4y3ItTAzUekTUpvR" + "r4fhrkPdYlLxYQxEeM78", "ubeWMPN1lJFbuQbAM97s", "rKgI4y3ItTAzUekTUpvR", + "4KlQgKmBxbOY6uKTLDFL", "umnEZPgi6zaxuw0KhUpM" ), name = c( "Countermovement Jump", "Squat Jump", "Isometric Test", "Drop Jump", - "Free Run", "CMJ Rebound", "Multi Rebound", "Weigh In", "Drop Landing" + "Free Run", "CMJ Rebound", "Multi Rebound", "Weigh In", "Drop Landing", + "TS Free Run", "TS Isometric Test" ), - abbreviation = c("CMJ", "SJ", "ISO", "DJ", "FR", "CMJR", "MR", "WI", "DL") + abbreviation = c("CMJ", "SJ", "ISO", "DJ", "FR", "CMJR", "MR", "WI", "DL","TSFR","TSISO") ) # Check typeId and extract corresponding id diff --git a/README.Rmd b/README.Rmd index 432a121..a9fab85 100644 --- a/README.Rmd +++ b/README.Rmd @@ -14,7 +14,7 @@ knitr::opts_chunk$set( ) ``` -# hawkinR v1.1.1 +# hawkinR v1.1.2 **Get your data from the Hawkin Dynamics API** @@ -23,7 +23,7 @@ knitr::opts_chunk$set( [![R-CMD-check](https://github.com/HawkinDynamics/hawkinR/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/HawkinDynamics/hawkinR/actions/workflows/R-CMD-check.yaml) [![Last-changedate](https://img.shields.io/badge/last%20change-`r gsub('-', '--', Sys.Date())`-yellowgreen.svg)](/commits/master) [![license](https://img.shields.io/badge/license-MIT%20+%20file%20LICENSE-lightgrey.svg)](https://choosealicense.com/) [![minimal R version](https://img.shields.io/badge/R%3E%3D-`r "3.5.0"`-6666ff.svg)](https://cran.r-project.org/) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable) -[![packageversion](https://img.shields.io/badge/Package%20version-`r "1.1.1"`-orange.svg?style=flat-square)](commits/master) +[![packageversion](https://img.shields.io/badge/Package%20version-`r "1.1.2"`-orange.svg?style=flat-square)](commits/master) [![thanks-md](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](THANKS.md) diff --git a/README.md b/README.md index 5ff0bb0..0c38295 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# hawkinR v1.1.1 +# hawkinR v1.1.2 **Get your data from the Hawkin Dynamics API** [![R-CMD-check](https://github.com/HawkinDynamics/hawkinR/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/HawkinDynamics/hawkinR/actions/workflows/R-CMD-check.yaml) -[![Last-changedate](https://img.shields.io/badge/last%20change-2024--07--30-yellowgreen.svg)](/commits/master) +[![Last-changedate](https://img.shields.io/badge/last%20change-2024--07--31-yellowgreen.svg)](/commits/master) [![license](https://img.shields.io/badge/license-MIT%20+%20file%20LICENSE-lightgrey.svg)](https://choosealicense.com/) [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r-project.org/) @@ -16,7 +16,7 @@ version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r- state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable) -[![packageversion](https://img.shields.io/badge/Package%20version-1.1.1-orange.svg?style=flat-square)](commits/master) +[![packageversion](https://img.shields.io/badge/Package%20version-1.1.2-orange.svg?style=flat-square)](commits/master) [![thanks-md](https://img.shields.io/badge/THANKS-md-ff69b4.svg)](THANKS.md) From 1878e20b9a6566b153b1118b05e35cee757a7b37 Mon Sep 17 00:00:00 2001 From: laureng-hd Date: Wed, 31 Jul 2024 22:38:40 -0700 Subject: [PATCH 2/2] hawkinR v1.1.2 updated docs --- man/get_tests.Rd | 2 +- man/get_tests_type.Rd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/get_tests.Rd b/man/get_tests.Rd index e22eae5..e23bd06 100644 --- a/man/get_tests.Rd +++ b/man/get_tests.Rd @@ -37,7 +37,7 @@ or test name abbreviation. Names | Abbreviations: "Countermovement Jump" | "CMJ", "Squat Jump" | "SJ", "Isometric Test" | "ISO", "Drop Jump" | "DJ", "Free Run" | "FREE", "CMJ Rebound" | "CMJR", "Multi Rebound" | "MR", "Weigh In" | "WI", -"Drop Landing" | "DL"} +"Drop Landing" | "DL", "TS Free Run" | "TSFR", "TS Isometric Test" | "TSISO"} \item{teamId}{Supply a team’s ID, a list of team IDs, or a string of a comma separated team id’s to receive tests from the specified teams. A maximum of 10 teams can be diff --git a/man/get_tests_type.Rd b/man/get_tests_type.Rd index d5889f2..ad92c93 100644 --- a/man/get_tests_type.Rd +++ b/man/get_tests_type.Rd @@ -12,7 +12,8 @@ name abbreviation. Names | Abbreviations: "Countermovement Jump" | "CMJ", "Squat Jump" | "SJ", "Isometric Test" | "ISO", "Drop Jump" | "DJ", "Free Run" | "FREE", "CMJ Rebound" | "CMJR", -"Multi Rebound" | "MR", "Weigh In" | "WI", "Drop Landing" | "DL"} +"Multi Rebound" | "MR", "Weigh In" | "WI", "Drop Landing" | "DL", "TS Free Run" | "TSFR", +"TS Isometric Test" | "TSISO"} \item{from}{Optionally supply a time (Unix time stamp) you want the tests from. If you do not supply this value you will receive every test. This parameter is best suited for bulk exports of