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

Development
dfe-analytical-services · Jan 7, 2025 · 6c5a053 · 6c5a053
2 parents 25600e0 + 99cea43
commit 6c5a053
Show file tree

Hide file tree

Showing 24 changed files with 544 additions and 929 deletions.
diff --git a/R/dashboard_panels.R b/R/dashboard_panels.R
diff --git a/R/standard_panels.R b/R/standard_panels.R
@@ -44,12 +44,10 @@ a11y_panel <- function() {
           for all of our users. For example, these are known issues that we will
           continue to monitor and improve:"),
           tags$div(tags$ul(
-            tags$li("List"),
-            tags$li("known"),
-            tags$li("limitations, e.g."),
-            tags$li("Alternative text in interactive charts is limited to titles
-                    and could be more descriptive (although this data is
-                    available in csv format)")
+            tags$li("The navigation panel has been flagged as an accessibility issue and
+                    we will look for an alternative way to navigate around the panels on the app"),
+            tags$li("Focus styling is missing which means that features on the app do not
+                    change colour to indicate they have been selected.")
           )),
           h2("Feedback"),
           br(

diff --git a/data/2019A_l3va_step5_outputs_Rversion.xlsx b/data/2019A_l3va_step5_outputs_Rversion.xlsx
diff --git a/data/2024U_l3va_step5_outputs_Rversion_redacted.xlsx b/data/2024U_l3va_step5_outputs_Rversion_redacted.xlsx
diff --git a/datafiles_log.csv b/datafiles_log.csv
@@ -1,7 +1,8 @@
 filename,status
-data/2019A_l3va_step5_outputs_Rversion.xlsx,published
 data/2023U_l3va_step5_outputs_Rversion.xlsx,unpublished
 data/2024U_l3va_step5_outputs_Rversion.xlsx,unpublished
-data/pupil_upload_template.csv,published
 data/2019_testing_template.csv,unpublished
 data/2024_testing_template.csv,unpublished
+data/2019A_l3va_step5_outputs_Rversion.xlsx,published
+data/2024U_l3va_step5_outputs_Rversion_redacted.xlsx,published
+data/pupil_upload_template.csv,published
diff --git a/global.R b/global.R
@@ -38,6 +38,7 @@ shhh(library(snakecase))
 shhh(library(tidyr))
 shhh(library(shinycssloaders))
 # shhh(library(shinya11y))
+shhh(library(reactable))
 
 # Functions --------------------------------------------------------------------
 
@@ -116,7 +117,7 @@ source("R/read_data.R")
 # ---- read in the ready reckoner data from the Excel spreadsheet ----
 # -----------------------------------------------------------------------------------------------------------------------------
 
-data <- func_read_multiplesheets("data/2019A_l3va_step5_outputs_Rversion.xlsx")
+data <- func_read_multiplesheets("data/2024U_l3va_step5_outputs_Rversion_redacted.xlsx")
 
 template_data <- read.csv("data/pupil_upload_template.csv", check.names = FALSE)
 

diff --git a/ks5_RR.Rproj b/ks5_RR.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 608f460c-5fa8-4f37-90b8-e82d8f4017b7
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

diff --git a/renv.lock b/renv.lock
@@ -437,29 +437,28 @@
     },
     "dfeshiny": {
       "Package": "dfeshiny",
-      "Version": "0.5.3",
+      "Version": "0.5.2",
       "Source": "GitHub",
       "RemoteType": "github",
+      "RemoteHost": "api.github.com",
       "RemoteUsername": "dfe-analytical-services",
       "RemoteRepo": "dfeshiny",
       "RemoteRef": "main",
-      "RemoteSha": "8c345bf079b6a5b4d93d2c5ca1be077d21fd761a",
-      "RemoteHost": "api.github.com",
+      "RemoteSha": "91f1eb3cbac6e1d2ba64300e22a36c95a73dda25",
       "Requirements": [
         "R",
         "RCurl",
         "checkmate",
         "glue",
         "htmltools",
-        "lubridate",
         "magrittr",
         "shiny",
         "shinyGovstyle",
         "shinyjs",
         "stringr",
         "styler"
       ],
-      "Hash": "9967c01468b897c3da0530f2688fd5f6"
+      "Hash": "7735cc512edb4955f58dfa2ed4307dce"
     },
     "diffobj": {
       "Package": "diffobj",
@@ -869,19 +868,6 @@
       ],
       "Hash": "b8552d117e1b808b09a832f589b79035"
     },
-    "lubridate": {
-      "Package": "lubridate",
-      "Version": "1.9.4",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "generics",
-        "methods",
-        "timechange"
-      ],
-      "Hash": "be38bc740fc51783a78edb5a157e4104"
-    },
     "magrittr": {
       "Package": "magrittr",
       "Version": "2.0.3",
@@ -980,20 +966,19 @@
     },
     "pillar": {
       "Package": "pillar",
-      "Version": "1.9.0",
+      "Version": "1.10.0",
       "Source": "Repository",
-      "Repository": "CRAN",
+      "Repository": "RSPM",
       "Requirements": [
         "cli",
-        "fansi",
         "glue",
         "lifecycle",
         "rlang",
         "utf8",
         "utils",
         "vctrs"
       ],
-      "Hash": "15da5a8412f317beeee6175fbc76f4bb"
+      "Hash": "101ca350beea21261a15ba169d7a8513"
     },
     "pingr": {
       "Package": "pingr",
@@ -1150,6 +1135,31 @@
       ],
       "Hash": "5e3c5dc0b071b21fa128676560dbe94d"
     },
+    "reactR": {
+      "Package": "reactR",
+      "Version": "0.6.1",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "htmltools"
+      ],
+      "Hash": "b8e3d93f508045812f47136c7c44c251"
+    },
+    "reactable": {
+      "Package": "reactable",
+      "Version": "0.4.4",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R",
+        "digest",
+        "htmltools",
+        "htmlwidgets",
+        "jsonlite",
+        "reactR"
+      ],
+      "Hash": "6069eb2a6597963eae0605c1875ff14c"
+    },
     "readxl": {
       "Package": "readxl",
       "Version": "1.4.3",
@@ -1601,17 +1611,6 @@
       ],
       "Hash": "829f27b9c4919c16b593794a6344d6c0"
     },
-    "timechange": {
-      "Package": "timechange",
-      "Version": "0.3.0",
-      "Source": "Repository",
-      "Repository": "RSPM",
-      "Requirements": [
-        "R",
-        "cpp11"
-      ],
-      "Hash": "c5f3c201b931cd6474d17d8700ccb1c8"
-    },
     "tinytex": {
       "Package": "tinytex",
       "Version": "0.54",