Skip to content

Commit

Permalink
Merge branch 'development' into 00_Sort_BI_Extracts
Browse files Browse the repository at this point in the history
  • Loading branch information
Jennit07 authored Sep 28, 2023
2 parents 682a169 + 3208dc3 commit cfc6ff6
Show file tree
Hide file tree
Showing 81 changed files with 1,149 additions and 139 deletions.
16 changes: 16 additions & 0 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ ADPE
adtf
arrivalmode
arth
atlassian
attendcat
aut
bedday
Expand All @@ -16,8 +17,10 @@ callr
Canx
carehome
careinspectorate
categorises
cattend
CCYY
cdn
cennum
chp
chpstart
Expand All @@ -27,6 +30,7 @@ cls
cmh
CNWs
Comhairle
codecov
commhosp
congen
costincdnas
Expand All @@ -35,6 +39,7 @@ costsfy
covr
cph
createslf
customise
dataframe
datamart
datazone
Expand All @@ -47,7 +52,9 @@ dbconnect
dbplyr
deathdiag
demog
devhints
dfc
Diagramme
disch
dischloc
dischto
Expand Down Expand Up @@ -94,9 +101,11 @@ homev
hscdiip
hscp
hscpnames
htmlwidgets
IDPC
infyyear
ipdc
issuenumber
itle
iwalk
jaccard
Expand All @@ -110,12 +119,14 @@ keytimex
kis
lazydt
lgl
lintr
los
ltc
ltcs
lubridate
magrittr
Matern
markdownguide
Mcbride
mcmahon
MMMYY
Expand Down Expand Up @@ -145,6 +156,7 @@ PCEC
phs
phsmethods
phsopendata
pkgdown
placeinc
plics
PMS
Expand All @@ -156,6 +168,7 @@ praccode
ptypes
purrr
quickstart
rankdir
Rbuildignore
rcmdcheck
rdd
Expand All @@ -167,6 +180,7 @@ readr
readxl
reasonwait
recid
reflectoring
refsource
renviron
rlang
Expand All @@ -176,6 +190,7 @@ Rprofile
Rscript
rspm
RStudio
rstudio
rstudioapi
Rtype
SDcols
Expand All @@ -187,6 +202,7 @@ setnames
Siar
sigfac
simd
SLF
slf
slfhelper
smr
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean_cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/document.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-changed-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout Pull Request
if: contains(env.isPR, 'true')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
10 changes: 8 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Generated by roxygen2: do not edit by hand

export("%>%")
export(add_homelessness_date_flags)
export(add_homelessness_flag)
export(add_hri_variables)
export(add_nsu_cohort)
export(check_year_format)
export(clean_up_free_text)
Expand All @@ -14,6 +17,7 @@ export(convert_numeric_to_date)
export(convert_sending_location_to_lca)
export(convert_year_to_fyyear)
export(create_episode_file)
export(create_homelessness_lookup)
export(create_individual_file)
export(create_service_use_cohorts)
export(end_fy)
Expand All @@ -30,6 +34,7 @@ export(get_demographic_cohorts_path)
export(get_dev_dir)
export(get_dn_costs_path)
export(get_dn_raw_costs_path)
export(get_existing_data_for_tests)
export(get_file_path)
export(get_gp_ooh_costs_path)
export(get_gp_ooh_raw_costs_path)
Expand All @@ -51,6 +56,7 @@ export(get_practice_details_path)
export(get_readcode_lookup_path)
export(get_sc_at_episodes_path)
export(get_sc_ch_episodes_path)
export(get_sc_client_lookup_path)
export(get_sc_demog_lookup_path)
export(get_sc_hc_episodes_path)
export(get_sc_sds_episodes_path)
Expand All @@ -61,9 +67,7 @@ export(get_slf_ch_name_lookup_path)
export(get_slf_chi_deaths_path)
export(get_slf_deaths_lookup_path)
export(get_slf_dir)
export(get_slf_episode_path)
export(get_slf_gpprac_path)
export(get_slf_individual_path)
export(get_slf_postcode_path)
export(get_source_extract_path)
export(get_sparra_path)
Expand Down Expand Up @@ -133,8 +137,10 @@ export(process_tests_nrs_deaths)
export(process_tests_outpatients)
export(process_tests_prescribing)
export(process_tests_sc_ch_episodes)
export(process_tests_sc_client_lookup)
export(process_tests_sc_demographics)
export(process_tests_sds)
export(produce_episode_file_tests)
export(produce_source_extract_tests)
export(produce_test_comparison)
export(read_extract_acute)
Expand Down
6 changes: 4 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# September 2023 Update - Unreleased
* Update of 2017/18 onwards to include bug fixes within the files.
* New 2023/24 files.
* New NSU cohort for 2022/23 file.
* New 2023/24 files.
*No social care data available for new 2023/24 file.
* New NSU cohort for 2022/23 file.
* SPD and SIMD updated.
* Re addition of:
* HRIs in individual file.
* Homelessness Flags.
Expand Down
6 changes: 3 additions & 3 deletions R/00-update_refs.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#'
#' @family initialisation
latest_update <- function() {
"Jun_2023"
"Sep_2023"
}

#' Previous update
Expand Down Expand Up @@ -61,7 +61,7 @@ previous_update <- function(months_ago = 3L, override = NULL) {
#'
#' @family initialisation
get_dd_period <- function() {
"Jul16_Mar23"
"Jul16_Jun23"
}

#' The latest financial year for Cost uplift setting
Expand All @@ -74,5 +74,5 @@ get_dd_period <- function() {
#'
#' @family initialisation
latest_cost_year <- function() {
"2223"
"2324"
}
Loading

0 comments on commit cfc6ff6

Please sign in to comment.