latest change

Merge branch 'main' of https://github.com/nhsbsa-data-analytics/int644genderpaygap

# Conflicts:
#	R/data.R
#	R/headcount_data_class.R
#	R/mod_scrollytell_example.R
#	R/utils_charts.R
#	data-raw/01_headcount_by_gender_afc.R
#	tests/testthat/test-utils_charts.R

.Rbuildignore

@@ -11,3 +11,8 @@
 ^gitleaks.toml$
 ^\.github$
 ^\.lintr$
+^data_temp$
+^\./R/data\.r$
+^review$
+^doc$
+^Meta$

.github/workflows/R-CMD-check.yaml

@@ -34,7 +34,9 @@ jobs:
           token: '${{ secrets.GITHUB_TOKEN }}'
 
       - uses: r-lib/actions/check-r-package@v2
-
+        with:
+          error-on: 'error'
+
       - name: Show testthat output
         if: always()
         run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true

.gitignore

@@ -15,4 +15,7 @@ rsconnect
 # Excel files (including macros and templates) #
 ################################################
 *.[xX][lL][sS][xXmMtT]?
+# Any RDA files
+*.[rR][dD][aA]
 data/*
+data_temp/*

.lintr

@@ -1,6 +1,8 @@
 linters: linters_with_defaults(
     line_length_linter(90),
-    object_usage_linter = NULL
+    object_usage_linter = NULL,
+    object_name_linter = NULL,
+    infix_spaces_linter = NULL
   )
 exclude: "# Exclude Linting"
 exclude_start: "# Begin Exclude Linting"

DESCRIPTION

@@ -17,24 +17,24 @@ Imports:
     htmltools,
     magrittr,
     nhsbsaR,
-    rlang,
-    scrollytell,
     shiny,
     shinyjs,
-    dplyr (>= 1.1.3),
-    dbplyr (>= 2.3.3),
-    forcats (>= 1.0.0),
+    dplyr (>= 1.1.2),
     futile.logger (>= 1.4.3),
     stringr,
-    formatR,
-    tidyr
+    htmlwidgets,
+    markdown,
+    shinyWidgets,
+    ggplot2
 Suggests:
     pkgload,
     testthat (>= 3.0.0),
-    usethis
+    usethis,
+    tidyr,
+    graphics,
+    stats
 Remotes:
-    nhsbsa-data-analytics/nhsbsaR,
-    statistiekcbs/scrollytell
+    nhsbsa-data-analytics/nhsbsaR
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.2.3

NAMESPACE

@@ -1,14 +1,19 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
-export(gender_profile)
+export(gpg_bar)
+export(gpg_column)
+export(gpg_data)
+export(gpg_dumbbell)
+export(gpg_pyramid)
+export(gpg_stack)
+export(gpg_trend)
 export(h1_tabstop)
 export(h2_tabstop)
 export(h3_tabstop)
 export(h4_tabstop)
 export(h5_tabstop)
 export(h6_tabstop)
-export(headcount_data)
 export(nhs_card)
 export(nhs_card_tabstop)
 export(nhs_footer)
@@ -27,3 +32,5 @@ importFrom(golem,bundle_resources)
 importFrom(golem,favicon)
 importFrom(golem,with_golem_options)
 importFrom(magrittr,"%>%")
+importFrom(shiny,NS)
+importFrom(shiny,tagList)

R/app_server.R

@@ -5,8 +5,55 @@
 #' @import shiny
 #' @noRd
 app_server <- function(input, output, session) {
-  # Your application server logic
-  mod_markdown_example_server("markdown_example_ui_1")
-  mod_chart_example_server("chart_example_ui_1")
-  mod_scrollytell_example_server("scrollytell_example_1")
+  mod_headcount_server("headcount")
+  mod_paygap_server("paygap")
+  mod_quartile_server("quartile")
+
+  observeEvent(input$content_main, {
+    tag <- switch(input$content_main,
+      "Introduction" = "introduction",
+      "Gender profile" = "headcount",
+      "Gender pay gap" = "paygap",
+      "Pay quartile" = "quartile",
+      "Action" = "gpg_action"
+    )
+
+    if (input$content_main == "Introduction") {
+      shinyjs::runjs("window.scrollTo(0, 0);")
+    } else {
+      shinyjs::runjs(paste0("document.getElementById('", tag, "').scrollIntoView();"))
+    }
+  })
+
+  observeEvent(input$top_headcount_intro, {
+    # jump to the top of the screen
+    shinyjs::runjs("window.scrollTo(0, 0)")
+
+    updateSelectInput(session,
+      inputId = "content_main",
+      selected = "Introduction"
+    )
+  })
+
+
+  observeEvent(input$top_paygap_intro, {
+    # jump to the top of the screen
+    shinyjs::runjs("window.scrollTo(0, 0)")
+
+    updateSelectInput(session,
+      inputId = "content_main",
+      selected = "Introduction"
+    )
+  })
+
+  observeEvent(input$top_quartile_intro, {
+    # jump to the top of the screen
+    shinyjs::runjs("window.scrollTo(0, 0)")
+
+    updateSelectInput(session,
+                      inputId = "content_main",
+                      selected = "Introduction"
+    )
+  })
+
 }

R/app_ui.R

@@ -21,22 +21,43 @@ app_ui <- function(request) {
         div(
           class = "nhsuk-main-wrapper",
           role = "main",
-          nhs_navlistPanel(
+          fluidRow(
             id = "mainTabs",
-            well = FALSE,
-            widths = c(3, 9),
-            tabPanel(
-              title = "Introduction",
-              mod_markdown_example_ui("markdown_example_ui_1")
+            column(width = 10),
+            shinyWidgets::pickerInput(
+              inputId = "content_main",
+              label = "Content:",
+              choices = c(
+                "Introduction",
+                "Gender profile",
+                "Gender pay gap",
+                "Pay quartile",
+                "Action"
+              ),
+              selected = "Introduction",
+              width = "fit",
+              inline = TRUE
             ),
-            tabPanel(
-              title = "Charts",
-              mod_chart_example_ui("chart_example_ui_1")
-            ),
-            tabPanel(
-              title = "Scrolly example",
-              mod_scrollytell_example_ui("scrollytell_example_1")
-            )
+            tags$div(id = "introduction"),
+            mod_introduction_ui("introduction"),
+            hr(),
+            br(),
+            tags$div(id = "headcount"),
+            mod_headcount_ui("headcount"),
+            accessible_action_link("top_headcount_intro", "Go to top page"),
+            hr(),
+            br(),
+            tags$div(id = "paygap"),
+            mod_paygap_ui("paygap"),
+            accessible_action_link("top_paygap_intro", "Go to top page"),
+            hr(),
+            br(),
+            tags$div(id = "quartile"),
+            mod_quartile_ui("quartile"),
+            accessible_action_link("top_quartile_intro", "Go to top page"),
+            hr(),
+            br(),
+            tags$div(id = "gpg_action")
           )
         )
       )
@@ -60,7 +81,7 @@ golem_add_external_resources <- function() {
 
   tags$head(
     favicon("assets/favicons/favicon"),
-    tags$title("nhsbsaGPG"),
+    tags$title("NHSBSA gender pay gap report"),
 
     # Add here other external resources
     # for example, you can add shinyalert::useShinyalert()