Bug fixes (#111)

* minor bug fixes

* final updates

Author: CHCRowley

R/render.R

@@ -40,23 +40,19 @@ create_filtered_pages <- function(data, type = c("professions", "departments"),
   dir.create(filtered_pages_path)
 
   if (type == "professions") {
+    prof_cols <- data %>%
+      dplyr::select(dplyr::contains("prof") & !dplyr::contains("none")) %>%
+      dplyr::select_if(~ sum(. == "Yes", na.rm = TRUE) >= 20) %>%
+      colnames()
+
     prof_names <- unlist(config[["professions"]][["cols"]])
-    prof_names <- gsub("Civil Service, no profession membership", "No government profession", prof_names)
-    prof_names <- gsub("Other Civil Service profession", "Other government profession", prof_names)
+    prof_names <- dplyr::recode(prof_cols, !!!prof_names)
     filenames <- unlist(purrr::map(prof_names, ~ paste0(gsub("\\s+", "-", tolower(.x)), ".qmd")))
 
-    prof_ref <- data.frame(prof_cols =  grep("prof", colnames(data), value = TRUE),
+    prof_ref <- data.frame(prof_cols,
                            prof_names,
                            filenames)
 
-    prof_cols <- data %>%
-      dplyr::select(dplyr::contains("prof") & !dplyr::contains("none")) %>%
-      dplyr::select_if(~ any(. == "Yes")) %>%
-      colnames()
-
-    prof_names <- prof_ref$prof_names[prof_ref$prof_cols %in% prof_cols]
-    filenames <- prof_ref$filenames[prof_ref$prof_cols %in% prof_cols]
-
     n_pages <- length(prof_cols)
   } else if (type == "departments") {
     dep_freqs <- table(data$department)

main.R

@@ -3,7 +3,7 @@ library(magrittr)
 data <- CARS::get_tidy_data_file("2024_data.csv")
 config <- yaml::read_yaml("config.yml")
 
-data <- CARS::clean_data(data, config)
+data<- CARS::clean_data(data, config)
 data <- CARS::derive_vars(data)
 
 CARS::create_filtered_pages(data, type = "departments")