From 9f28f44426a76e889fe1c589f5480cf5ab0504a2 Mon Sep 17 00:00:00 2001 From: peteowen1 Date: Wed, 7 Feb 2024 14:21:47 +1100 Subject: [PATCH] change to ends_with _code might as well make all area codes change to character for consistency (now including the sa1_7 and sa1_11 columns) also filter out if code and/or name is null, not just code --- R/seifa.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/seifa.R b/R/seifa.R index 0aed079..86bf780 100644 --- a/R/seifa.R +++ b/R/seifa.R @@ -297,14 +297,14 @@ get_seifa_index_sheet <- function(filename, sheetname, structure = c("sa1", "sa2 col_names = column_names, na = c("", "NA", "-") ) %>% - dplyr::filter(if_any(ends_with("_code"), ~ !is.na(.x))) %>% + dplyr::filter(if_any(ends_with(c("_name","_code")), ~ !is.na(.x))) %>% select(-starts_with("blank")) %>% mutate( structure = structure, year = year ) %>% mutate(across( - .cols = any_of("area_code"), # Specify the column name + .cols = any_of(ends_with("_code")), # Specify the column name .fns = ~ as.character(.) # Conditionally convert to character )) %>% relocate(structure)