Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revised data for app #15

Merged
merged 12 commits into from
Feb 1, 2024
Merged

Revised data for app #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dc78072
Update dashboard_panels
patithomas Jan 30, 2024
5d7716b
Update renv/activate
patithomas Jan 30, 2024
6b52e5a
Update renv lock
patithomas Jan 30, 2024
bdfebb7
Update server
patithomas Jan 30, 2024
adbf9fc
update code
patithomas Jan 30, 2024
0685fd8
updated merged code
patithomas Jan 30, 2024
69598ff
updated mgcv
patithomas Jan 30, 2024
dbc18b9
updated renv, global and server
patithomas Jan 30, 2024
18657c1
Updated renv, global, dashboardpanel script
patithomas Jan 31, 2024
5fcf03a
Updated renv with dfeshiny
patithomas Jan 31, 2024
0a0faa3
amended and revised data
patithomas Feb 1, 2024
2f2b07d
updated global
patithomas Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
.Rhistory
.RData
.Ruserdata
*unpublished*
data/aps_gender_gapV2.csv
data/all_level_timeseries_data_1996_to_2022V2.csv
data/all_attainmentV2.csv
data/alevel_attainmentV2.csv


170 changes: 151 additions & 19 deletions R/dashboard_panels.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage_panel <- function() {
gov_row(
column(
12,
h1("16 to 18 time series attainment and single year entry dashboard"),
h1("16 to 18 time series attainment and single year entry dashboard"),
br(),
br()
),
Expand All @@ -28,7 +28,7 @@ homepage_panel <- function() {
title = "",
br(),
p("This dashboard allows users to explore time series data for 16 to 18 qualifications in England.
It brings together figures compiled from the current and previous versions of the ‘A level and other 16 to 18 results’ statistical release with focus on:")
It brings together figures compiled from the current and previous versions of the (A level and other 16 to 18 results) statistical release with focus on:")
),
tags$div(
title = "Headline attainment and A level time series by institution type",
Expand All @@ -40,18 +40,25 @@ homepage_panel <- function() {
p("The line charts display the yearly trend and grades for all students and by gender, while the female - male gender gap shows the difference in average point score.
To view and explore trend select up to four institution types from the drop-down menu at the top of the page."),
tags$div(
title = "(A level subject entries and result by all",
h3(actionLink("link_to_alevelAllSubject_tab", "A level subject entry and grade: Comparison by subject")),
title = "(A level students entering maths and science by gender",
h3(actionLink("link_to_alevelMathsScience_tab", "A level students entering maths and science by gender")),
p("The line chart shows the yearly trend in the proportion of A level students entering maths and science from 2009/10 to 2022/23 (end of 16-18 study).
Select one subject or combination from the dropdown menu at the top of the page, followed by the start year to view changes over time (end year is fixed at the latest year available).")
),
tags$div(
title = "(A level subject entry and grade: comparison by subject",
h3(actionLink("link_to_alevelAllSubject_tab", "A level subject entry and grade: comparison by subject")),
p("The line charts for subject entries and cumulative percentage grades display the yearly trend from 1995/96 to 2022/23.
Drop-down menus at the top of the page allows for the selection and comparison of up to four subjects
and cumulative grades.
"),
p("The data refers to all entries by 16-18 year olds in the year stated (where 2023 means 2022/23 academic year).")
),
tags$div(
title = "(A level subject entry and result by gender",
h3(actionLink("link_to_alevelFmSubject_tab", "A level subject entry and result: Comparison by gender")),
title = "A level subject entry and result: comparison by gender",
h3(actionLink("link_to_alevelFmSubject_tab", "A level subject entry and result: comparison by gender")),
p("The line charts for subject entries and cumulative percentage grades display the yearly trend for female and male from 1995/96 to 2022/23.

Select one subject from the dropdown menu at the top of the page, followed by the start year to view changes over time (end year is fixed at the latest year available)."),
p(""), br(),
br(),
Expand Down Expand Up @@ -112,12 +119,12 @@ homepage_panel <- function() {
subjects grouped from 1995/96 to 2022/23. More detailed breakdowns of some subjects from 2015/16
are available via the full dataset download button at the top of the page."),
h4("Subject definitions"),
p("• Total English covers English literature, English language, English language and literature. "),
p("• Total Maths covers Maths, Pure maths, Statistics, Use of maths and Other maths"),
p("• Total Modern languages cover French, German, Spanish and other foreign modern languages. "),
p("• Total Classical studies covers Latin, Greek, Classical civilisation, and Other classical studies"),
p("• STEM subjects cover Biology, Chemistry, Physics, Total maths, Further mathematics and Computer science. "),
p("• Total Music includes Music and Music technology."),
p("Total English covers English literature, English language, English language and literature. "),
p("Total Maths covers Maths, Pure maths, Statistics, Use of maths and Other maths"),
p("Total Modern languages cover French, German, Spanish and other foreign modern languages. "),
p("Total Classical studies covers Latin, Greek, Classical civilisation, and Other classical studies"),
p("STEM subjects cover Biology, Chemistry, Physics, Total maths, Further mathematics and Computer science. "),
p("Total Music includes Music and Music technology."),
p("The data refers to all entries by 16-18 year olds in the year stated (where 2023 means 2022/23 academic year).")
)
)
Expand All @@ -133,7 +140,7 @@ homepage_panel <- function() {
dashboard_panel_aps <- function() {
tabPanel(
value = "dashboard",
"Attainment: APS per entry and average result",
"Attainment: APS per entry & average result (end of 16-18 study)",

# Define UI for application that draws a histogram

Expand Down Expand Up @@ -200,7 +207,7 @@ dashboard_panel_aps <- function() {
inputId = "ees_1",
label = "Visit Explore Education Statistics",
icon = icon("table-cells"),
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2021-22', '_blank')",
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2022-23', '_blank')",
style = "width:100%;white-space:normal;"
)
),
Expand Down Expand Up @@ -369,7 +376,8 @@ dashboard_panel_aps <- function() {
dashboard_panel_sub_all <- function() {
tabPanel(
value = "dashboard_alse",
"A level subject entry and grade: comparison by subject",
"A level subject entry & grade: comparison by subject (single academic year)",


# Define UI for application that draws a histogram

Expand Down Expand Up @@ -442,7 +450,7 @@ dashboard_panel_sub_all <- function() {
inputId = "ees_2a",
label = "Visit Explore Education Statistics",
icon = icon("table-cells"),
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2021-22', '_blank')",
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2022-23', '_blank')",
style = "width:100%;white-space:normal;"
)
),
Expand Down Expand Up @@ -567,7 +575,8 @@ dashboard_panel_sub_all <- function() {
dashboard_panel_sub_fm <- function() {
tabPanel(
value = "dashboard_fm",
"A level subject entry and grade: comparison by gender",
"A level subject entry & result: comparison by gender (single academic year)",


# Define UI for application that draws a histogram

Expand All @@ -576,7 +585,7 @@ dashboard_panel_sub_fm <- function() {
gov_row(
column(
width = 12,
h2("A level single entry and grade distribution: comparison by gender, England from 1995/96 to 2022/23")
h2("A level subject entry and grade distribution: comparison by gender, England from 1995/96 to 2022/23")
),
column(
width = 12,
Expand Down Expand Up @@ -629,7 +638,7 @@ dashboard_panel_sub_fm <- function() {
inputId = "ees_2b",
label = "Visit Explore Education Statistics",
icon = icon("table-cells"),
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2021-22', '_blank')",
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2022-23', '_blank')",
style = "width:100%;white-space:normal;"
)
),
Expand Down Expand Up @@ -742,3 +751,126 @@ dashboard_panel_sub_fm <- function() {
)
)
}



############## Maths and science #################

dashboard_panel_ms <- function() {
tabPanel(
value = "dashboard_ms",
"A level maths & science: comparison by gender (end of 16-18 study)",

# Define UI for application that draws a histogram

# Sidebar with a slider input for number of bins
gov_main_layout(
gov_row(
column(
width = 12,
h2("A level maths and science entry (end of 16 to 18 study): comparison by gender, England from 2009/10 to 2022/23")
),
column(
width = 12,
div(
class = "well",
style = "min-height: 100%; height: 100%; overflow-y: visible",
gov_row(
column(
width = 6,
selectizeInput("subjectMs", "Select one subject or combination",
choices = list(
`Single subject` = list(
"Biology", "Chemistry", "Computer science", "Further maths", "Maths",
"Physics"
),
`Combination` = list(
"One maths/science subject", "Two maths/science subjects",
"Three maths/science subjects", "Four maths/science subjects", "Zero maths/science subjects"
)
), selected = c("Maths")
)
),
column(
width = 3,
selectInput(
inputId = "year_start_ms",
label = "Select start year",
choices = seq(2010, latest_year, 1),
selected = 2010
)
),
column(
width = 3,
selectInput(
inputId = "year_end_ms",
label = " End year",
choices = latest_year,
# choices = seq(1996, latest_year, 1),
selected = latest_year
)
),
column(
width = 4,
p(strong("Download full dataset")),
downloadButton(
outputId = "downloadDataSubjectMs",
label = "Download data",
icon = shiny::icon("download"),
class = "downloadButton"
)
),
column(
width = 4,
p(strong("For more tables and metadata")),
actionButton(
inputId = "ees_3",
label = "Visit Explore Education Statistics",
icon = icon("table-cells"),
onclick = "window.open('https://explore-education-statistics.service.gov.uk/find-statistics/a-level-and-other-16-to-18-results/2022-23', '_blank')",
style = "width:100%;white-space:normal;"
)
),
column(
width = 4,
p(strong("Reset chart selection")),
align = "right",
actionButton(inputId = "resetSubMs", label = "Reset selections", icon = icon("fas fa-arrows-rotate"))
)
)
)
)
),
column(
width = 12,
tabsetPanel(
id = "tabsetpanel3",
tabPanel(
value = "alevelMsSubject",
"Maths and Science",
fluidRow(
column(
width = 12,
h3("A level maths and science: Comparison by gender"),
textOutput("textSubMs"), br()
),
box(
width = 12,
plotlyOutput("plotSubjectMs") %>% spinner()
)
),
column(
width = 12,
fluidRow(
column(width = 12),
p("Note: The number of students from 2009/10 to 2017/18 has been calculated from rounded data, so less precise than the number of students from
2018/19 to 2022/23")
)
),
dataTableOutput("tabMs"),
)
)
)
)
)
}
Loading
Loading