Skip to content

Commit

Permalink
Data updated for 7th Nov publication
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-surtees
t-surtees committed Nov 7, 2024
1 parent d76464c commit 2c4e74f
Show file tree
Hide file tree
Showing 33 changed files with 41,349 additions and 30,125 deletions.
28,489 changes: 16,542 additions & 11,947 deletions data/EES_daily_data.csv
View file

Large diffs are not rendered by default.

5,745 changes: 3,332 additions & 2,413 deletions data/EES_weekly_data.csv
View file

Large diffs are not rendered by default.

982 changes: 491 additions & 491 deletions data/EES_ytd_data.csv
View file

Large diffs are not rendered by default.

35,358 changes: 20,436 additions & 14,922 deletions data/attendance_data_dashboard.csv
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion global.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ google_analytics_key <- "DG7P4WLB0Y"

#### SECTION 1 - date filters ####
start_date <- as.Date("2024-09-09")
end_date <- as.Date("2024-10-11")
end_date <- as.Date("2024-10-25")
# funeral_date <- as.Date("2022-09-19")
# strike_date_1 <- as.Date("2023-02-01")
# strike_date_2 <- as.Date("2023-03-15")
Expand Down
8 changes: 3 additions & 5 deletions renv/activate.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@ local({
quiet = TRUE
)

if ("headers" %in% names(formals(utils::download.file)))
{
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(url)
if (length(headers) && is.character(headers))
args$headers <- headers
Expand Down Expand Up @@ -457,9 +456,8 @@ local({

# add custom headers if available -- note that
# utils::available.packages() will pass this to download.file()
if ("headers" %in% names(formals(utils::download.file)))
{
headers <- renv_bootstrap_download_custom_headers(url)
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(repos)
if (length(headers) && is.character(headers))
args$headers <- headers
}
Expand Down
16 changes: 8 additions & 8 deletions server.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1480,8 +1480,8 @@ server <- function(input, output, session) {
most_recent_fullweek_date <- live_attendance_data_weekly() %>%
pull(week_commencing)

paste0("Data on this tab relates to the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data on this tab relates to the week commencing 2023-12-11.")
# paste0("Data on this tab relates to the week commencing ", most_recent_fullweek_date, ".")
paste0("Data on this tab relates to the week commencing 2024-10-21.")
})

output$update_dates <- renderText({
Expand All @@ -1503,8 +1503,8 @@ server <- function(input, output, session) {
as.Date(attendance_date) + 31
# as.Date(attendance_date) + 38

# paste0("Data was last updated on 2024-06-13 and is next expected to be updated on 2024-06-27. The latest full week of data for this breakdown was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on 2024-11-07 and is next expected to be updated on 2024-11-21. The latest full week of data for this breakdown was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on 2024-08-08. The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
})
Expand All @@ -1528,8 +1528,8 @@ server <- function(input, output, session) {
as.Date(attendance_date) + 31
# as.Date(attendance_date) + 38

# paste0("Data was last updated on 2024-06-13 and is next expected to be updated on 2024-06-27. The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on 2024-11-07 and is next expected to be updated on 2024-11-21. The latest full week of data for this breakdown was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on 2024-08-08. The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
})
Expand All @@ -1553,8 +1553,8 @@ server <- function(input, output, session) {
as.Date(attendance_date) + 31
# as.Date(attendance_date) + 38

# paste0("Data was last updated on 2024-06-13 and is next expected to be updated on 2024-06-27. The latest full week of data for this breakdown was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
paste0("Data was last updated on 2024-11-07 and is next expected to be updated on 2024-11-21. The latest full week of data for this breakdown was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, " and is next expected to be updated on ", next_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on ", last_update_date, ". The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
# paste0("Data was last updated on 2024-08-08. The latest full week of data was the week commencing ", most_recent_fullweek_date, ".")
})
Expand Down
6 changes: 3 additions & 3 deletions tests/testthat/_snaps/UI_tests/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"ts_choice": "latestweeks"
},
"output": {
"daily_schools_count": "20,732 schools provided information on the latest full day of data, i.e. 2024-10-11",
"headline_update_date": "Data was last updated on 2024-10-24.",
"homepage_update_dates": "Data was last updated on 2024-10-24 and is next expected to be updated on 2024-11-07. The latest full week of data was the week commencing 2024-10-07."
"daily_schools_count": "14,549 schools provided information on the latest full day of data, i.e. 2024-10-25",
"headline_update_date": "Data was last updated on 2024-11-07.",
"homepage_update_dates": "Data was last updated on 2024-11-07 and is next expected to be updated on 2024-11-21. The latest full week of data for this breakdown was the week commencing 2024-10-21."
}
}
Binary file modified tests/testthat/_snaps/UI_tests/001_.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 39 additions & 39 deletions tests/testthat/_snaps/UI_tests/002.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"automargin": true,
"title": "Date",
"tickvals": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"zeroline": true,
"zerolinewidth": 2,
Expand Down Expand Up @@ -107,18 +107,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
4.6926598114821996,
4.2834822616182997,
4.1423333216196498,
4.1453554573103704,
4.9817124803972703
5.2401349701381896,
4.8527533823736402,
5.0629822537526898,
5.77144441281086,
7.9126025927954302
],
"line": {
"color": "#12436D"
Expand Down Expand Up @@ -151,18 +151,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
3.3334927305893798,
3.0800345777634899,
2.95323440396391,
2.939364469084,
3.5319153504871998
3.6994536164713301,
3.4223151578190198,
3.4398292381340498,
3.80439901552473,
4.9920834651966199
],
"line": {
"color": "#28A197"
Expand Down Expand Up @@ -195,18 +195,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
1.35916708089282,
1.20344768385481,
1.1890989176557401,
1.20599098822637,
1.44979712991006
1.54068135366686,
1.4304382245546201,
1.62315301561863,
1.9670453972861199,
2.9205191275988098
],
"line": {
"color": "#F46A25"
Expand Down Expand Up @@ -349,9 +349,9 @@
}
]
},
"headline_bullet_title_nat": "Headline figures for the latest week - 2024-10-07 to 2024-10-11: primary state-funded school attendance at national level",
"weekly_absence_rate_nat": "• 4.4% of sessions were recorded as absence",
"weekly_attendance_rate_nat": "• 95.6% of sessions were recorded as attending",
"weekly_illness_rate_nat": "• 2.5% of sessions were recorded as illness"
"headline_bullet_title_nat": "Headline figures for the latest week - 2024-10-21 to 2024-10-25: primary state-funded school attendance at national level",
"weekly_absence_rate_nat": "• 5.6% of sessions were recorded as absence",
"weekly_attendance_rate_nat": "• 94.4% of sessions were recorded as attending",
"weekly_illness_rate_nat": "• 3% of sessions were recorded as illness"
}
}
Binary file modified tests/testthat/_snaps/UI_tests/002_.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 39 additions & 39 deletions tests/testthat/_snaps/UI_tests/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"automargin": true,
"title": "Date",
"tickvals": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"zeroline": true,
"zerolinewidth": 2,
Expand Down Expand Up @@ -107,18 +107,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
7.3521925571207101,
7.2709464537807804,
7.0768905260156201,
7.1042635402380103,
7.9995486797862698
7.5255722596406001,
7.5466646522025602,
7.9139376435331901,
8.7595600349914893,
11.6775595381252
],
"line": {
"color": "#12436D"
Expand Down Expand Up @@ -151,18 +151,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
4.6714039632273598,
4.67095966936306,
4.4698672174528404,
4.4520469765756001,
4.9741545999774699
4.60013853617468,
4.6578456382439999,
4.8058268108135804,
5.2021303829376802,
6.7856277559004301
],
"line": {
"color": "#28A197"
Expand Down Expand Up @@ -195,18 +195,18 @@
"mode": "markers+lines",
"type": "scatter",
"x": [
"2024-10-07",
"2024-10-08",
"2024-10-09",
"2024-10-10",
"2024-10-11"
"2024-10-21",
"2024-10-22",
"2024-10-23",
"2024-10-24",
"2024-10-25"
],
"y": [
2.68078859389336,
2.59998678441772,
2.6070233085627801,
2.6522165636624102,
3.0253940798087999
2.92543372346592,
2.8888190139585599,
3.1081108327196199,
3.5574296520537998,
4.8919317822248196
],
"line": {
"color": "#F46A25"
Expand Down Expand Up @@ -349,9 +349,9 @@
}
]
},
"headline_bullet_title_nat": "Headline figures for the latest week - 2024-10-07 to 2024-10-11: secondary state-funded school attendance at national level",
"weekly_absence_rate_nat": "• 7.4% of sessions were recorded as absence",
"weekly_attendance_rate_nat": "• 92.6% of sessions were recorded as attending",
"weekly_illness_rate_nat": "• 3.4% of sessions were recorded as illness"
"headline_bullet_title_nat": "Headline figures for the latest week - 2024-10-21 to 2024-10-25: secondary state-funded school attendance at national level",
"weekly_absence_rate_nat": "• 8.5% of sessions were recorded as absence",
"weekly_attendance_rate_nat": "• 91.5% of sessions were recorded as attending",
"weekly_illness_rate_nat": "• 3.7% of sessions were recorded as illness"
}
}
Binary file modified tests/testthat/_snaps/UI_tests/003_.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2c4e74f

Please sign in to comment.