Merge pull request #11 from dfe-analytical-services/feature/stats_nei…

…ghbours Adding Feature/stats neighbours into development branch
dfe-analytical-services · Mar 25, 2024 · e9d8699 · e9d8699
2 parents c24774a + abfc727
commit e9d8699
Show file tree

Hide file tree

Showing 5 changed files with 931 additions and 152 deletions.
diff --git a/R/enabler2_page.R b/R/enabler2_page.R
@@ -324,19 +324,15 @@ enabler2_tab <- function() {
                   ),
                   gov_row(
                     h2("Vacancy rates by local authority"),
-                    p("This chart is reactive to the Local Authority and Regional filters at the top and will not react to the National filter. The chart will display all Local Authorities overall or every Local Authority in the selected Region."),
+                    # p("This chart is reactive to the Local Authority and Regional filters at the top and will not react to the National filter. The chart will display all Local Authorities overall or every Local Authority in the selected Region."),
                     p(sprintf("The graph represents data from %s.", max(workforce_data$time_period))),
-                    br(),
-                    plotlyOutput("plot_vacancy_rate_la"),
-                    br(),
-                    br(),
-                    details(
-                      inputId = "tbl_vacancy_rate_la",
-                      label = "View chart as a table",
-                      help_text = (
-                        dataTableOutput("table_vacancy_rate_la")
-                      )
+                    radioGroupButtons(
+                      "vacancy_stats_toggle",
+                      label = NULL,
+                      choices = c("All local authorities", "10 Statistical Neighbours"),
+                      selected = "All local authorities"
                     ),
+                    uiOutput("SN_vacancy"),
                   ),
                 ),
                 open = FALSE
@@ -357,9 +353,6 @@ enabler2_tab <- function() {
                   ),
                 )
               ),
-              # fluidRow(
-              #   column(
-              #     width = 12,
               accordion(
                 accordion_panel(
                   "Social worker caseloads",
@@ -412,19 +405,26 @@ enabler2_tab <- function() {
                   ),
                   gov_row(
                     h2("Social worker caseloads by local authority"),
-                    p("This chart is reactive to the Local Authority and Regional filters at the top and will not react to the National filter. The chart will display all Local Authorities overall or every Local Authority in the selected Region."),
+                    # p("This chart is reactive to the Local Authority and Regional filters at the top and will not react to the National filter. The chart will display all Local Authorities overall or every Local Authority in the selected Region."),
                     p(sprintf("The graph represents data from %s.", max(workforce_data$time_period))),
-                    br(),
-                    plotlyOutput("plot_caseload_la"),
-                    br(),
-                    br(),
-                    details(
-                      inputId = "tbl_caseload_la",
-                      label = "View chart as a table",
-                      help_text = (
-                        dataTableOutput("table_caseload_la")
-                      )
-                    )
+                    # br(),
+                    # plotlyOutput("plot_caseload_la"),
+                    # br(),
+                    # br(),
+                    # details(
+                    #   inputId = "tbl_caseload_la",
+                    #   label = "View chart as a table",
+                    #   help_text = (
+                    #     dataTableOutput("table_caseload_la")
+                    #   )
+                    # )
+                    radioGroupButtons(
+                      "caseload_stats_toggle",
+                      label = NULL,
+                      choices = c("All local authorities", "10 Statistical Neighbours"),
+                      selected = "All local authorities"
+                    ),
+                    uiOutput("SN_caseload"),
                   )
                 ),
                 open = FALSE
@@ -438,13 +438,6 @@ enabler2_tab <- function() {
                 br(),
               ),
               fluidRow(
-                # column(
-                # width = 6,
-                # value_box(
-                #  title = "Social Worker White Ethnic Group",
-                #  value = htmlOutput("white_ethnicity_txt")
-                # )
-                #  ),
                 column(
                   width = 6,
                   value_box(