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.

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

Updating stats_neighbours branch with development branch #10

Merged
merged 55 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
e0d70b8
Merge pull request #4 from dfe-analytical-services/main
yauemily Mar 12, 2024
4d520b4
Adding ons data for La codes, adding function to compare and remove o…
yauemily Mar 12, 2024
c1a8fbd
Merge pull request #6 from dfe-analytical-services/main
nataliepaterson Mar 13, 2024
042c9f8
Updated text for child wellbeing & development indicators
Mar 13, 2024
d18ccb4
Added outcomes absense data
Mar 13, 2024
97bc818
Read in outcomes absense data
Mar 13, 2024
84b9a36
Updated additional info
Mar 13, 2024
ed9f12d
Updated persistent absentee headline boxes
Mar 13, 2024
c333580
Added overall absence headline boxes
Mar 13, 2024
d6a12f6
Validation on empty dropdowns
yauemily Mar 14, 2024
dbf5c18
Ensuring enabler 2 is looking at the correct LA's
yauemily Mar 14, 2024
0559827
Removed additional text for enabler 2 old LA's
yauemily Mar 14, 2024
151ba8d
Ensuring outcome 1 is looking at new LA's
yauemily Mar 14, 2024
0a4e7b5
Read in ks2 and ks4 outcomes data for education attainment domain
Mar 14, 2024
f5f6b18
Removing old LA's from outcome 2
yauemily Mar 14, 2024
dec483e
Merge pull request #7 from dfe-analytical-services/bug_fix/old_la_data
yauemily Mar 15, 2024
ab2075b
added example of extra dropdown for child wellbeing domain
yauemily Mar 15, 2024
804d8e2
Added headline boxes for KS2 and Ks4
Mar 15, 2024
2c5606f
Merge branch 'outcome1/childwellbeing&development' of https://github.…
Mar 15, 2024
961cf32
updated headline boxes
Mar 15, 2024
b344fc6
Added additional information for KS2 and KS4
Mar 15, 2024
63e3db5
Updated headline boxes
Mar 15, 2024
3b84bfe
Formatted year in headline boxes
Mar 18, 2024
ba3da4e
Adding stats neighbour file into gitignore and datafiles log
yauemily Mar 18, 2024
83e1371
error handling for all headline text boxes
yauemily Mar 18, 2024
dc6a5e7
Added overall absense chart
Mar 18, 2024
2f42496
Added absence alternative table
Mar 18, 2024
56f022f
amended timeperiod format to academic year
Mar 18, 2024
1dd6866
error handling for all plots
yauemily Mar 18, 2024
7439996
Adding validation checking to all of the tables
yauemily Mar 19, 2024
6bea80e
Changed validation message to say "location" rather than "breakdown"
yauemily Mar 19, 2024
783a77d
Added ks2 chart
Mar 19, 2024
30242f8
Fixing caseload headline stats error logic and removing old caseload …
yauemily Mar 19, 2024
353bc80
added KS2 table
Mar 19, 2024
03e4bf1
Css changes for error validation message: red, bold, 18
yauemily Mar 19, 2024
04e04eb
Merge branch 'development' into feature/error_handling
yauemily Mar 19, 2024
5841038
Updated max rate scale for average attainment chart
Mar 19, 2024
5b3b8f3
Testing trial
yauemily Mar 19, 2024
7c64edf
Merge branch 'feature/error_handling' of https://github.com/dfe-analy…
yauemily Mar 19, 2024
931bca5
Added absence rate regional table
Mar 19, 2024
fdf2272
Added regional absence chart and table
Mar 19, 2024
7b65d59
Updated alignment
Mar 19, 2024
193cc4c
Added ks2 regional charts and tables
Mar 20, 2024
059bde3
Added absence LA charts
Mar 20, 2024
2b798f0
Added ks2 and Ks4 LA chart and table
Mar 20, 2024
1165dde
Updated breakdown to say location in regional charts
Mar 20, 2024
1202904
Merge branch 'development' into outcome1/childwellbeing&development
nataliepaterson Mar 20, 2024
f4660aa
Merge pull request #9 from dfe-analytical-services/outcome1/childwell…
yauemily Mar 21, 2024
996386d
Merge branch 'development' into feature/error_handling
yauemily Mar 21, 2024
0d3cacd
Merge pull request #8 from dfe-analytical-services/feature/error_hand…
yauemily Mar 21, 2024
ddc32fa
updating renv file
yauemily Mar 21, 2024
1be5c33
Merge branch 'feature/stats_neighbours' into development
yauemily Mar 21, 2024
fb8abfa
Update read_data.R
yauemily Mar 21, 2024
7d9a6ce
Updated attainment 8 headline boxes to remove %
Mar 21, 2024
44ea07e
Add stats neighbour dummy data
Mar 22, 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
40 changes: 20 additions & 20 deletions R/enabler2_page.R
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,22 @@ enabler2_tab <- function() {
condition = "(input.geographic_breakdown_e2 == 'North Northamptonshire / West Northamptonshire')",
p("North Northamptonshire and West Northamptonshire submitted a joint workforce return in 2021 and onwards, and their data is reported together")
),
conditionalPanel(
condition = "(input.geographic_breakdown_e2 == 'Cumbria')",
p("To view 2023 and onwards data select ", strong("Cumberland"), "or", strong("Westmorland and Furness"), ". Cumbria local authority was replaced with two new unitary authorities, Cumberland and Westmorland and Furness, in April 2023.")
),
conditionalPanel(
condition = "(input.geographic_breakdown_e2 == 'Northamptonshire')",
p("To view 2021 and onwards data select ", strong("North Northamptonshire / West Northamptonshire"), ". Northamptonshire local authority was replaced with two new unitary authorities, North Northamptonshire and West Northamptonshire, in April 2021.")
),
conditionalPanel(
condition = "(input.geographic_breakdown_e2 == 'Poole')",
p("To view 2019 and onwards data select ", strong("Bournemouth, Christchurch and Poole"), ". Bournemouth, Christchurch and Poole local authority was formed in April 2019.")
),
conditionalPanel(
condition = "(input.geographic_breakdown_e2 == 'Bournemouth')",
p("To view 2019 and onwards data select ", strong("Bournemouth, Christchurch and Poole"), ". Bournemouth, Christchurch and Poole local authority was formed in April 2019.")
),
# conditionalPanel(
# condition = "(input.geographic_breakdown_e2 == 'Cumbria')",
# p("To view 2023 and onwards data select ", strong("Cumberland"), "or", strong("Westmorland and Furness"), ". Cumbria local authority was replaced with two new unitary authorities, Cumberland and Westmorland and Furness, in April 2023.")
# ),
# conditionalPanel(
# condition = "(input.geographic_breakdown_e2 == 'Northamptonshire')",
# p("To view 2021 and onwards data select ", strong("North Northamptonshire / West Northamptonshire"), ". Northamptonshire local authority was replaced with two new unitary authorities, North Northamptonshire and West Northamptonshire, in April 2021.")
# ),
# conditionalPanel(
# condition = "(input.geographic_breakdown_e2 == 'Poole')",
# p("To view 2019 and onwards data select ", strong("Bournemouth, Christchurch and Poole"), ". Bournemouth, Christchurch and Poole local authority was formed in April 2019.")
# ),
# conditionalPanel(
# condition = "(input.geographic_breakdown_e2 == 'Bournemouth')",
# p("To view 2019 and onwards data select ", strong("Bournemouth, Christchurch and Poole"), ". Bournemouth, Christchurch and Poole local authority was formed in April 2019.")
# ),
# p(htmlOutput("enabler2_choice_text2")),
br(),
div(
Expand Down Expand Up @@ -171,7 +171,7 @@ enabler2_tab <- function() {
),
gov_row(
h2("Turnover rates by region"),
p("This is a static chart and will not react to geographical level and breakdown selected in the filters at the top."),
p("This is a static chart and will not react to geographical level and location selected in the filters at the top."),
br(),
plotlyOutput("plot_turnover_reg"),
br(),
Expand Down Expand Up @@ -234,7 +234,7 @@ enabler2_tab <- function() {
),
gov_row(
h2("Agency rates by region"),
p("This is a static chart and will not react to geographical level and breakdown selected in the filters at the top."),
p("This is a static chart and will not react to geographical level and location selected in the filters at the top."),
br(),
plotlyOutput("plot_agency_reg"),
br(),
Expand Down Expand Up @@ -301,7 +301,7 @@ enabler2_tab <- function() {
),
gov_row(
h2("Vacancy rates by region"),
p("This is a static chart and will not react to geographical level and breakdown selected in the filters at the top."),
p("This is a static chart and will not react to geographical level and location selected in the filters at the top."),
br(),
plotlyOutput("plot_vacancy_reg"),
br(),
Expand Down Expand Up @@ -389,7 +389,7 @@ enabler2_tab <- function() {
),
gov_row(
h2("Social worker caseloads by region"),
p("This is a static chart and will not react to geographical level and breakdown selected in the filters at the top."),
p("This is a static chart and will not react to geographical level and location selected in the filters at the top."),
br(),
plotlyOutput("plot_caseload_reg"),
br(),
Expand Down
Loading
Loading