Merge pull request #104 from dfe-analytical-services/development

Development
dfe-analytical-services · Sep 27, 2024 · a0c7644 · a0c7644
2 parents bade342 + c152b5f
commit a0c7644
Show file tree

Hide file tree

Showing 49 changed files with 4,783 additions and 4,042 deletions.
diff --git a/.github/workflows/automated-tests.yaml b/.github/workflows/automated-tests.yaml
@@ -0,0 +1,42 @@
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+
+name: Automated tests
+
+jobs:
+  automatedTests:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - name: Install git2r dependencies
+        run: sudo apt-get install -y libgit2-dev
+
+      - name: Cache renv packages
+        id: cache-renv
+        uses: actions/cache@v4
+        with:
+          path: cache-renv
+          key: ${{ runner.os }}-renv-${{ hashFiles('**/renv.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-renv-
+      
+      - uses: r-lib/actions/setup-renv@v2
+
+      - name: Run tests 
+        shell: Rscript {0}
+        run: |
+          shinytest2::test_app()
+          
diff --git a/.github/workflows/shiny-tests.yaml b/.github/workflows/shiny-tests.yaml
diff --git a/.github/workflows/tidyCode.yaml b/.github/workflows/tidyCode.yaml
@@ -2,57 +2,39 @@ on:
   push:
     branches:
       - main
+
   pull_request:
-
-name: tidyCode
+      
+name: tidy-code
 
 jobs:
-  tidyCode:
-    runs-on: ${{ matrix.config.os }}
-
-    name: tidyCode
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-        # Running on mac as it's quicker to build
-          - {os: macOS-latest, r: 'release'}
-
+  automatedTests:
+    runs-on: ubuntu-latest
+
     env:
-      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
-      RENV_PATHS_ROOT: ~/.local/share/renv
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v4
+     
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
-
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v1
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install git2r dependencies
+        run: sudo apt-get install -y libgit2-dev
 
       - name: Cache renv packages
-        uses: actions/cache@v1
+        id: cache-renv
+        uses: actions/cache@v4
         with:
-          path: ${{ env.RENV_PATHS_ROOT }}
+          path: cache-renv
           key: ${{ runner.os }}-renv-${{ hashFiles('**/renv.lock') }}
           restore-keys: |
             ${{ runner.os }}-renv-
-        
-      - name: Restore renv snapshot
-        shell: Rscript {0}
-        run: |
-          if (!requireNamespace("renv", quietly = TRUE)) install.packages("renv")
-          renv::restore()
       
+      - uses: r-lib/actions/setup-renv@v2
+
       - name: Tidy code
         shell: Rscript {0}
         run: |

diff --git a/R/data_sources.R b/R/data_sources.R
@@ -0,0 +1,26 @@
+data_sources_tab <- function() {
+  tabPanel(
+    value = "data_sources",
+    "Data Sources",
+    gov_main_layout(
+      br(),
+      gov_row(
+        h2("Data sources"),
+        p("Most data included in the dashboard is children’s social care statistics published by DfE and available on", a(href = "https://explore-education-statistics.service.gov.uk/", "Explore Education Statistics.", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;"), " The publications include:"),
+        tags$ul(
+          tags$li(a(href = "https://explore-education-statistics.service.gov.uk/find-statistics/children-looked-after-in-england-including-adoptions", "Children looked after in England including adoptions (last updated:	25 April 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://explore-education-statistics.service.gov.uk/find-statistics/characteristics-of-children-in-need", "Children in need (last updated: 26 October 2023) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://fingertips.phe.org.uk/profile/child-health-profiles/data#page/3/gid/1938133230/ati/502/iid/90284/age/26/sex/4/cat/-1/ctp/-1/yrr/1/cid/4/tbm/1/page-options/car-do-0", "Public health data explorer (last updated: 08 May 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://explore-education-statistics.service.gov.uk/find-statistics/children-s-social-work-workforce", "Children's social work workforce (last updated:	29 February 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://www.ons.gov.uk/datasets/TS021/editions/2021/versions/3", "ONS - Census, Ethnic groups (last updated: 28 March 2023) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://www.ons.gov.uk/peoplepopulationandcommunity/populationandmigration/populationestimates/datasets/populationestimatesforukenglandandwalesscotlandandnorthernireland", "Estimates of the population for the UK, England, Wales, Scotland, and Northern Ireland (last updated: 26 March 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://www.gov.uk/government/statistics/childrens-social-care-data-in-england-2023", "Children’s social care data in England 2023 (last updated: 8 September 2023) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://www.gov.uk/government/statistics/local-authority-revenue-expenditure-and-financing-england-2022-to-2023-individual-local-authority-data-outturn", "Local authority revenue expenditure and financing England: 2022 to 2023 (last updated: 14 February 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://assets.publishing.service.gov.uk/media/606458acd3bf7f0c8d06b7e2/Childrens_services_statistical_neighbour_benchmarking_tool_-_LGR_Version__April_2021_.xlsx", "Children's services statistical neighbour benchmarking tool (last updated: April 2021) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://explore-education-statistics.service.gov.uk/find-statistics/outcomes-for-children-in-need-including-children-looked-after-by-local-authorities-in-england", "Outcomes for Children in Need including Children Looked After (last updated 18 April 2024) (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;")),
+          tags$li(a(href = "https://assets.publishing.service.gov.uk/media/650c373752e73c000d942609/Childrens_social_care_in_England_2023_underlying_data.ods", "Ofsted Leadership ratings (Opens in a new tab).", target = "_blank", style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;"))
+        )
+      )
+    )
+  )
+}
diff --git a/R/disclaimer.R b/R/disclaimer.R
@@ -0,0 +1,48 @@
+disclaimer_tab <- function() {
+  tabPanel(
+    value = "disclaimer",
+    "Disclaimer",
+    gov_main_layout(
+      gov_row(
+        column(
+          width = 12,
+          h1("Disclaimer")
+        )
+      ),
+      br(),
+      gov_row(
+        p("The CSC Dashboard service displays data indicators to help both local and central
+        government understand progress towards the outcomes and enablers set out in the
+        Children’s Social Care National Framework. Users can view the progress for England by
+        geography (national, regional and local authority) over time, and benchmark performance
+        across geographies including local authority statistical neighbours."),
+        p("This service has been built based on official statistics which uphold the standards
+        of trustworthiness, quality and value as per the Code of Practice for Statistics. All of
+        the data used in this service, as well as methodological information and caveats, are
+        available transparently at the sources linked from this page.  Information on how each
+        indicator has been calculated "),
+        p("The data sources used to underpin each indicator by outcome and enabler are children’s
+        social care statistics published by DfE and are available on Explore Education
+        Statistics.:"),
+        p("The publications include: "),
+        tags$ul(
+          tags$li("Children looked after in England including adoptions (last updated: 25 April 2024)."),
+          tags$li("Children in need (last updated: 26 October 2023)."),
+          tags$li("Public health data explorer (last updated: 08 May 2024)."),
+          tags$li("Children's social work workforce (last updated: 29 February 2024)"),
+          tags$li("ONS - Census, Ethnic groups (last updated: 28 March 2023)"),
+          tags$li("Estimates of the population for the UK, England, Wales, Scotland, and Northern Ireland (last updated: 26 March 2024)"),
+          tags$li("Children’s social care data in England 2023 (last updated: 8 September 2023)"),
+          tags$li("Local authority revenue expenditure and financing England: 2022 to 2023 (last updated: 14 February 2024)"),
+          tags$li("Children's services statistical neighbour benchmarking tool (last updated: April 2021)"),
+          tags$li("Outcomes for children in need including children looked after by local authorities in england (last updated: 18th Apr 2024)"),
+          style = "font-family: GDS Transport, arial, sans-serif; font-size :19px;"
+        ),
+        p("The  specific indicators (policy annex) for each outcome and enabler have been
+          chosen based on available official published statistics and review with policy.
+          The CSC dashboard indictors will be updated when new official statistics become
+          available.")
+      )
+    )
+  )
+}
diff --git a/R/enabler1_page.R b/R/enabler1_page.R
@@ -6,7 +6,7 @@ enabler1_tab <- function() {
       gov_row(
         column(
           width = 12,
-          h1("Enabler 1: Multi-agency working is prioritised and effective")
+          h1("Enabler: Multi-agency working is prioritised and effective")
         )
       ),
       br(),