From 94b64574931776d295b3ec992ac77a45deb0c28f Mon Sep 17 00:00:00 2001 From: Izaak Jephson Date: Wed, 14 Aug 2024 10:13:52 +0100 Subject: [PATCH] Fix bug in financial_years --- R/date_tools.R | 6 +++--- vignettes/qa_tables.Rmd | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 vignettes/qa_tables.Rmd diff --git a/R/date_tools.R b/R/date_tools.R index 7a690ee..6ba0e28 100644 --- a/R/date_tools.R +++ b/R/date_tools.R @@ -43,9 +43,9 @@ convert_col_date <- function(data, input_format = "%Y-%m",output_format = "%B %Y financial_year <- function(date, fin_year_start_day = 1, fin_year_start_month = 4){ dplyr::case_when(lubridate::month(date) + lubridate::day(date) < - fin_year_start_month + 0.01 * fin_year_start_day) ~ - paste0(lubridate::year(date) - 1, "-", lubridate::year(date)) - .default = (paste0(lubridate::year(date), "-", lubridate::year(date) + 1)) + fin_year_start_month + 0.01 * fin_year_start_day ~ + paste0(lubridate::year(date) - 1, "-", lubridate::year(date)), + .default = paste0(lubridate::year(date), "-", lubridate::year(date) + 1)) } #' Create standard calendar with Scottish bank holidays diff --git a/vignettes/qa_tables.Rmd b/vignettes/qa_tables.Rmd new file mode 100644 index 0000000..1132156 --- /dev/null +++ b/vignettes/qa_tables.Rmd @@ -0,0 +1,19 @@ +--- +title: "qa_tables" +output: rmarkdown::html_vignette +vignette: > + %\VignetteIndexEntry{qa_tables} + %\VignetteEngine{knitr::rmarkdown} + %\VignetteEncoding{UTF-8} +--- + +```{r, include = FALSE} +knitr::opts_chunk$set( + collapse = TRUE, + comment = "#>" +) +``` + +```{r setup} +library(sssstats) +```