Merge pull request #98 from dfe-analytical-services/97-update-data-fo…

…r-q4-202324 97 update data for q4 202324
dfe-analytical-services · Jan 31, 2025 · 39a3af4 · 39a3af4
2 parents 61c98b3 + 8894879
commit 39a3af4
Show file tree

Hide file tree

Showing 18 changed files with 485 additions and 1,163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,4 @@ README.html
 *unpublished*
 data/national_provider_summary.csv
 data/apprenticeships_demographics.csv
-data/apprenticeships_data.csv
+data/apprenticeships_data.csv
diff --git a/.rscignore b/.rscignore
@@ -1,9 +1,9 @@
+data/national_provider_summary.csv
 .Rproj.user
 .Rhistory
 .RData
 .RDataTmp
 .Ruserdata
 README.html
-data/national_provider_summary.csv
-data/apprenticeships_demographics.csv
 data/apprenticeships_data.csv
+data/apprenticeships_demographics.csv
diff --git a/R/dashboard_modules/02-local_authority_district.R b/R/dashboard_modules/02-local_authority_district.R
@@ -297,14 +297,17 @@ lad_server <- function(id) {
     # Reactive data sets used in maps -----------------------------------------
     boundary_data <- reactive({
       # Set the map boundary file based on the year
+      # this would be better not hard coded - values change for the latest year according to qr
       boundary_list <- list(
-        "2023/24 (Q3 Aug to Apr)" = lad_boundaries_2024,
+        "2023/24" = lad_boundaries_2024,
         "2022/23" = lad_boundaries_2023,
         "2021/22" = lad_boundaries_2022
       )
 
       # Choose the boundary based on the year selection from the user
-      return(boundary_list[[input$year]])
+      # think this will sort the hard -coding for the boundary list
+      # will match to the first bit of the string - just the academic year & not qr
+      return(boundary_list[[substring(input$year, 1, 7)]])
     })
 
     delivery_map_data <- reactive({

diff --git a/R/dashboard_modules/03-subjects_and_standards.R b/R/dashboard_modules/03-subjects_and_standards.R
@@ -82,7 +82,7 @@ subjects_standards_ui <- function(id) {
             label = h2("Choose download file format"),
             hint_label = "This will download all data related to the providers and options selected.
           The XLSX format is designed for use in Microsoft Excel",
-            choices = c("CSV (Up to 13.18 MB)", "XLSX (Up to 2.12 MB)"),
+            choices = c("CSV (Up to 13.18 MB)", "XLSX (Up to 2.13 MB)"),
             selected = "CSV (Up to 13.18 MB)"
           ),
           # Bit of a hack to force the button not to be full width

diff --git a/apprenticeships-provider-dashboard.Rproj b/apprenticeships-provider-dashboard.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 2915d5c1-b7b0-4c28-99dd-1c56c16b4d64
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

diff --git a/data/apprenticeships_demographics_0.parquet b/data/apprenticeships_demographics_0.parquet
diff --git a/data/lad_map_data_0.parquet b/data/lad_map_data_0.parquet
diff --git a/data/national_provider_summary_0.parquet b/data/national_provider_summary_0.parquet
diff --git a/data/provider_breakdowns_0.parquet b/data/provider_breakdowns_0.parquet
diff --git a/data/subjects_and_standards_0.parquet b/data/subjects_and_standards_0.parquet
diff --git a/datafiles_log.csv b/datafiles_log.csv
@@ -6,4 +6,5 @@ data/apprenticeships_demographics_0.parquet,published
 data/national_provider_summary_0.parquet,published
 data/lad_map_data_0.parquet,published
 data/provider_breakdowns_0.parquet,published
-data/subjects_and_standards_0.parquet,published
+data/subjects_and_standards_0.parquet,published
+