Main text update

R/html.R

@@ -138,3 +138,9 @@ insert_table_toggle <- function(output_name) {
 
   return(html)
 }
+
+accessible_tabs <- function() {
+"<script>
+  $('.nav-link').attr('tab-index', '0');
+</script>"
+}

R/plot.R

@@ -282,7 +282,7 @@ plot_stacked <- function(data, n, break_q_names_col, type = c("bar", "line"), ma
 
     data[[break_q_names_col]] <- break_q_names(data[[break_q_names_col]], max_lines = max_lines)
 
-    data[[break_q_names_col]] <- factor(data[[break_q_names_col]], levels = data[[break_q_names_col]])
+    data[[break_q_names_col]] <- factor(data[[break_q_names_col]], levels = unique(data[[break_q_names_col]]))
   }
 
   colour_scale <- match.arg(colour_scale)
@@ -433,21 +433,26 @@ plot_grouped <- function(data, n, break_q_names_col, max_lines = 2, xlab = "", y
     data[[break_q_names_col]] <- factor(data[[break_q_names_col]], levels = data[[break_q_names_col]])
   }
 
-  data[[1]] <- factor(x[[1]], levels = x[[1]])
-  data[[2]] <- factor(x[[2]], levels = unique(x[[2]]))
+  data[[1]] <- factor(data[[1]], levels = unique(data[[1]]))
+  data[[2]] <- factor(data[[2]], levels = unique(data[[2]]))
 
   orientation <- match.arg(orientation)
 
   axes <- axis_settings(xlab, ylab, font_size)
 
   if (orientation == "v") {
+    data[[1]] <- factor(data[[1]], levels = unique(data[[1]]))
+    data[[2]] <- factor(data[[2]], levels = unique(data[[2]]))
     x_vals <- data[[1]]
     y_vals <- data[[3]]
     x_axis <- axes$cat_axis
     y_axis <- axes$scale_axis
     legend = list(traceorder = 'normal')
   } else if (orientation == "h") {
-    x_vals <- data[[3]]
+    data[[1]] <- factor(rev(data[[1]]), levels = rev(unique(data[[1]])))
+    data[[2]] <- factor(rev(data[[2]]), levels = rev(unique(data[[2]])))
+    colours <- rev(colours)
+    x_vals <- rev(data[[3]])
     y_vals <- data[[1]]
     x_axis <- axes$scale_axis
     y_axis <- axes$cat_axis
@@ -475,6 +480,7 @@ plot_grouped <- function(data, n, break_q_names_col, max_lines = 2, xlab = "", y
   fig <- plotly::layout(fig,
                         xaxis = x_axis,
                         yaxis = y_axis,
+                        legend = legend,
                         margin = list(b = 100, t = font_size * 2),
                         hoverlabel = list(bgcolor = "white", font = list(size = font_size)),
                         annotations = list(x = 1, y = 0, text = sample,

R/render.R

@@ -3,24 +3,13 @@
 #'
 #' @description render CARS publication from quarto
 #'
-#' @param data full pre-processed CARS dataset
 #' @param path quarto input
-#' @param path execute directory
 #' @param output_path output path (will overwrite existing outputs). Should match the path set in the quarto site yaml
 #'
 #' @export
 
-render_site <- function(data, path = "quarto/main", output_path = "docs/") {
-  unlink(output_path, recursive = TRUE)
-
-  dir.create("../temp")
-  save(data, file = "../temp/data.rda")
-
-  # executes in higher directory level to avoid issues with .quarto stopping package from building
-
+render_site <- function(path = "quarto/main", output_path = "docs/") {
   quarto::quarto_render(input = path, as_job = FALSE)
-
-  unlink("../temp", recursive = TRUE)
 }
 
 #' @title create filtered pages

main.R

@@ -8,4 +8,4 @@ data <- CARS::get_tidy_data_file("2022_data.csv") %>%
 
 CARS::create_filtered_pages(data, type = "departments")
 CARS::create_filtered_pages(type = "professions")
-CARS::render_site(data)
+CARS::render_site()

quarto/main/_quarto.yml

@@ -3,7 +3,7 @@ project:
   output-dir: ../../docs/
 
 website:
-  title: "DRAFT: Coding in Analysis and Research Survey 2022"
+  title: Coding in Analysis and Research Survey 2022"
   navbar:
     background: primary
     left:

quarto/main/index.qmd

@@ -2,14 +2,6 @@
 title: "Home"
 ---
 
-## Draft notice
-
-Please note that all outputs are provisional. All findings have been thoroughly quality assured. However, the outputs presented here may change.  
-
-While any changes to the data are not likely to be substantial, we are planning to carry out more in-depth analysis and the commentary may change. As such, we recommend linking to these pages rather than sharing this analysis any other way at this stage. 
-
-
-
 ## How do analysts use programming and software engineering in the UK Public Sector?
 
 Please note it is possible that the figures presented here will change in future. 

quarto/main/styles.css

@@ -88,12 +88,11 @@
   color: black;
 }
 
-
 .toggle-button {
   text-decoration: underline;
 }
 
-.toggle-button:focus {
+.toggle-button:hover {
   background-color: #ffdd00;
   border-bottom: 4px solid black;
   color: black;