Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
sambtalcott committed Nov 25, 2024
2 parents fd9d8b6 + f688cf1 commit 61f4aff
Show file tree
Hide file tree
Showing 32 changed files with 1,421 additions and 76 deletions.
10 changes: 6 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: tntpr
Title: Data Analysis Tools Customized for TNTP
Version: 1.1.0
Version: 1.2.0
Authors@R: c(
person("Dustin", "Pashouwer", role = c("aut", "cre"),
email = "dustin.pashouwer@tntp.org"),
Expand Down Expand Up @@ -32,7 +32,7 @@ Imports:
keyring,
labelled,
lubridate (>= 1.7.4),
magrittr (>= 1.5),
Microsoft365R,
purrr (>= 0.3.3),
readr,
rlang,
Expand All @@ -52,10 +52,12 @@ Suggests:
ggalt,
forcats,
qualtRics,
haven
haven,
readxl,
writexl
VignetteBuilder:
knitr
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Config/testthat/edition: 3
13 changes: 12 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ export(setup_subdirectory)
export(show_in_excel)
export(show_tntp_colors)
export(show_tntp_palette)
export(sp_create_folder)
export(sp_defaults)
export(sp_download)
export(sp_drive)
export(sp_list)
export(sp_list_drives)
export(sp_list_sites)
export(sp_list_subsites)
export(sp_read)
export(sp_site)
export(sp_upload)
export(sp_write)
export(tableN)
export(theme_tntp)
export(theme_tntp_2018)
Expand All @@ -42,5 +54,4 @@ export(update_tntpr)
importFrom(formattable,percent)
importFrom(ggplot2,"%+replace%")
importFrom(ggplot2,theme_minimal)
importFrom(magrittr,"%>%")
importFrom(rlang,`%||%`)
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# tntpr 1.2.0

* Added sp_*() family of functions for reading from / writing to Sharepoint.

* Fixed tntp_colors() to return supplied names if given

# tntpr 1.1.0

Expand Down
4 changes: 2 additions & 2 deletions R/palette_tntp.R
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ palette_tntp_scales <- function(palette = palette_names) {
#' library(ggplot2)
#' library(dplyr)
#'
#' x <- mtcars %>%
#' count(cyl, am) %>%
#' x <- mtcars |>
#' count(cyl, am) |>
#' mutate(am = as.factor(am))
#'
#' ggplot(x, aes(x = cyl, y = n, fill = am)) + # you need a fill aesthetic
Expand Down
Loading

0 comments on commit 61f4aff

Please sign in to comment.