Connect eesyapi faedits

.gitignore

@@ -5,4 +5,5 @@
 rsconnect
 data/sql_export*
 data/export*
-data/enrolment*
+data/enrolment*
+.positai

.rscignore

@@ -0,0 +1,10 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
+API/data/
+.data/archive/
+Documentation_files/
+Documentation.html
+Documentation.qmd
+

R/dashboard_panels.R

@@ -8,7 +8,10 @@ homepage_panel <- function() {
         column(
           12,
           h1("Pupil attendance and absence in schools in England"),
-          textOutput("source_version_release")
+          div(
+            class = "govuk-body-s govuk-!-margin-bottom-4",
+            textOutput("source_version_release")
+          )
         ),
 
         ## Left panel -------------------------------------------------------

R/gov_colours.R

@@ -3,15 +3,13 @@
 # https://meyerweb.com/eric/tools/color-blend/#FFBF47:B10E1E:3:hex gov red to yellow
 
 map_gov_colours <- c(
-  "#FFBF47",
-  "#EC933D",
-  "#D86733",
-  "#C53A28",
-  "#B10E1E"
+  "#fecc5c",
+  "#fd8d3c",
+  "#f03b20",
+  "#bd0026",
+  "#800026"
 )
 
-# Test the palette
-
 check_pal <- function(
   x = gov_cols
 ) {

R/line_formatters.R

@@ -1,3 +1,55 @@
+# headline_bullet <- function(
+#     value,
+#     comparator_value,
+#     statistic_name,
+#     geographic_level,
+#     la_name_in,
+#     region_name_in,
+#     subject = "sessions") {
+#   if (geographic_level == "Local authority") {
+#     area_string <- paste("in", la_name_in)
+#     comparator_level <- "REG"
+#     comparator_name <- paste(
+#       "the",
+#       region_la_lookup |>
+#         filter(la_name == la_name_in) |>
+#         pull(region_name)
+#     ) |>
+#       stringr::str_replace("the London", "London")
+#   } else if (geographic_level == "Regional") {
+#     area_string <- paste("in the", region_name_in) |>
+#       stringr::str_replace("the London", "London")
+#     comparator_level <- "NAT"
+#     comparator_name <- "England"
+#   } else {
+#     area_string <- ""
+#     comparator_level <- NULL
+#   }
+#   paste(
+#     paste0(
+#       value |>
+#         as.numeric() |>
+#         dfeR::round_five_up(dp = 1), "%"
+#     ),
+#     "of",
+#     subject,
+#     "were recorded as",
+#     statistic_name,
+#     area_string,
+#     ifelse(
+#       !is.null(comparator_level),
+#       paste0(
+#         "(compared to ",
+#         comparator_value |>
+#           as.numeric() |>
+#           dfeR::round_five_up(dp = 1),
+#         "% of sessions in ", comparator_name, ")"
+#       ),
+#       ""
+#     )
+#   )
+# }
+
 headline_bullet <- function(
   value,
   comparator_value,
@@ -13,8 +65,8 @@ headline_bullet <- function(
     comparator_name <- paste(
       "the",
       region_la_lookup |>
-        filter(la_name == la_name_in) |>
-        pull(region_name)
+        dplyr::filter(la_name == la_name_in) |>
+        dplyr::pull(region_name)
     ) |>
       stringr::str_replace("the London", "London")
   } else if (geographic_level == "Regional") {
@@ -26,30 +78,22 @@ headline_bullet <- function(
     area_string <- ""
     comparator_level <- NULL
   }
+
   paste(
-    paste0(
-      value |>
-        as.numeric() |>
-        dfeR::round_five_up(dp = 1),
-      "%"
-    ),
+    render_percents(value),
     "of",
     subject,
     "were recorded as",
     statistic_name,
     area_string,
-    ifelse(
-      !is.null(comparator_level),
+    if (!is.null(comparator_level)) {
       paste0(
         "(compared to ",
-        comparator_value |>
-          as.numeric() |>
-          dfeR::round_five_up(dp = 1),
-        "% of sessions in ",
-        comparator_name,
-        ")"
-      ),
+        render_percents(comparator_value),
+        " of sessions in ", comparator_name, ")"
+      )
+    } else {
       ""
-    )
+    }
   )
 }

R/utils.R

@@ -1,12 +1,20 @@
+# render_percents <- function(values) {
+#   dfeR::round_five_up(
+#     as.numeric(
+#       values
+#     ),
+#     dp = 2
+#   ) |>
+#     paste0(
+#       "%"
+#     ) |>
+#     stringr::str_replace("NA%", "x")
+# }
+
 render_percents <- function(values) {
-  dfeR::round_five_up(
-    as.numeric(
-      values
-    ),
-    dp = 1
+  sprintf(
+    "%.2f%%",
+    dfeR::round_five_up(as.numeric(values), dp = 2)
   ) |>
-    paste0(
-      "%"
-    ) |>
     stringr::str_replace("NA%", "x")
 }